From 0a59aec1ba38a528ffabf90d7dd2ad245d76d581 Mon Sep 17 00:00:00 2001
From: tintinhamans <5984296+tintinhamans@users.noreply.github.com>
Date: Wed, 7 Oct 2026 22:37:40 +0200
Subject: [PATCH 01/13] perf(screenshot): Avoid redundant buffers and copies in
 screenshot uploads

---
 .../GeneralsOnline/OnlineServices_Init.h      |   4 +-
 .../GeneralsOnline/HTTP/HTTPManager.cpp       |   2 +-
 .../GeneralsOnline/OnlineServices_Init.cpp    | 203 ++++++++----------
 3 files changed, 88 insertions(+), 121 deletions(-)

diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
index 7d1419d2ee1..27d5fffdfcd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
@@ -586,10 +586,10 @@ class NGMP_OnlineServicesManager
 	ServiceConfig& GetServiceConfig() { return m_ServiceConfig; }
 
 public:
-	void CacheScreenshotBytes_StartMatch(std::vector<uint8_t>& vecData)
+	void CacheScreenshotBytes_StartMatch(std::vector<uint8_t> vecData)
 	{
 		std::scoped_lock<std::mutex> ssLock(m_ScreenshotMutex);
-        m_vecCachedScreenshotBytes_MatchStart = vecData;
+        m_vecCachedScreenshotBytes_MatchStart = std::move(vecData);
 	}
 
 	void CacheScreenshotBytes_EndMatch(uint64_t matchID, std::vector<uint8_t> data);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp
index a420a04cda6..9b6d94eca4c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp
@@ -49,7 +49,7 @@ void HTTPManager::SendS3PUTRequest(const char* szURI, EIPProtocolVersion protove
 
     HTTPRequest* pRequest = PlatformCreateRequest(EHTTPVerb::HTTP_VERB_PUT, protover, szURI, inHeaders, completionCallback, progressCallback, timeoutMS);
 	pRequest->DisableServiceAuth();
-    pRequest->SetPostDataBuffer(vecBuffer);
+    pRequest->SetPostDataBuffer(std::move(vecBuffer));
 
     m_vecRequestsPendingStart.push_back(pRequest);
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
index cfe0835efd4..951c40f6dd2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
@@ -127,7 +127,7 @@ void NGMP_OnlineServicesManager::CaptureScreenshotForProbe(EScreenshotType scree
                         // certain screenshots require caching for later upload when we have a valid match id, so we store them
 						if (screenshotType == EScreenshotType::SCREENSHOT_TYPE_LOADSCREEN)
 						{
-							NGMP_OnlineServicesManager::GetInstance()->CacheScreenshotBytes_StartMatch(vecData);
+							NGMP_OnlineServicesManager::GetInstance()->CacheScreenshotBytes_StartMatch(std::move(vecData));
 						}
                         else if (screenshotType == EScreenshotType::SCREENSHOT_TYPE_SCORESCREEN)
                         {
@@ -143,7 +143,7 @@ void NGMP_OnlineServicesManager::CaptureScreenshotForProbe(EScreenshotType scree
                             newEntry.vecBytes = std::move(vecData);
                             newEntry.strSignedURI = strURI;
                             newEntry.screenshotType = screenshotType;
-                            m_vecGuardedSSData.push_back(newEntry);
+                            m_vecGuardedSSData.push_back(std::move(newEntry));
 						}
 					});
 			}
@@ -579,7 +579,6 @@ void NGMP_OnlineServicesManager::CaptureScreenshot(bool bResizeForTransmit, std:
 	}
 
 	SurfaceClass* surface = DX8Wrapper::_Get_DX8_Back_Buffer();
-	LPDIRECT3DSURFACE8 surf = nullptr;
 	SurfaceClass* surfaceCopy = nullptr;
 	void* pBits = nullptr;
 	IDirect3DSurface8* pDXsurf = nullptr;
@@ -599,119 +598,96 @@ void NGMP_OnlineServicesManager::CaptureScreenshot(bool bResizeForTransmit, std:
 			{
 				DX8Wrapper::_Copy_DX8_Rects(surface->Peek_D3D_Surface(), NULL, 0, surfaceCopy->Peek_D3D_Surface(), NULL);
 
-				HRESULT hr;
+				// gather all our data
+				int pitch = 0;
+				pBits = surfaceCopy->Lock(&pitch);
 
-				D3DDISPLAYMODE mode;
-				if (SUCCEEDED(hr = DX8Wrapper::_Get_D3D_Device8()->GetDisplayMode(&mode)))
+				if (pBits != nullptr)
 				{
-					if (SUCCEEDED(hr = DX8Wrapper::_Get_D3D_Device8()->CreateImageSurface(mode.Width, mode.Height,
-						D3DFMT_A8R8G8B8, &surf)))
-					{
-						if (SUCCEEDED(hr = DX8Wrapper::_Get_D3D_Device8()->GetFrontBuffer(surf)))
+					int width = surfaceDesc.Width;
+					int height = surfaceDesc.Height;
+
+					// Copy pixel data into an owned buffer before spawning the thread so
+					// the surface can be safely unlocked on the main thread immediately after.
+					const uint8_t* pSurfaceBytes = static_cast<const uint8_t*>(pBits);
+					std::vector<uint8_t> pixelData(pSurfaceBytes, pSurfaceBytes + height * pitch);
+
+					// process on thread - track the thread so we can join it during shutdown
+					std::thread* pNewThread = new std::thread([cbOnDataAvailable, width, height, pixelData = std::move(pixelData), pitch, bResizeForTransmit]() mutable
 						{
-							// gather all our data
-							int pitch = 0;
-							pBits = surfaceCopy->Lock(&pitch);
+							CHECK_WORKER_THREAD;
 
-							if (pBits != nullptr)
-							{
-								int width = surfaceDesc.Width;
-								int height = surfaceDesc.Height;
-
-								// Copy pixel data into an owned buffer before spawning the thread so
-								// the surface can be safely unlocked on the main thread immediately after.
-								std::vector<uint8_t> pixelData(height * pitch);
-								memcpy(pixelData.data(), pBits, height * pitch);
-
-								// process on thread - track the thread so we can join it during shutdown
-								std::thread* pNewThread = new std::thread([cbOnDataAvailable, width, height, pixelData = std::move(pixelData), pitch, bResizeForTransmit]()
-									{
-										CHECK_WORKER_THREAD;
-
-										unsigned char* rgbData = new unsigned char[width * height * 3];
-
-										std::vector<unsigned char> vecData;
-
-										int finalWidth = width;
-										int finalHeight = height;
-
-										for (int y = 0; y < height; ++y) {
-											const uint8_t* row = pixelData.data() + y * pitch;
-											int rowOffset = y * width * 3;
-											int srcOffset = 0;
-											for (int x = 0; x < width; ++x, srcOffset += 4)
-											{
-												int dstIndex = rowOffset + x * 3;
-												rgbData[dstIndex + 0] = row[srcOffset + 2]; // R
-												rgbData[dstIndex + 1] = row[srcOffset + 1]; // G
-												rgbData[dstIndex + 2] = row[srcOffset + 0]; // B
-											}
-										}
-
-										// resize
-										unsigned char* pBufferToWrite = rgbData;
-										if (bResizeForTransmit)
-										{
-											ServiceConfig& serviceConf = NGMP_OnlineServicesManager::GetInstance()->GetServiceConfig();
-											int new_width = serviceConf.screenshot_width;
-											int new_height = serviceConf.screenshot_height;
-											int channels = 3;
-											unsigned char* resized = new unsigned char[new_width * new_height * channels];
-
-											stbir_resize_uint8(rgbData, width, height, 0,
-												resized, new_width, new_height, 0,
-												channels
-											);
-
-											// update data
-											finalWidth = new_width;
-											finalHeight = new_height;
-											pBufferToWrite = resized;
-										}
-										// end resize
-
-										stbi_write_jpg_to_func([](void* context, void* data, int size)
-											{
-												std::vector<unsigned char>* buffer = static_cast<std::vector<unsigned char>*>(context);
-												buffer->insert(buffer->end(), (unsigned char*)data, (unsigned char*)data + size);
-											}, &vecData, finalWidth, finalHeight, 3, pBufferToWrite, bResizeForTransmit ? 0 : 90);
-
-										// cleanup
-										if (bResizeForTransmit)
-										{
-											delete[] pBufferToWrite; // This is 'resized'
-											pBufferToWrite = nullptr;
-										}
-
-										delete[] rgbData;
-										rgbData = nullptr;
-
-										// invoke cb
-										if (cbOnDataAvailable != nullptr)
-										{
-											cbOnDataAvailable(vecData);
-										}
-									}
-								);
+							const int channels = 3;
+							int finalWidth = width;
+							int finalHeight = height;
 
-							// Store the thread so we can join it during shutdown
-							// SECURITY FIX: Capture manager pointer before spawning thread to avoid TOCTOU race
-							NGMP_OnlineServicesManager* pMgr = NGMP_OnlineServicesManager::GetInstance();
-							if (pMgr != nullptr)
+							// Pack the BGRA rows to tight RGB in place. The write position never passes the read position.
+							uint8_t* pixels = pixelData.data();
+							for (int y = 0; y < height; ++y)
 							{
-								std::scoped_lock<std::mutex> lock(pMgr->m_mutexScreenshotThreads);
-								pMgr->m_vecScreenshotThreads.push_back(pNewThread);
+								const uint8_t* src = pixels + y * pitch;
+								uint8_t* dst = pixels + y * width * channels;
+								for (int x = 0; x < width; ++x, src += 4, dst += channels)
+								{
+									const uint8_t blue = src[0];
+									dst[0] = src[2]; // R
+									dst[1] = src[1]; // G
+									dst[2] = blue;   // B
+								}
 							}
-							else
+
+							// resize
+							std::vector<uint8_t> resized;
+							if (bResizeForTransmit)
 							{
-								// Manager was destroyed, cannot store thread. Thread will leak but won't crash.
-								NetworkLog(ELogVerbosity::LOG_RELEASE, "[Screenshot] Manager destroyed before thread could be registered");
+								ServiceConfig& serviceConf = NGMP_OnlineServicesManager::GetInstance()->GetServiceConfig();
+								finalWidth = serviceConf.screenshot_width;
+								finalHeight = serviceConf.screenshot_height;
+								resized.resize(finalWidth * finalHeight * channels);
+
+								stbir_resize_uint8(pixels, width, height, 0,
+									resized.data(), finalWidth, finalHeight, 0,
+									channels
+								);
+
+								// the capture is no longer needed
+								std::vector<uint8_t>().swap(pixelData);
 							}
+							// end resize
+
+							// room for a typical JPEG, so the write callback rarely has to grow it
+							std::vector<unsigned char> vecData;
+							vecData.reserve(256 * 1024);
+
+							stbi_write_jpg_to_func([](void* context, void* data, int size)
+								{
+									std::vector<unsigned char>* buffer = static_cast<std::vector<unsigned char>*>(context);
+									buffer->insert(buffer->end(), (unsigned char*)data, (unsigned char*)data + size);
+								}, &vecData, finalWidth, finalHeight, channels, bResizeForTransmit ? resized.data() : pixelData.data(), bResizeForTransmit ? 0 : 90);
 
-								bSucceeded = true;
+							// invoke cb
+							if (cbOnDataAvailable != nullptr)
+							{
+								cbOnDataAvailable(std::move(vecData));
 							}
 						}
+					);
+
+					// Store the thread so we can join it during shutdown
+					// SECURITY FIX: Capture manager pointer before spawning thread to avoid TOCTOU race
+					NGMP_OnlineServicesManager* pMgr = NGMP_OnlineServicesManager::GetInstance();
+					if (pMgr != nullptr)
+					{
+						std::scoped_lock<std::mutex> lock(pMgr->m_mutexScreenshotThreads);
+						pMgr->m_vecScreenshotThreads.push_back(pNewThread);
+					}
+					else
+					{
+						// Manager was destroyed, cannot store thread. Thread will leak but won't crash.
+						NetworkLog(ELogVerbosity::LOG_RELEASE, "[Screenshot] Manager destroyed before thread could be registered");
 					}
+
+					bSucceeded = true;
 				}
 			}
 		}
@@ -719,18 +695,9 @@ void NGMP_OnlineServicesManager::CaptureScreenshot(bool bResizeForTransmit, std:
 
 	// clean everything up, whether we succeeded or not
 
-	// release the image surface
-	if (surf != nullptr)
-	{
-		surf->Release();
-		//delete surf;
-		surf = nullptr;
-	}
-
 	// unlock
 	if (surface != nullptr)
 	{
-		surface->Unlock();
 		surface->Release_Ref();
  		surface = nullptr;
 	}
@@ -954,7 +921,7 @@ void NGMP_OnlineServicesManager::Tick()
 
 
 		// screenshot types that already have a presigned URL
-		for (S3ScreenshotEntry screenshotEntry : m_vecGuardedSSData)
+		for (S3ScreenshotEntry& screenshotEntry : m_vecGuardedSSData)
 		{
 			// NOTE: Screenshot types start and end of match are captures and cached in memory until the server tells us where to upload them, so we need to wait for the upload URI
 
@@ -966,7 +933,7 @@ void NGMP_OnlineServicesManager::Tick()
 			{
                 std::map<std::string, std::string> mapHeaders;
                 mapHeaders["Content-Type"] = "image/jpeg";
-                NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager()->SendS3PUTRequest(screenshotEntry.strSignedURI.c_str(), EIPProtocolVersion::DONT_CARE, mapHeaders, screenshotEntry.vecBytes, [=](bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)
+                NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager()->SendS3PUTRequest(screenshotEntry.strSignedURI.c_str(), EIPProtocolVersion::DONT_CARE, mapHeaders, std::move(screenshotEntry.vecBytes), [=](bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)
                     {
 #if _DEBUG
                         if (statusCode != 200)
@@ -990,9 +957,9 @@ void NGMP_OnlineServicesManager::Tick()
 				// queue it
 				S3ScreenshotEntry newEntry;
 				newEntry.screenshotType = EScreenshotType::SCREENSHOT_TYPE_LOADSCREEN;
-				newEntry.vecBytes = m_vecCachedScreenshotBytes_MatchStart;
-				newEntry.strSignedURI = m_strCachedScreenshot_MatchStart_S3URI;
-				m_vecGuardedSSData.push_back(newEntry);
+				newEntry.vecBytes = std::move(m_vecCachedScreenshotBytes_MatchStart);
+				newEntry.strSignedURI = std::move(m_strCachedScreenshot_MatchStart_S3URI);
+				m_vecGuardedSSData.push_back(std::move(newEntry));
 
 				// clear data
                 m_vecCachedScreenshotBytes_MatchStart = std::vector<uint8_t>();
@@ -1023,7 +990,7 @@ void NGMP_OnlineServicesManager::Tick()
 				// do the upload
                 std::map<std::string, std::string> mapHeaders;
                 mapHeaders["Content-Type"] = "application/octet-stream";
-                NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager()->SendS3PUTRequest(m_cachedReplayUpload.signedURI.c_str(), EIPProtocolVersion::DONT_CARE, mapHeaders, m_cachedReplayUpload.bytes, [=](bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)
+                NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager()->SendS3PUTRequest(m_cachedReplayUpload.signedURI.c_str(), EIPProtocolVersion::DONT_CARE, mapHeaders, std::move(m_cachedReplayUpload.bytes), [=](bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)
                     {
 #if _DEBUG
                         if (statusCode != 200)

From 4e21dabadfc6e22df9d19667e2bc7f9d05e22e6d Mon Sep 17 00:00:00 2001
From: tintinhamans <5984296+tintinhamans@users.noreply.github.com>
Date: Tue, 27 Oct 2026 14:32:41 +0100
Subject: [PATCH 02/13] perf(screenshot): Upload probe screenshots one slot at
 a time at a capped rate

---
 .../GeneralsOnline/HTTP/HTTPManager.h         |  2 +-
 .../GeneralsOnline/HTTP/HTTPRequest.h         |  7 +++
 .../GeneralsOnline/OnlineServices_Init.h      |  6 +-
 .../GeneralsOnline/HTTP/HTTPManager.cpp       |  3 +-
 .../GeneralsOnline/HTTP/HTTPRequest.cpp       |  5 ++
 .../GeneralsOnline/OnlineServices_Init.cpp    | 60 +++++++++++++++++--
 6 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPManager.h
index 57a4c498928..d2d5c80f753 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPManager.h
@@ -54,7 +54,7 @@ class HTTPManager
 	// NOTE: set bDisableServiceAuth for endpoints that must be called with something other than the session token (e.g. the refresh endpoint, which needs the refresh token), otherwise the session token overwrites any Authorization header passed in inHeaders
 	void SendPOSTRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, const char* szPostData, std::function<void(bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr, int timeoutMS = -1, bool bDisableServiceAuth = false);
 	void SendPUTRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, const char* szData, std::function<void(bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr, int timeoutMS = -1);
-	void SendS3PUTRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, std::vector<uint8_t> vecBuffer, std::function<void(bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr, int timeoutMS = -1);
+	void SendS3PUTRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, std::vector<uint8_t> vecBuffer, std::function<void(bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr, int timeoutMS = -1, int maxSendBytesPerSec = 0);
 	void SendDELETERequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, const char* szData, std::function<void(bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr, int timeoutMS = -1);
 
 	void Shutdown();
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h
index f5b901aade5..7dbf977a136 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h
@@ -36,6 +36,11 @@ class HTTPRequest
 		m_bAppendAuthIfPresent = false;
 	}
 
+	void SetMaxSendSpeed(int bytesPerSec)
+	{
+		m_maxSendBytesPerSec = bytesPerSec;
+	}
+
 	void OnResponsePartialWrite(std::uint8_t* pBuffer, size_t numBytes);
 
 	bool HasStarted() const { return m_bIsStarted; }
@@ -77,6 +82,8 @@ class HTTPRequest
 
 	bool m_bAppendAuthIfPresent = true;
 
+	int m_maxSendBytesPerSec = 0; // 0 = unlimited
+
 	EIPProtocolVersion m_protover;
 
 	int m_timeoutMS = 5000;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
index 27d5fffdfcd..2096e7b3623 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
@@ -4,6 +4,7 @@
 
 #include <thread>
 #include <memory>
+#include <chrono>
 
 class HTTPManager;
 
@@ -28,6 +29,7 @@ struct S3ScreenshotEntry
     std::vector<uint8_t> vecBytes;
     std::string strSignedURI;
 	EScreenshotType screenshotType;
+	std::chrono::steady_clock::time_point notBefore; // upload is held back until this time
 
     bool operator==(const S3ScreenshotEntry& other) const
 	{
@@ -341,6 +343,8 @@ struct ServiceConfig
 
 	int screenshot_width = 557;
 	int screenshot_height = 333;
+	int screenshot_upload_bytes_per_sec = 131072; // 128 KB/s
+	int screenshot_slot_offset_ms = 2000;
 
 	// ICE client used for P2P NAT traversal: 0 = library default, 1 = native, 2 = WebRTC.
 	int ice_implementation = 2;
@@ -351,7 +355,7 @@ struct ServiceConfig
 		ra_slack_percent, frame_grouping_frames, enable_host_migration, network_do_immediate_flush_per_frame, network_send_flags, network_latency_logic_model,
 		use_default_config, ra_slack_override_percent_in_default, do_probes, do_replay_upload, network_mesh_histogram_duration,
 		ibra_ra_tweaks, ibra_minslack_default, ibra_maxslack_default, ibra_minslack_greaterthan300ms, ibra_maxslack_greaterthan300ms, ibra_minslack_greaterthan200ms, ibra_maxslack_greaterthan200ms,
-		screenshot_width, screenshot_height, ice_implementation, use_new_networking)
+		screenshot_width, screenshot_height, screenshot_upload_bytes_per_sec, screenshot_slot_offset_ms, ice_implementation, use_new_networking)
 };
 
 class NGMP_OnlineServicesManager
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp
index 9b6d94eca4c..e476ced3bb7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp
@@ -43,12 +43,13 @@ void HTTPManager::SendPUTRequest(const char* szURI, EIPProtocolVersion protover,
 }
 
 
-void HTTPManager::SendS3PUTRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, std::vector<uint8_t> vecBuffer, std::function<void(bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback /*= nullptr*/, int timeoutMS /*= -1*/)
+void HTTPManager::SendS3PUTRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, std::vector<uint8_t> vecBuffer, std::function<void(bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback /*= nullptr*/, int timeoutMS /*= -1*/, int maxSendBytesPerSec /*= 0*/)
 {
     CHECK_MAIN_THREAD;
 
     HTTPRequest* pRequest = PlatformCreateRequest(EHTTPVerb::HTTP_VERB_PUT, protover, szURI, inHeaders, completionCallback, progressCallback, timeoutMS);
 	pRequest->DisableServiceAuth();
+	pRequest->SetMaxSendSpeed(maxSendBytesPerSec);
     pRequest->SetPostDataBuffer(std::move(vecBuffer));
 
     m_vecRequestsPendingStart.push_back(pRequest);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp
index 02786d7f3d9..3c77e8f4039 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp
@@ -298,6 +298,11 @@ void HTTPRequest::PlatformStartRequest()
 			}
 		}
 
+		if (m_maxSendBytesPerSec > 0)
+		{
+			curl_easy_setopt(m_pCURL, CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t)m_maxSendBytesPerSec);
+		}
+
 		// needed for PUT etc
 		if (m_httpVerb == EHTTPVerb::HTTP_VERB_PUT)
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
index 951c40f6dd2..b2fa378fdb1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
@@ -23,7 +23,10 @@
 #include "GameNetwork/GeneralsOnline/Vendor/stb_image/stb_image_write.h"
 #include "GameNetwork/GeneralsOnline/Vendor/stb_image/stb_image_resize.h"
 #include "GameClient/GameText.h"
+#include "GameLogic/GameLogic.h"
 #include <unordered_set>
+#include <random>
+#include <algorithm>
 
 extern "C"
 {
@@ -99,6 +102,34 @@ void NGMP_OnlineServicesManager::GetAndParseServiceConfig(std::function<void(voi
 		});
 }
 
+// time this client may upload its screenshot, staggered by match slot so players do not saturate their links at once
+static std::chrono::steady_clock::time_point GetScreenshotUploadTime()
+{
+	int slotIndex = 0;
+
+	NGMP_OnlineServices_AuthInterface* pAuthInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_AuthInterface>();
+	NGMP_OnlineServices_LobbyInterface* pLobbyInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_LobbyInterface>();
+	if (pAuthInterface != nullptr && pLobbyInterface != nullptr)
+	{
+		const int64_t localUserID = pAuthInterface->GetUserID();
+		for (const LobbyMemberEntry& lobbyMember : pLobbyInterface->GetMembersListForCurrentRoom())
+		{
+			if (lobbyMember.user_id == localUserID)
+			{
+				slotIndex = lobbyMember.m_SlotIndex < MAX_SLOTS ? lobbyMember.m_SlotIndex : 0;
+				break;
+			}
+		}
+	}
+
+	const int slotOffsetMS = std::clamp(NGMP_OnlineServicesManager::GetInstance()->GetServiceConfig().screenshot_slot_offset_ms, 0, 10000);
+
+	static thread_local std::mt19937 rng{ std::random_device{}() };
+	const int jitterMS = std::uniform_int_distribution<int>(0, 500)(rng);
+
+	return std::chrono::steady_clock::now() + std::chrono::milliseconds(slotIndex * slotOffsetMS + jitterMS);
+}
+
 void NGMP_OnlineServicesManager::CaptureScreenshotForProbe(EScreenshotType screenshotType, std::string strURI)
 {
 	NGMP_OnlineServicesManager* pOnlineServicesMgr = NGMP_OnlineServicesManager::GetInstance();
@@ -114,7 +145,8 @@ void NGMP_OnlineServicesManager::CaptureScreenshotForProbe(EScreenshotType scree
 			if (pLobbyInterface != nullptr)
 			{
 				const uint64_t matchID = pLobbyInterface->GetCurrentMatchID();
-				NGMP_OnlineServicesManager::GetInstance()->CaptureScreenshot(true, [strURI = std::move(strURI), screenshotType, matchID](std::vector<uint8_t> vecData)
+				const std::chrono::steady_clock::time_point uploadTime = GetScreenshotUploadTime();
+				NGMP_OnlineServicesManager::GetInstance()->CaptureScreenshot(true, [strURI = std::move(strURI), screenshotType, matchID, uploadTime](std::vector<uint8_t> vecData)
 					{
 						CHECK_WORKER_THREAD;
 
@@ -143,6 +175,7 @@ void NGMP_OnlineServicesManager::CaptureScreenshotForProbe(EScreenshotType scree
                             newEntry.vecBytes = std::move(vecData);
                             newEntry.strSignedURI = strURI;
                             newEntry.screenshotType = screenshotType;
+                            newEntry.notBefore = uploadTime;
                             m_vecGuardedSSData.push_back(std::move(newEntry));
 						}
 					});
@@ -920,13 +953,28 @@ void NGMP_OnlineServicesManager::Tick()
 		std::scoped_lock<std::mutex> ssLock(m_ScreenshotMutex);
 
 
+		const int uploadBytesPerSec = std::clamp(m_ServiceConfig.screenshot_upload_bytes_per_sec, 16384, 10485760);
+		const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+		const bool bMatchOver = TheGameLogic == nullptr || !TheGameLogic->isInMultiplayerGame(); // uploads no longer compete with game traffic
+
 		// screenshot types that already have a presigned URL
-		for (S3ScreenshotEntry& screenshotEntry : m_vecGuardedSSData)
+		for (auto it = m_vecGuardedSSData.begin(); it != m_vecGuardedSSData.end();)
 		{
+			S3ScreenshotEntry& screenshotEntry = *it;
+			const bool bUnthrottled = bMatchOver || screenshotEntry.screenshotType == EScreenshotType::SCREENSHOT_TYPE_SCORESCREEN;
+
+			// not this client's turn to upload yet
+			if (!bUnthrottled && screenshotEntry.notBefore > now)
+			{
+				++it;
+				continue;
+			}
+
 			// NOTE: Screenshot types start and end of match are captures and cached in memory until the server tells us where to upload them, so we need to wait for the upload URI
 
 			if ((screenshotEntry.screenshotType == EScreenshotType::SCREENSHOT_TYPE_LOADSCREEN || screenshotEntry.screenshotType == EScreenshotType::SCREENSHOT_TYPE_SCORESCREEN) && screenshotEntry.strSignedURI.empty())
 			{
+				it = m_vecGuardedSSData.erase(it);
 				continue;
 			}
 			else // we have the data we need, send away
@@ -942,12 +990,11 @@ void NGMP_OnlineServicesManager::Tick()
                         }
 #endif
                         NetworkLog(ELogVerbosity::LOG_RELEASE, "Screenshot upload, result: %d", statusCode);
-                    }, nullptr, HTTP_UPLOAD_TIMEOUT);
+                    }, nullptr, HTTP_UPLOAD_TIMEOUT, bUnthrottled ? 0 : uploadBytesPerSec);
 			}
-            
-		}
 
-		m_vecGuardedSSData.clear();
+			it = m_vecGuardedSSData.erase(it);
+		}
 
 		// screenshots and replays that are cached and awaiting S3 url, and now have said URL
 		if (!m_vecCachedScreenshotBytes_MatchStart.empty()) // we have data waiting
@@ -959,6 +1006,7 @@ void NGMP_OnlineServicesManager::Tick()
 				newEntry.screenshotType = EScreenshotType::SCREENSHOT_TYPE_LOADSCREEN;
 				newEntry.vecBytes = std::move(m_vecCachedScreenshotBytes_MatchStart);
 				newEntry.strSignedURI = std::move(m_strCachedScreenshot_MatchStart_S3URI);
+				newEntry.notBefore = GetScreenshotUploadTime();
 				m_vecGuardedSSData.push_back(std::move(newEntry));
 
 				// clear data

From 077a6147819aa36fa09ec4cab87230e25a274762 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Sun, 26 Jul 2026 17:19:44 +0200
Subject: [PATCH 03/13] refactor(filesystem): Remove obsolete allocation in
 Win32BIGFileSystem::openArchiveFile() (#3376)

---
 .../StdDevice/Common/StdBIGFileSystem.cpp     | 20 ++++++++----------
 .../Win32Device/Common/Win32BIGFileSystem.cpp | 21 +++++++------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
index ffd0150f4c5..0fb035e0c3e 100644
--- a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
@@ -128,7 +128,8 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 	// seek to the beginning of the directory listing.
 	fp->seek(0x10, File::START);
 	// read in each directory listing.
-	ArchivedFileInfo *fileInfo = NEW ArchivedFileInfo;
+	ArchivedFileInfo fileInfo;
+	ArchiveFile *archiveFile = NEW StdBIGFile(filename, AsciiString::TheEmptyString);
 
 	for (Int i = 0; i < numLittleFiles; ++i) {
 		Int filesize = 0;
@@ -139,9 +140,9 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 		filesize = betoh(filesize);
 		fileOffset = betoh(fileOffset);
 
-		fileInfo->m_archiveFilename = archiveFileName;
-		fileInfo->m_offset = fileOffset;
-		fileInfo->m_size = filesize;
+		fileInfo.m_archiveFilename = archiveFileName;
+		fileInfo.m_offset = fileOffset;
+		fileInfo.m_size = filesize;
 
 		// read in the path name of the file.
 		Int pathIndex = -1;
@@ -155,8 +156,8 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 			--filenameIndex;
 		}
 
-		fileInfo->m_filename = (char *)(buffer + filenameIndex + 1);
-		fileInfo->m_filename.toLower();
+		fileInfo.m_filename = (char *)(buffer + filenameIndex + 1);
+		fileInfo.m_filename.toLower();
 		buffer[filenameIndex + 1] = 0;
 
 		AsciiString path;
@@ -164,17 +165,14 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 
 		AsciiString debugpath;
 		debugpath = path;
-		debugpath.concat(fileInfo->m_filename);
+		debugpath.concat(fileInfo.m_filename);
 //		DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
 
-		archiveFile->addFile(path, fileInfo);
+		archiveFile->addFile(path, &fileInfo);
 	}
 
 	archiveFile->attachFile(fp);
 
-	delete fileInfo;
-	fileInfo = nullptr;
-
 	// leave fp open as the archive file will be using it.
 
 	return archiveFile;
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
index b824dcaed57..004e393ec02 100644
--- a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
@@ -137,8 +137,7 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 	// seek to the beginning of the directory listing.
 	fp->seek(0x10, File::START);
 	// read in each directory listing.
-	ArchivedFileInfo *fileInfo = NEW ArchivedFileInfo;
-	// TheSuperHackers @fix Mauller 23/04/2025 Create new file handle when necessary to prevent memory leak
+	ArchivedFileInfo fileInfo;
 	ArchiveFile *archiveFile = NEW Win32BIGFile(filename, AsciiString::TheEmptyString);
 
 	Bool corrupt = FALSE;
@@ -153,9 +152,9 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 		filesize = betoh(filesize);
 		fileOffset = betoh(fileOffset);
 
-		fileInfo->m_archiveFilename = archiveFileName;
-		fileInfo->m_offset = fileOffset;
-		fileInfo->m_size = filesize;
+		fileInfo.m_archiveFilename = archiveFileName;
+		fileInfo.m_offset = fileOffset;
+		fileInfo.m_size = filesize;
 
 		// read in the path name of the file.
 		// the name must terminate within the buffer
@@ -179,8 +178,8 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 			--filenameIndex;
 		}
 
-		fileInfo->m_filename = (char *)(buffer + filenameIndex + 1);
-		fileInfo->m_filename.toLower();
+		fileInfo.m_filename = (char *)(buffer + filenameIndex + 1);
+		fileInfo.m_filename.toLower();
 		buffer[filenameIndex + 1] = 0;
 
 		AsciiString path;
@@ -188,16 +187,15 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 
 		AsciiString debugpath;
 		debugpath = path;
-		debugpath.concat(fileInfo->m_filename);
+		debugpath.concat(fileInfo.m_filename);
 //		DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
 
-		archiveFile->addFile(path, fileInfo);
+		archiveFile->addFile(path, &fileInfo);
 	}
 
 	if (corrupt) {
 		DEBUG_CRASH(("Truncated or corrupt directory in BIG file %s", filename));
 		delete archiveFile;
-		delete fileInfo;
 		fp->close();
 		fp = nullptr;
 		return nullptr;
@@ -205,9 +203,6 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 
 	archiveFile->attachFile(fp);
 
-	delete fileInfo;
-	fileInfo = nullptr;
-
 	// leave fp open as the archive file will be using it.
 
 	return archiveFile;

From ad86b361d5b9086ed3680bcc572e7adfc574eab9 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Sun, 26 Jul 2026 15:58:22 +0200
Subject: [PATCH 04/13] refactor(archive): Simplify code in ArchiveFile (#3376)

---
 Core/GameEngine/Include/Common/ArchiveFile.h  |  5 ++-
 .../Include/Common/ArchiveFileSystem.h        |  4 +-
 .../Source/Common/System/ArchiveFile.cpp      | 42 +++++++------------
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/Core/GameEngine/Include/Common/ArchiveFile.h b/Core/GameEngine/Include/Common/ArchiveFile.h
index 63987f9c9cb..4ea8f0c3214 100644
--- a/Core/GameEngine/Include/Common/ArchiveFile.h
+++ b/Core/GameEngine/Include/Common/ArchiveFile.h
@@ -60,13 +60,16 @@ class ArchiveFile
 	void									attachFile(File *file);
 
 	void									getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
-	void									getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
 
 	void									addFile(const AsciiString& path, const ArchivedFileInfo *fileInfo); ///< add this file to our directory tree.
 
 protected:
+	void									getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
 	const ArchivedFileInfo *		getArchivedFileInfo(const AsciiString& filename) const;	///< return the ArchivedFileInfo from the directory tree.
 
+protected:
 	File *m_file; ///< file pointer to the archive file on disk.  Kept open so we don't have to continuously open and close the file all the time.
+
+private:
 	DetailedArchivedDirectoryInfo m_rootDirectory;
 };
diff --git a/Core/GameEngine/Include/Common/ArchiveFileSystem.h b/Core/GameEngine/Include/Common/ArchiveFileSystem.h
index 48d144484c6..5583290bce0 100644
--- a/Core/GameEngine/Include/Common/ArchiveFileSystem.h
+++ b/Core/GameEngine/Include/Common/ArchiveFileSystem.h
@@ -143,9 +143,6 @@ class ArchiveFileSystem : public SubsystemInterface
 
 	virtual Bool	loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
 
-	// Unprotected this for copy-protection routines
-	ArchiveFile* getArchiveFile(const AsciiString& filename, FileInstance instance = 0) const;
-
 	void loadMods();
 
 	ArchivedDirectoryInfo* friend_getArchivedDirectoryInfo(const Char* directory);
@@ -160,6 +157,7 @@ class ArchiveFileSystem : public SubsystemInterface
 		AsciiString lastToken; ///< Synonymous for file name if the search directory was a file path
 	};
 
+	ArchiveFile* getArchiveFile(const AsciiString& filename, FileInstance instance = 0) const;
 	ArchivedDirectoryInfoResult getArchivedDirectoryInfo(const Char* directory);
 
 	virtual void loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool overwrite = FALSE, Bool sortedByName = FALSE);	///< load the archive file's header information and apply it to the global archive directory tree. sortedByName inserts by archive filename order (addon number convention), ignoring overwrite.
diff --git a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
index 1f982b65a1d..8ca721021d4 100644
--- a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
+++ b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
@@ -106,13 +106,11 @@ void ArchiveFile::addFile(const AsciiString& path, const ArchivedFileInfo *fileI
 	while (!token.isEmpty())
 	{
 		DetailedArchivedDirectoryInfoMap::iterator tempiter = dirInfo->m_directories.find(token);
-		if (tempiter == dirInfo->m_directories.end())
-		{
+		if (tempiter == dirInfo->m_directories.end()) {
 			dirInfo = &(dirInfo->m_directories[token]);
 			dirInfo->m_directoryName = token;
 		}
-		else
-		{
+		else {
 			dirInfo = &tempiter->second;
 		}
 
@@ -132,18 +130,12 @@ void ArchiveFile::getFileListInDirectory(const AsciiString& currentDirectory, co
 	tokenizer.nextToken(&token, "\\/");
 
 	while (!token.isEmpty()) {
-
 		DetailedArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
-		if (it != dirInfo->m_directories.end())
-		{
-			dirInfo = &it->second;
-		}
-		else
-		{
-			// if the directory doesn't exist, then there aren't any files to be had.
+		// if the directory doesn't exist, then there aren't any files to be had.
+		if (it == dirInfo->m_directories.end())
 			return;
-		}
 
+		dirInfo = &it->second;
 		tokenizer.nextToken(&token, "\\/");
 	}
 
@@ -153,33 +145,31 @@ void ArchiveFile::getFileListInDirectory(const AsciiString& currentDirectory, co
 void ArchiveFile::getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
 {
 	DetailedArchivedDirectoryInfoMap::const_iterator diriter = dirInfo->m_directories.begin();
-	while (diriter != dirInfo->m_directories.end()) {
+	for (; diriter != dirInfo->m_directories.end(); ++diriter) {
 		const DetailedArchivedDirectoryInfo *tempDirInfo = &(diriter->second);
-		AsciiString tempdirname;
-		tempdirname = currentDirectory;
-		if ((!tempdirname.isEmpty()) && (!tempdirname.endsWith("\\"))) {
-			tempdirname.concat('\\');
+		AsciiString tempDirName = currentDirectory;
+		if (!tempDirName.isEmpty() && !tempDirName.endsWith("\\")) {
+			tempDirName.concat('\\');
 		}
-		tempdirname.concat(tempDirInfo->m_directoryName);
-		getFileListInDirectory(tempDirInfo, tempdirname, searchName, filenameList, searchSubdirectories);
-		diriter++;
+		tempDirName.concat(tempDirInfo->m_directoryName);
+		getFileListInDirectory(tempDirInfo, tempDirName, searchName, filenameList, searchSubdirectories);
 	}
 
 	ArchivedFileInfoMap::const_iterator fileiter = dirInfo->m_files.begin();
-	while (fileiter != dirInfo->m_files.end()) {
-		if (SearchStringMatches(fileiter->second.m_filename, searchName)) {
+	for (; fileiter != dirInfo->m_files.end(); ++fileiter) {
+		const ArchivedFileInfo &fileInfo = fileiter->second;
+		if (SearchStringMatches(fileInfo.m_filename, searchName)) {
 			AsciiString tempfilename;
 			tempfilename = currentDirectory;
-			if ((!tempfilename.isEmpty()) && (!tempfilename.endsWith("\\"))) {
+			if (!tempfilename.isEmpty() && !tempfilename.endsWith("\\")) {
 				tempfilename.concat('\\');
 			}
-			tempfilename.concat(fileiter->second.m_filename);
+			tempfilename.concat(fileInfo.m_filename);
 			if (filenameList.find(tempfilename) == filenameList.end()) {
 				// only insert into the list if its not already in there.
 				filenameList.insert(tempfilename);
 			}
 		}
-		fileiter++;
 	}
 }
 

From c1a30d51dd216513d172c6846896a304b8914e2d Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Sun, 27 Sep 2026 10:48:26 +0200
Subject: [PATCH 05/13] fix(filesystem): Fix file path tokenization in
 ArchiveFile, ArchiveFileSystem, Win32LocalFileSystem (#3374)

---
 Core/GameEngine/Source/Common/System/ArchiveFile.cpp |  2 +-
 .../Source/Common/System/ArchiveFileSystem.cpp       | 12 ++++++------
 .../Win32Device/Common/Win32LocalFileSystem.cpp      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
index 8ca721021d4..798e3ac841e 100644
--- a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
+++ b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
@@ -191,7 +191,7 @@ const ArchivedFileInfo * ArchiveFile::getArchivedFileInfo(const AsciiString& fil
 	tokenizer.toLower();
 	tokenizer.nextToken(&token, "\\/");
 
-	while (!token.find('.') || tokenizer.find('.'))
+	while (!tokenizer.isEmpty())
 	{
 		DetailedArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
 		if (it != dirInfo->m_directories.end())
diff --git a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
index 5720c5b9417..17d49e8b372 100644
--- a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
+++ b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
@@ -144,9 +144,9 @@ void ArchiveFileSystem::loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool ove
 		AsciiString token;
 		AsciiString tokenizer = *it;
 		tokenizer.toLower();
-		Bool infoInPath = tokenizer.nextToken(&token, "\\/");
+		tokenizer.nextToken(&token, "\\/");
 
-		while (infoInPath && (!token.find('.') || tokenizer.find('.')))
+		while (!tokenizer.isEmpty())
 		{
 			path.concat(token);
 			path.concat('\\');
@@ -163,7 +163,7 @@ void ArchiveFileSystem::loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool ove
 				dirInfo = &tempiter->second;
 			}
 
-			infoInPath = tokenizer.nextToken(&token, "\\/");
+			tokenizer.nextToken(&token, "\\/");
 		}
 
 		ArchivedFileLocationMap::iterator fileIt;
@@ -306,15 +306,15 @@ ArchiveFileSystem::ArchivedDirectoryInfoResult ArchiveFileSystem::getArchivedDir
 	AsciiString token;
 	AsciiString tokenizer = directory;
 	tokenizer.toLower();
-	Bool infoInPath = tokenizer.nextToken(&token, "\\/");
+	tokenizer.nextToken(&token, "\\/");
 
-	while (infoInPath && (!token.find('.') || tokenizer.find('.')))
+	while (!tokenizer.isEmpty())
 	{
 		ArchivedDirectoryInfoMap::iterator tempiter = dirInfo->m_directories.find(token);
 		if (tempiter != dirInfo->m_directories.end())
 		{
 			dirInfo = &tempiter->second;
-			infoInPath = tokenizer.nextToken(&token, "\\/");
+			tokenizer.nextToken(&token, "\\/");
 		}
 		else
 		{
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
index 43a6ca5cbdd..a4ddcb6b59f 100644
--- a/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
@@ -60,7 +60,7 @@ File * Win32LocalFileSystem::openFile(const Char *filename, Int access, size_t b
 		AsciiString dirName;
 		string.nextToken(&token, "\\/");
 		dirName = token;
-		while ((token.find('.') == nullptr) || (string.find('.') != nullptr)) {
+		while (!string.isEmpty()) {
 			createDirectory(dirName);
 			string.nextToken(&token, "\\/");
 			dirName.concat('\\');

From 877c621857262dd552a262df317b350f78035dc5 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Mon, 5 Oct 2026 22:32:53 +0200
Subject: [PATCH 06/13] perf(archivefile): Take timestamps from cached file
 info in Win32BIGFile::getFileInfo(), StdBIGFile::getFileInfo() (#3415)

---
 Core/GameEngine/Include/Common/ArchiveFile.h        |  1 +
 Core/GameEngine/Include/Common/FileSystem.h         |  8 ++++++++
 .../GameEngine/Source/Common/System/ArchiveFile.cpp | 12 ++++++++++++
 .../Source/StdDevice/Common/StdBIGFile.cpp          | 13 +++++++------
 .../Source/StdDevice/Common/StdLocalFileSystem.cpp  |  4 ++--
 .../Source/Win32Device/Common/Win32BIGFile.cpp      | 13 +++++++------
 .../Win32Device/Common/Win32LocalFileSystem.cpp     |  4 ++--
 7 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/Core/GameEngine/Include/Common/ArchiveFile.h b/Core/GameEngine/Include/Common/ArchiveFile.h
index 4ea8f0c3214..b9d4e085567 100644
--- a/Core/GameEngine/Include/Common/ArchiveFile.h
+++ b/Core/GameEngine/Include/Common/ArchiveFile.h
@@ -69,6 +69,7 @@ class ArchiveFile
 
 protected:
 	File *m_file; ///< file pointer to the archive file on disk.  Kept open so we don't have to continuously open and close the file all the time.
+	FileInfo m_fileInfo; ///< file info of the archive file on disk.
 
 private:
 	DetailedArchivedDirectoryInfo m_rootDirectory;
diff --git a/Core/GameEngine/Include/Common/FileSystem.h b/Core/GameEngine/Include/Common/FileSystem.h
index 8a8b99a9f8c..75f93caabb5 100644
--- a/Core/GameEngine/Include/Common/FileSystem.h
+++ b/Core/GameEngine/Include/Common/FileSystem.h
@@ -109,6 +109,14 @@ typedef UnsignedByte FileInstance;
 
 struct FileInfo {
 
+	FileInfo()
+		: sizeHigh(0)
+		, sizeLow(0)
+		, timestampHigh(0)
+		, timestampLow(0)
+	{
+	}
+
 	Int64 size() const { return (Int64)sizeHigh << 32 | sizeLow; }
 	Int64 timestamp() const { return (Int64)timestampHigh << 32 | timestampLow; }
 
diff --git a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
index 798e3ac841e..e5a6e81d329 100644
--- a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
+++ b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
@@ -30,6 +30,7 @@
 
 #include "Common/ArchiveFile.h"
 #include "Common/ArchiveFileSystem.h"
+#include "Common/LocalFileSystem.h"
 #include "Common/file.h"
 #include "Common/PerfTimer.h"
 
@@ -179,7 +180,18 @@ void ArchiveFile::attachFile(File *file)
 		m_file->close();
 		m_file = nullptr;
 	}
+
 	m_file = file;
+
+	if (m_file != nullptr) {
+		if (!TheLocalFileSystem->getFileInfo(m_file->getName(), &m_fileInfo)) {
+			DEBUG_CRASH(("ArchiveFile::attachFile - Cannot query file info for '%s' unexpectedly", m_file->getName()));
+			m_fileInfo = FileInfo();
+		}
+	}
+	else {
+		m_fileInfo = FileInfo();
+	}
 }
 
 const ArchivedFileInfo * ArchiveFile::getArchivedFileInfo(const AsciiString& filename) const
diff --git a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
index c873b733524..5f063c2869c 100644
--- a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
+++ b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
@@ -151,17 +151,18 @@ void StdBIGFile::close()
 
 Bool StdBIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
 {
-	const ArchivedFileInfo *tempFileInfo = getArchivedFileInfo(filename);
+	const ArchivedFileInfo *archivedFileInfo = getArchivedFileInfo(filename);
 
-	if (tempFileInfo == nullptr) {
+	if (archivedFileInfo == nullptr) {
 		return FALSE;
 	}
 
-	TheLocalFileSystem->getFileInfo(AsciiString(m_file->getName()), fileInfo);
-
-	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high Int will always be 0.
+	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high int will always be 0.
 	fileInfo->sizeHigh = 0;
-	fileInfo->sizeLow = tempFileInfo->m_size;
+	fileInfo->sizeLow = archivedFileInfo->m_size;
+	// the timestamp is taken from the archive file.
+	fileInfo->timestampHigh = m_fileInfo.timestampHigh;
+	fileInfo->timestampLow = m_fileInfo.timestampLow;
 
 	return TRUE;
 }
diff --git a/Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp
index d47e473f4d2..ee53db20549 100644
--- a/Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp
@@ -304,10 +304,10 @@ Bool StdLocalFileSystem::getFileInfo(const AsciiString& filename, FileInfo *file
 
 	// TODO: fix this to be win compatible (time since 1601)
 	auto time = write_time.time_since_epoch().count();
+	fileInfo->sizeHigh = file_size >> 32;
+	fileInfo->sizeLow = file_size & UINT32_MAX;
 	fileInfo->timestampHigh = time >> 32;
 	fileInfo->timestampLow = time & UINT32_MAX;
-	fileInfo->sizeHigh      = file_size >> 32;
-	fileInfo->sizeLow  = file_size & UINT32_MAX;
 
 	return TRUE;
 }
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
index 3deee01fd82..fa21e09a278 100644
--- a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
+++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
@@ -151,17 +151,18 @@ void Win32BIGFile::close()
 
 Bool Win32BIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
 {
-	const ArchivedFileInfo *tempFileInfo = getArchivedFileInfo(filename);
+	const ArchivedFileInfo *archivedFileInfo = getArchivedFileInfo(filename);
 
-	if (tempFileInfo == nullptr) {
+	if (archivedFileInfo == nullptr) {
 		return FALSE;
 	}
 
-	TheLocalFileSystem->getFileInfo(AsciiString(m_file->getName()), fileInfo);
-
-	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high Int will always be 0.
+	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high int will always be 0.
 	fileInfo->sizeHigh = 0;
-	fileInfo->sizeLow = tempFileInfo->m_size;
+	fileInfo->sizeLow = archivedFileInfo->m_size;
+	// the timestamp is taken from the archive file.
+	fileInfo->timestampHigh = m_fileInfo.timestampHigh;
+	fileInfo->timestampLow = m_fileInfo.timestampLow;
 
 	return TRUE;
 }
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
index a4ddcb6b59f..5ec6fd35680 100644
--- a/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
@@ -194,10 +194,10 @@ Bool Win32LocalFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fi
 		return FALSE;
 	}
 
-	fileInfo->timestampHigh = findData.ftLastWriteTime.dwHighDateTime;
-	fileInfo->timestampLow = findData.ftLastWriteTime.dwLowDateTime;
 	fileInfo->sizeHigh = findData.nFileSizeHigh;
 	fileInfo->sizeLow = findData.nFileSizeLow;
+	fileInfo->timestampHigh = findData.ftLastWriteTime.dwHighDateTime;
+	fileInfo->timestampLow = findData.ftLastWriteTime.dwLowDateTime;
 
 	FindClose(findHandle);
 

From 7c9b184c9b0da385beefe34b8b0ab3908913087f Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Mon, 5 Oct 2026 20:08:58 +0200
Subject: [PATCH 07/13] refactor(archivefile): Merge Win32BIGFile and
 StdBIGFile into ArchiveFile (#3505)

---
 Core/GameEngine/Include/Common/ArchiveFile.h  |  20 ++-
 .../Source/Common/System/ArchiveFile.cpp      | 120 ++++++++++++-
 Core/GameEngineDevice/CMakeLists.txt          |   4 -
 .../Include/StdDevice/Common/StdBIGFile.h     |  53 ------
 .../Include/Win32Device/Common/Win32BIGFile.h |  53 ------
 .../Source/StdDevice/Common/StdBIGFile.cpp    | 169 ------------------
 .../StdDevice/Common/StdBIGFileSystem.cpp     |   3 +-
 .../Win32Device/Common/Win32BIGFile.cpp       | 169 ------------------
 .../Win32Device/Common/Win32BIGFileSystem.cpp |   3 +-
 Generals/Code/GameEngineDevice/CMakeLists.txt |   2 -
 .../Code/GameEngineDevice/CMakeLists.txt      |   2 -
 11 files changed, 132 insertions(+), 466 deletions(-)
 delete mode 100644 Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
 delete mode 100644 Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
 delete mode 100644 Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
 delete mode 100644 Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp

diff --git a/Core/GameEngine/Include/Common/ArchiveFile.h b/Core/GameEngine/Include/Common/ArchiveFile.h
index b9d4e085567..a7e0ed68bfb 100644
--- a/Core/GameEngine/Include/Common/ArchiveFile.h
+++ b/Core/GameEngine/Include/Common/ArchiveFile.h
@@ -47,16 +47,16 @@ class File;
 class ArchiveFile
 {
 public:
-	ArchiveFile();
-	virtual ~ArchiveFile();
+	ArchiveFile(AsciiString name, AsciiString path);
+	~ArchiveFile();
 
-	virtual Bool					getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const = 0;	///< fill in the fileInfo struct with info about the file requested.
-	virtual File*					openFile( const Char *filename, Int access = 0) = 0;	///< Open the specified file within the archive file
-	virtual void					closeAllFiles() = 0;									///< Close all file opened in this archive file
-	virtual AsciiString		getName() = 0;												///< Returns the name of the archive file
-	virtual AsciiString		getPath() = 0;												///< Returns full path and name of archive file
-	virtual void					setSearchPriority( Int new_priority ) = 0;	///< Set this archive file's search priority
-	virtual void					close() = 0;													///< Close this archive file
+	Bool					getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const;	///< fill in the fileInfo struct with info about the file requested.
+	File*					openFile( const Char *filename, Int access = 0);	///< Open the specified file within the archive file
+	void					closeAllFiles();									///< Close all file opened in this archive file
+	AsciiString		getName();												///< Returns the name of the archive file
+	AsciiString		getPath();												///< Returns full path and name of archive file
+	void					setSearchPriority( Int new_priority );	///< Set this archive file's search priority
+	void					close();													///< Close this archive file
 	void									attachFile(File *file);
 
 	void									getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
@@ -70,6 +70,8 @@ class ArchiveFile
 protected:
 	File *m_file; ///< file pointer to the archive file on disk.  Kept open so we don't have to continuously open and close the file all the time.
 	FileInfo m_fileInfo; ///< file info of the archive file on disk.
+	AsciiString m_name; ///< archive file name
+	AsciiString m_path; ///< archive file path
 
 private:
 	DetailedArchivedDirectoryInfo m_rootDirectory;
diff --git a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
index e5a6e81d329..9e0db3f0ee2 100644
--- a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
+++ b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
@@ -32,7 +32,10 @@
 #include "Common/ArchiveFileSystem.h"
 #include "Common/LocalFileSystem.h"
 #include "Common/file.h"
+#include "Common/LocalFile.h"
 #include "Common/PerfTimer.h"
+#include "Common/RAMFile.h"
+#include "Common/StreamingArchiveFile.h"
 
 
 // checks to see if str matches searchString.  Search string is done in the
@@ -90,8 +93,10 @@ ArchiveFile::~ArchiveFile()
 	}
 }
 
-ArchiveFile::ArchiveFile()
+ArchiveFile::ArchiveFile(AsciiString name, AsciiString path)
 	: m_file(nullptr)
+	, m_name(name)
+	, m_path(path)
 {
 }
 
@@ -229,3 +234,116 @@ const ArchivedFileInfo * ArchiveFile::getArchivedFileInfo(const AsciiString& fil
 	}
 
 }
+
+//============================================================================
+// ArchiveFile::openFile
+//============================================================================
+
+File* ArchiveFile::openFile( const Char *filename, Int access )
+{
+	const ArchivedFileInfo *fileInfo = getArchivedFileInfo(AsciiString(filename));
+
+	if (fileInfo == nullptr) {
+		return nullptr;
+	}
+
+	RAMFile *ramFile = nullptr;
+
+	if (BitIsSet(access, File::STREAMING))
+		ramFile = newInstance( StreamingArchiveFile );
+	else
+		ramFile = newInstance( RAMFile );
+
+	ramFile->deleteOnClose();
+	if (ramFile->openFromArchive(m_file, fileInfo->m_filename, fileInfo->m_offset, fileInfo->m_size) == FALSE) {
+		ramFile->close();
+		ramFile = nullptr;
+		return nullptr;
+	}
+
+	if ((access & File::WRITE) == 0) {
+		// requesting read only access. Just return the RAM file.
+		return ramFile;
+	}
+
+	// whoever is opening this file wants write access, so copy the file to the local disk
+	// and return that file pointer.
+
+	constexpr size_t bufferSize = 0;
+	File *localFile = TheLocalFileSystem->openFile(filename, access, bufferSize);
+	if (localFile != nullptr) {
+		ramFile->copyDataToFile(localFile);
+	}
+
+	ramFile->close();
+	ramFile = nullptr;
+
+	return localFile;
+}
+
+//============================================================================
+// ArchiveFile::closeAllFiles
+//============================================================================
+
+void ArchiveFile::closeAllFiles()
+{
+
+}
+
+//============================================================================
+// ArchiveFile::getName
+//============================================================================
+
+AsciiString ArchiveFile::getName()
+{
+	return m_name;
+}
+
+//============================================================================
+// ArchiveFile::getPath
+//============================================================================
+
+AsciiString ArchiveFile::getPath()
+{
+	return m_path;
+}
+
+//============================================================================
+// ArchiveFile::setSearchPriority
+//============================================================================
+
+void ArchiveFile::setSearchPriority( Int new_priority )
+{
+
+}
+
+//============================================================================
+// ArchiveFile::close
+//============================================================================
+
+void ArchiveFile::close()
+{
+
+}
+
+//============================================================================
+// ArchiveFile::getFileInfo
+//============================================================================
+
+Bool ArchiveFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
+{
+	const ArchivedFileInfo *archivedFileInfo = getArchivedFileInfo(filename);
+
+	if (archivedFileInfo == nullptr) {
+		return FALSE;
+	}
+
+	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high int will always be 0.
+	fileInfo->sizeHigh = 0;
+	fileInfo->sizeLow = archivedFileInfo->m_size;
+	// the timestamp is taken from the archive file.
+	fileInfo->timestampHigh = m_fileInfo.timestampHigh;
+	fileInfo->timestampLow = m_fileInfo.timestampLow;
+
+	return TRUE;
+}
diff --git a/Core/GameEngineDevice/CMakeLists.txt b/Core/GameEngineDevice/CMakeLists.txt
index 6added5403b..3315487c387 100644
--- a/Core/GameEngineDevice/CMakeLists.txt
+++ b/Core/GameEngineDevice/CMakeLists.txt
@@ -83,7 +83,6 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/W3DDevice/GameLogic/W3DGameLogic.h
 #    Include/W3DDevice/GameLogic/W3DGhostObject.h
 #    Include/W3DDevice/GameLogic/W3DTerrainLogic.h
-    Include/Win32Device/Common/Win32BIGFile.h
     Include/Win32Device/Common/Win32BIGFileSystem.h
 #    Include/Win32Device/Common/Win32GameEngine.h
     Include/Win32Device/Common/Win32LocalFile.h
@@ -186,7 +185,6 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/GameLogic/W3DGameLogic.cpp
 #    Source/W3DDevice/GameLogic/W3DGhostObject.cpp
 #    Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
-    Source/Win32Device/Common/Win32BIGFile.cpp
     Source/Win32Device/Common/Win32BIGFileSystem.cpp
 #    Source/Win32Device/Common/Win32GameEngine.cpp
     Source/Win32Device/Common/Win32LocalFile.cpp
@@ -200,11 +198,9 @@ set(GAMEENGINEDEVICE_SRC
 # Add C++ 17 FileSystem implementation for non-VS6 builds
 if(NOT IS_VS6_BUILD)
     list(APPEND GAMEENGINEDEVICE_SRC
-        Include/StdDevice/Common/StdBIGFile.h
         Include/StdDevice/Common/StdBIGFileSystem.h
         Include/StdDevice/Common/StdLocalFile.h
         Include/StdDevice/Common/StdLocalFileSystem.h
-        Source/StdDevice/Common/StdBIGFile.cpp
         Source/StdDevice/Common/StdBIGFileSystem.cpp
         Source/StdDevice/Common/StdLocalFile.cpp
         Source/StdDevice/Common/StdLocalFileSystem.cpp
diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
deleted file mode 100644
index 36538853352..00000000000
--- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////// StdBIGFile.h ////////////////////////////////////
-// Stephan Vedder, April 2025
-///////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "Common/ArchiveFile.h"
-#include "Common/AsciiString.h"
-#include "Common/List.h"
-
-class StdBIGFile : public ArchiveFile
-{
-	public:
-		StdBIGFile(AsciiString name, AsciiString path);
-		virtual ~StdBIGFile() override;
-
-		virtual Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override;	///< fill in the fileInfo struct with info about the requested file.
-		virtual File*					openFile( const Char *filename, Int access = 0 ) override;///< Open the specified file within the BIG file
-		virtual void					closeAllFiles() override;									///< Close all file opened in this BIG file
-		virtual AsciiString		getName() override;												///< Returns the name of the BIG file
-		virtual AsciiString		getPath() override;												///< Returns full path and name of BIG file
-		virtual void					setSearchPriority( Int new_priority ) override;	///< Set this BIG file's search priority
-		virtual void					close() override;													///< Close this BIG file
-
-	protected:
-
-		AsciiString		m_name;		///< BIG file name
-		AsciiString		m_path;		///< BIG file path
-};
diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
deleted file mode 100644
index 093aadbcf4c..00000000000
--- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////// Win32BIGFile.h ////////////////////////////////////
-// Bryan Cleveland, August 2002
-///////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "Common/ArchiveFile.h"
-#include "Common/AsciiString.h"
-#include "Common/List.h"
-
-class Win32BIGFile : public ArchiveFile
-{
-	public:
-		Win32BIGFile(AsciiString name, AsciiString path);
-		virtual ~Win32BIGFile() override;
-
-		virtual Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override;	///< fill in the fileInfo struct with info about the requested file.
-		virtual File*					openFile( const Char *filename, Int access = 0 ) override;///< Open the specified file within the BIG file
-		virtual void					closeAllFiles() override;									///< Close all file opened in this BIG file
-		virtual AsciiString		getName() override;												///< Returns the name of the BIG file
-		virtual AsciiString		getPath() override;												///< Returns full path and name of BIG file
-		virtual void					setSearchPriority( Int new_priority ) override;	///< Set this BIG file's search priority
-		virtual void					close() override;													///< Close this BIG file
-
-	protected:
-
-		AsciiString		m_name;		///< BIG file name
-		AsciiString		m_path;		///< BIG file path
-};
diff --git a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
deleted file mode 100644
index 5f063c2869c..00000000000
--- a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////// StdBIGFile.cpp /////////////////////////
-// Stephan Vedder, April 2025
-/////////////////////////////////////////////////////
-
-#include "Common/LocalFile.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/RAMFile.h"
-#include "Common/StreamingArchiveFile.h"
-#include "Common/GameMemory.h"
-#include "Common/PerfTimer.h"
-#include "StdDevice/Common/StdBIGFile.h"
-
-//============================================================================
-// StdBIGFile::StdBIGFile
-//============================================================================
-
-StdBIGFile::StdBIGFile(AsciiString name, AsciiString path)
-	: m_name(name)
-	, m_path(path)
-{
-
-}
-
-//============================================================================
-// StdBIGFile::~StdBIGFile
-//============================================================================
-
-StdBIGFile::~StdBIGFile()
-{
-
-}
-
-//============================================================================
-// StdBIGFile::openFile
-//============================================================================
-
-File* StdBIGFile::openFile( const Char *filename, Int access )
-{
-	const ArchivedFileInfo *fileInfo = getArchivedFileInfo(AsciiString(filename));
-
-	if (fileInfo == nullptr) {
-		return nullptr;
-	}
-
-	RAMFile *ramFile = nullptr;
-
-	if (BitIsSet(access, File::STREAMING))
-		ramFile = newInstance( StreamingArchiveFile );
-	else
-		ramFile = newInstance( RAMFile );
-
-	ramFile->deleteOnClose();
-	if (ramFile->openFromArchive(m_file, fileInfo->m_filename, fileInfo->m_offset, fileInfo->m_size) == FALSE) {
-		ramFile->close();
-		ramFile = nullptr;
-		return nullptr;
-	}
-
-	if ((access & File::WRITE) == 0) {
-		// requesting read only access. Just return the RAM file.
-		return ramFile;
-	}
-
-	// whoever is opening this file wants write access, so copy the file to the local disk
-	// and return that file pointer.
-
-	constexpr size_t bufferSize = 0;
-	File *localFile = TheLocalFileSystem->openFile(filename, access, bufferSize);
-	if (localFile != nullptr) {
-		ramFile->copyDataToFile(localFile);
-	}
-
-	ramFile->close();
-	ramFile = nullptr;
-
-	return localFile;
-}
-
-//============================================================================
-// StdBIGFile::closeAllFiles
-//============================================================================
-
-void StdBIGFile::closeAllFiles()
-{
-
-}
-
-//============================================================================
-// StdBIGFile::getName
-//============================================================================
-
-AsciiString StdBIGFile::getName()
-{
-	return m_name;
-}
-
-//============================================================================
-// StdBIGFile::getPath
-//============================================================================
-
-AsciiString StdBIGFile::getPath()
-{
-	return m_path;
-}
-
-//============================================================================
-// StdBIGFile::setSearchPriority
-//============================================================================
-
-void StdBIGFile::setSearchPriority( Int new_priority )
-{
-
-}
-
-//============================================================================
-// StdBIGFile::close
-//============================================================================
-
-void StdBIGFile::close()
-{
-
-}
-
-//============================================================================
-// StdBIGFile::getFileInfo
-//============================================================================
-
-Bool StdBIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
-{
-	const ArchivedFileInfo *archivedFileInfo = getArchivedFileInfo(filename);
-
-	if (archivedFileInfo == nullptr) {
-		return FALSE;
-	}
-
-	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high int will always be 0.
-	fileInfo->sizeHigh = 0;
-	fileInfo->sizeLow = archivedFileInfo->m_size;
-	// the timestamp is taken from the archive file.
-	fileInfo->timestampHigh = m_fileInfo.timestampHigh;
-	fileInfo->timestampLow = m_fileInfo.timestampLow;
-
-	return TRUE;
-}
-
diff --git a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
index 0fb035e0c3e..529f5b03648 100644
--- a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
@@ -38,7 +38,6 @@
 #include "Common/Registry.h"
 #endif
 
-#include "StdDevice/Common/StdBIGFile.h"
 #include "StdDevice/Common/StdBIGFileSystem.h"
 #include "Utility/endian_compat.h"
 
@@ -129,7 +128,7 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 	fp->seek(0x10, File::START);
 	// read in each directory listing.
 	ArchivedFileInfo fileInfo;
-	ArchiveFile *archiveFile = NEW StdBIGFile(filename, AsciiString::TheEmptyString);
+	ArchiveFile *archiveFile = NEW ArchiveFile(filename, AsciiString::TheEmptyString);
 
 	for (Int i = 0; i < numLittleFiles; ++i) {
 		Int filesize = 0;
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
deleted file mode 100644
index fa21e09a278..00000000000
--- a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////// Win32BIGFile.cpp /////////////////////////
-// Bryan Cleveland, August 2002
-/////////////////////////////////////////////////////
-
-#include "Common/LocalFile.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/RAMFile.h"
-#include "Common/StreamingArchiveFile.h"
-#include "Common/GameMemory.h"
-#include "Common/PerfTimer.h"
-#include "Win32Device/Common/Win32BIGFile.h"
-
-//============================================================================
-// Win32BIGFile::Win32BIGFile
-//============================================================================
-
-Win32BIGFile::Win32BIGFile(AsciiString name, AsciiString path)
-	: m_name(name)
-	, m_path(path)
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::~Win32BIGFile
-//============================================================================
-
-Win32BIGFile::~Win32BIGFile()
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::openFile
-//============================================================================
-
-File* Win32BIGFile::openFile( const Char *filename, Int access )
-{
-	const ArchivedFileInfo *fileInfo = getArchivedFileInfo(AsciiString(filename));
-
-	if (fileInfo == nullptr) {
-		return nullptr;
-	}
-
-	RAMFile *ramFile = nullptr;
-
-	if (BitIsSet(access, File::STREAMING))
-		ramFile = newInstance( StreamingArchiveFile );
-	else
-		ramFile = newInstance( RAMFile );
-
-	ramFile->deleteOnClose();
-	if (ramFile->openFromArchive(m_file, fileInfo->m_filename, fileInfo->m_offset, fileInfo->m_size) == FALSE) {
-		ramFile->close();
-		ramFile = nullptr;
-		return nullptr;
-	}
-
-	if ((access & File::WRITE) == 0) {
-		// requesting read only access. Just return the RAM file.
-		return ramFile;
-	}
-
-	// whoever is opening this file wants write access, so copy the file to the local disk
-	// and return that file pointer.
-
-	constexpr size_t bufferSize = 0;
-	File *localFile = TheLocalFileSystem->openFile(filename, access, bufferSize);
-	if (localFile != nullptr) {
-		ramFile->copyDataToFile(localFile);
-	}
-
-	ramFile->close();
-	ramFile = nullptr;
-
-	return localFile;
-}
-
-//============================================================================
-// Win32BIGFile::closeAllFiles
-//============================================================================
-
-void Win32BIGFile::closeAllFiles()
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::getName
-//============================================================================
-
-AsciiString Win32BIGFile::getName()
-{
-	return m_name;
-}
-
-//============================================================================
-// Win32BIGFile::getPath
-//============================================================================
-
-AsciiString Win32BIGFile::getPath()
-{
-	return m_path;
-}
-
-//============================================================================
-// Win32BIGFile::setSearchPriority
-//============================================================================
-
-void Win32BIGFile::setSearchPriority( Int new_priority )
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::close
-//============================================================================
-
-void Win32BIGFile::close()
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::getFileInfo
-//============================================================================
-
-Bool Win32BIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
-{
-	const ArchivedFileInfo *archivedFileInfo = getArchivedFileInfo(filename);
-
-	if (archivedFileInfo == nullptr) {
-		return FALSE;
-	}
-
-	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high int will always be 0.
-	fileInfo->sizeHigh = 0;
-	fileInfo->sizeLow = archivedFileInfo->m_size;
-	// the timestamp is taken from the archive file.
-	fileInfo->timestampHigh = m_fileInfo.timestampHigh;
-	fileInfo->timestampLow = m_fileInfo.timestampLow;
-
-	return TRUE;
-}
-
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
index 004e393ec02..2159c367728 100644
--- a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
@@ -38,7 +38,6 @@
 #include "Common/Registry.h"
 #endif
 
-#include "Win32Device/Common/Win32BIGFile.h"
 #include "Win32Device/Common/Win32BIGFileSystem.h"
 #include "Utility/endian_compat.h"
 
@@ -138,7 +137,7 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 	fp->seek(0x10, File::START);
 	// read in each directory listing.
 	ArchivedFileInfo fileInfo;
-	ArchiveFile *archiveFile = NEW Win32BIGFile(filename, AsciiString::TheEmptyString);
+	ArchiveFile *archiveFile = NEW ArchiveFile(filename, AsciiString::TheEmptyString);
 
 	Bool corrupt = FALSE;
 	for (Int i = 0; i < numLittleFiles; ++i) {
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
index dea3ff6c9ae..bedd7c48520 100644
--- a/Generals/Code/GameEngineDevice/CMakeLists.txt
+++ b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -70,7 +70,6 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameLogic/W3DGameLogic.h
     Include/W3DDevice/GameLogic/W3DGhostObject.h
     Include/W3DDevice/GameLogic/W3DTerrainLogic.h
-#    Include/Win32Device/Common/Win32BIGFile.h
 #    Include/Win32Device/Common/Win32BIGFileSystem.h
     Include/Win32Device/Common/Win32GameEngine.h
 #    Include/Win32Device/Common/Win32LocalFile.h
@@ -168,7 +167,6 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameLogic/W3DGameLogic.cpp
     Source/W3DDevice/GameLogic/W3DGhostObject.cpp
     Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
-#    Source/Win32Device/Common/Win32BIGFile.cpp
 #    Source/Win32Device/Common/Win32BIGFileSystem.cpp
     Source/Win32Device/Common/Win32GameEngine.cpp
 #    Source/Win32Device/Common/Win32LocalFile.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
index 56408e821bd..e8567307646 100644
--- a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -81,7 +81,6 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameLogic/W3DGameLogic.h
     Include/W3DDevice/GameLogic/W3DGhostObject.h
     Include/W3DDevice/GameLogic/W3DTerrainLogic.h
-#    Include/Win32Device/Common/Win32BIGFile.h
 #    Include/Win32Device/Common/Win32BIGFileSystem.h
     Include/Win32Device/Common/Win32GameEngine.h
 #    Include/Win32Device/Common/Win32LocalFile.h
@@ -181,7 +180,6 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameLogic/W3DGameLogic.cpp
     Source/W3DDevice/GameLogic/W3DGhostObject.cpp
     Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
-#    Source/Win32Device/Common/Win32BIGFile.cpp
 #    Source/Win32Device/Common/Win32BIGFileSystem.cpp
     Source/Win32Device/Common/Win32GameEngine.cpp
 #    Source/Win32Device/Common/Win32LocalFile.cpp

From 13ec7acdcf3a04f100ec3b0f294ef8da05e2d7b2 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Mon, 5 Oct 2026 20:10:57 +0200
Subject: [PATCH 08/13] refactor(archivefilesystem): Merge Win32BIGFileSystem
 and StdBIGFileSystem into BIGFileSystem (#3505)

---
 Core/GameEngine/CMakeLists.txt                |   2 +
 .../Include/Common/BIGFileSystem.h}           |   8 +-
 .../Source/Common/System/BIGFileSystem.cpp}   |  42 +--
 Core/GameEngineDevice/CMakeLists.txt          |   4 -
 .../StdDevice/Common/StdBIGFileSystem.h       |  55 ----
 .../StdDevice/Common/StdBIGFileSystem.cpp     | 239 ------------------
 Core/Tools/Autorun/autorun.cpp                |   4 +-
 Core/Tools/MapCacheBuilder/Source/WinMain.cpp |   5 +-
 Generals/Code/GameEngineDevice/CMakeLists.txt |   2 -
 .../Win32Device/Common/Win32GameEngine.h      |   4 +-
 .../Code/Tools/GUIEdit/Source/GUIEdit.cpp     |   4 +-
 .../Tools/WorldBuilder/src/WorldBuilder.cpp   |   4 +-
 .../Code/GameEngineDevice/CMakeLists.txt      |   2 -
 .../Win32Device/Common/Win32GameEngine.h      |   4 +-
 .../Code/Tools/GUIEdit/Source/GUIEdit.cpp     |   4 +-
 .../Tools/WorldBuilder/src/WorldBuilder.cpp   |   4 +-
 16 files changed, 44 insertions(+), 343 deletions(-)
 rename Core/{GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h => GameEngine/Include/Common/BIGFileSystem.h} (91%)
 rename Core/{GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp => GameEngine/Source/Common/System/BIGFileSystem.cpp} (82%)
 delete mode 100644 Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
 delete mode 100644 Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp

diff --git a/Core/GameEngine/CMakeLists.txt b/Core/GameEngine/CMakeLists.txt
index e6aee6da85f..8f5892206e0 100644
--- a/Core/GameEngine/CMakeLists.txt
+++ b/Core/GameEngine/CMakeLists.txt
@@ -15,6 +15,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/BattleHonors.h
 #    Include/Common/BezFwdIterator.h
 #    Include/Common/BezierSegment.h
+    Include/Common/BIGFileSystem.h
 #    Include/Common/BitFlags.h
 #    Include/Common/BitFlagsIO.h
 #    Include/Common/BorderColors.h
@@ -644,6 +645,7 @@ set(GAMEENGINE_SRC
     Source/Common/System/ArchiveFile.cpp
     Source/Common/System/ArchiveFileSystem.cpp
     Source/Common/System/AsciiString.cpp
+    Source/Common/System/BIGFileSystem.cpp
 #    Source/Common/System/BuildAssistant.cpp
 #    Source/Common/System/CriticalSection.cpp
 #    Source/Common/System/DataChunk.cpp
diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h b/Core/GameEngine/Include/Common/BIGFileSystem.h
similarity index 91%
rename from Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h
rename to Core/GameEngine/Include/Common/BIGFileSystem.h
index 6819ba90577..602a63e4dd5 100644
--- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h
+++ b/Core/GameEngine/Include/Common/BIGFileSystem.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-//////// Win32BIGFileSystem.h ///////////////////////////
+//////// BIGFileSystem.h ///////////////////////////
 // Bryan Cleveland, August 2002
 /////////////////////////////////////////////////////////////
 
@@ -30,11 +30,11 @@
 
 #include "Common/ArchiveFileSystem.h"
 
-class Win32BIGFileSystem : public ArchiveFileSystem
+class BIGFileSystem : public ArchiveFileSystem
 {
 public:
-	Win32BIGFileSystem();
-	virtual ~Win32BIGFileSystem() override;
+	BIGFileSystem();
+	virtual ~BIGFileSystem() override;
 
 	virtual void init() override;
 	virtual void update() override;
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
similarity index 82%
rename from Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
rename to Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
index 2159c367728..6750525f15d 100644
--- a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
+++ b/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
@@ -22,13 +22,16 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-//////// Win32BIGFileSystem.h ///////////////////////////
+//////// BIGFileSystem.cpp ///////////////////////////
 // Bryan Cleveland, August 2002
 /////////////////////////////////////////////////////////////
 
+#include "PreRTS.h"
+
+#include "Common/BIGFileSystem.h"
+
 #include "Common/AudioAffect.h"
 #include "Common/ArchiveFile.h"
-#include "Common/ArchiveFileSystem.h"
 #include "Common/file.h"
 #include "Common/GameAudio.h"
 #include "Common/GameMemory.h"
@@ -38,19 +41,18 @@
 #include "Common/Registry.h"
 #endif
 
-#include "Win32Device/Common/Win32BIGFileSystem.h"
 #include "Utility/endian_compat.h"
 
 
 static const char *BIGFileIdentifier = "BIGF";
 
-Win32BIGFileSystem::Win32BIGFileSystem() : ArchiveFileSystem() {
+BIGFileSystem::BIGFileSystem() : ArchiveFileSystem() {
 }
 
-Win32BIGFileSystem::~Win32BIGFileSystem() {
+BIGFileSystem::~BIGFileSystem() {
 }
 
-void Win32BIGFileSystem::init() {
+void BIGFileSystem::init() {
 	DEBUG_ASSERTCRASH(TheLocalFileSystem != nullptr, ("TheLocalFileSystem must be initialized before TheArchiveFileSystem."));
 	if (TheLocalFileSystem == nullptr) {
 		return;
@@ -69,16 +71,16 @@ void Win32BIGFileSystem::init() {
 #endif
 }
 
-void Win32BIGFileSystem::reset() {
+void BIGFileSystem::reset() {
 }
 
-void Win32BIGFileSystem::update() {
+void BIGFileSystem::update() {
 }
 
-void Win32BIGFileSystem::postProcessLoad() {
+void BIGFileSystem::postProcessLoad() {
 }
 
-ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
+ArchiveFile * BIGFileSystem::openArchiveFile(const Char *filename) {
 	File *fp = TheLocalFileSystem->openFile(filename, File::READ | File::BINARY);
 	AsciiString archiveFileName;
 	archiveFileName = filename;
@@ -86,7 +88,7 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 	Int archiveFileSize = 0;
 	Int numLittleFiles = 0;
 
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - opening BIG file %s", filename));
+	DEBUG_LOG(("BIGFileSystem::openArchiveFile - opening BIG file %s", filename));
 
 	if (fp == nullptr) {
 		DEBUG_CRASH(("Could not open archive file %s for parsing", filename));
@@ -112,7 +114,7 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 		return nullptr;
 	}
 
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - size of archive file is %d bytes", archiveFileSize));
+	DEBUG_LOG(("BIGFileSystem::openArchiveFile - size of archive file is %d bytes", archiveFileSize));
 
 //	char t;
 
@@ -126,7 +128,7 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 	}
 	numLittleFiles = betoh(numLittleFiles);
 
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - %d are contained in archive", numLittleFiles));
+	DEBUG_LOG(("BIGFileSystem::openArchiveFile - %d are contained in archive", numLittleFiles));
 //	for (Int i = 0; i < 2; ++i) {
 //		t = buffer[i];
 //		buffer[i] = buffer[(4-i)-1];
@@ -187,7 +189,7 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 		AsciiString debugpath;
 		debugpath = path;
 		debugpath.concat(fileInfo.m_filename);
-//		DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
+//		DEBUG_LOG(("BIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
 
 		archiveFile->addFile(path, &fileInfo);
 	}
@@ -207,7 +209,7 @@ ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
 	return archiveFile;
 }
 
-void Win32BIGFileSystem::closeArchiveFile(const Char *filename) {
+void BIGFileSystem::closeArchiveFile(const Char *filename) {
 	// Need to close the specified big file
 	ArchiveFileMap::iterator it =  m_archiveFileMap.find(filename);
 	if (it == m_archiveFileMap.end()) {
@@ -228,13 +230,13 @@ void Win32BIGFileSystem::closeArchiveFile(const Char *filename) {
 	m_archiveFileMap.erase(it);
 }
 
-void Win32BIGFileSystem::closeAllArchiveFiles() {
+void BIGFileSystem::closeAllArchiveFiles() {
 }
 
-void Win32BIGFileSystem::closeAllFiles() {
+void BIGFileSystem::closeAllFiles() {
 }
 
-Bool Win32BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
+Bool BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
 
 	FilenameList filenameList;
 	TheLocalFileSystem->getFileListInDirectory(dir, "", fileMask, filenameList, TRUE);
@@ -255,10 +257,10 @@ Bool Win32BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString
 		ArchiveFile *archiveFile = openArchiveFile((*it).str());
 
 		if (archiveFile != nullptr) {
-			DEBUG_LOG(("Win32BIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.", (*it).str()));
+			DEBUG_LOG(("BIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.", (*it).str()));
 			loadIntoDirectoryTree(archiveFile, overwrite);
 			m_archiveFileMap[(*it)] = archiveFile;
-			DEBUG_LOG(("Win32BIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.", (*it).str()));
+			DEBUG_LOG(("BIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.", (*it).str()));
 			actuallyAdded = TRUE;
 		}
 
diff --git a/Core/GameEngineDevice/CMakeLists.txt b/Core/GameEngineDevice/CMakeLists.txt
index 3315487c387..71933e7c69f 100644
--- a/Core/GameEngineDevice/CMakeLists.txt
+++ b/Core/GameEngineDevice/CMakeLists.txt
@@ -83,7 +83,6 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/W3DDevice/GameLogic/W3DGameLogic.h
 #    Include/W3DDevice/GameLogic/W3DGhostObject.h
 #    Include/W3DDevice/GameLogic/W3DTerrainLogic.h
-    Include/Win32Device/Common/Win32BIGFileSystem.h
 #    Include/Win32Device/Common/Win32GameEngine.h
     Include/Win32Device/Common/Win32LocalFile.h
     Include/Win32Device/Common/Win32LocalFileSystem.h
@@ -185,7 +184,6 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/GameLogic/W3DGameLogic.cpp
 #    Source/W3DDevice/GameLogic/W3DGhostObject.cpp
 #    Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
-    Source/Win32Device/Common/Win32BIGFileSystem.cpp
 #    Source/Win32Device/Common/Win32GameEngine.cpp
     Source/Win32Device/Common/Win32LocalFile.cpp
     Source/Win32Device/Common/Win32LocalFileSystem.cpp
@@ -198,10 +196,8 @@ set(GAMEENGINEDEVICE_SRC
 # Add C++ 17 FileSystem implementation for non-VS6 builds
 if(NOT IS_VS6_BUILD)
     list(APPEND GAMEENGINEDEVICE_SRC
-        Include/StdDevice/Common/StdBIGFileSystem.h
         Include/StdDevice/Common/StdLocalFile.h
         Include/StdDevice/Common/StdLocalFileSystem.h
-        Source/StdDevice/Common/StdBIGFileSystem.cpp
         Source/StdDevice/Common/StdLocalFile.cpp
         Source/StdDevice/Common/StdLocalFileSystem.cpp
     )
diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
deleted file mode 100644
index b8cb316ab7c..00000000000
--- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//////// StdBIGFileSystem.h ///////////////////////////
-// Stephan Vedder, April 2025
-/////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "Common/ArchiveFileSystem.h"
-
-class StdBIGFileSystem : public ArchiveFileSystem
-{
-public:
-	StdBIGFileSystem();
-	virtual ~StdBIGFileSystem() override;
-
-	virtual void init() override;
-	virtual void update() override;
-	virtual void reset() override;
-	virtual void postProcessLoad() override;
-
-	// ArchiveFile operations
-	virtual void closeAllArchiveFiles() override;											///< Close all Archivefiles currently open
-
-	// File operations
-	virtual ArchiveFile * openArchiveFile(const Char *filename) override;
-	virtual void closeArchiveFile(const Char *filename) override;
-	virtual void closeAllFiles() override;															///< Close all files associated with ArchiveFiles
-
-	virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) override;
-protected:
-
-};
diff --git a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
deleted file mode 100644
index 529f5b03648..00000000000
--- a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//////// StdBIGFileSystem.h ///////////////////////////
-// Stephan Vedder, April 2025
-/////////////////////////////////////////////////////////////
-
-#include "Common/AudioAffect.h"
-#include "Common/ArchiveFile.h"
-#include "Common/ArchiveFileSystem.h"
-#include "Common/file.h"
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-#include "Common/LocalFileSystem.h"
-
-#if RTS_ZEROHOUR
-#include "Common/Registry.h"
-#endif
-
-#include "StdDevice/Common/StdBIGFileSystem.h"
-#include "Utility/endian_compat.h"
-
-static const char *BIGFileIdentifier = "BIGF";
-
-StdBIGFileSystem::StdBIGFileSystem() : ArchiveFileSystem() {
-}
-
-StdBIGFileSystem::~StdBIGFileSystem() {
-}
-
-void StdBIGFileSystem::init() {
-	DEBUG_ASSERTCRASH(TheLocalFileSystem != nullptr, ("TheLocalFileSystem must be initialized before TheArchiveFileSystem."));
-	if (TheLocalFileSystem == nullptr) {
-		return;
-	}
-
-	loadBigFilesFromDirectory("", "*.big");
-
-#if RTS_ZEROHOUR
-    // load original Generals assets
-    AsciiString installPath;
-    GetStringFromGeneralsRegistry("", "InstallPath", installPath );
-    //@todo this will need to be ramped up to a crash for release
-    DEBUG_ASSERTCRASH(!installPath.isEmpty(), ("Be 1337! Go install Generals!"));
-    if (!installPath.isEmpty())
-      loadBigFilesFromDirectory(installPath, "*.big");
-#endif
-}
-
-void StdBIGFileSystem::reset() {
-}
-
-void StdBIGFileSystem::update() {
-}
-
-void StdBIGFileSystem::postProcessLoad() {
-}
-
-ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
-	File *fp = TheLocalFileSystem->openFile(filename, File::READ | File::BINARY);
-	AsciiString archiveFileName;
-	archiveFileName = filename;
-	archiveFileName.toLower();
-	Int archiveFileSize = 0;
-	Int numLittleFiles = 0;
-
-	ArchiveFile *archiveFile = NEW StdBIGFile(filename, AsciiString::TheEmptyString);
-
-	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - opening BIG file %s", filename));
-
-	if (fp == nullptr) {
-		DEBUG_CRASH(("Could not open archive file %s for parsing", filename));
-		return nullptr;
-	}
-
-	AsciiString asciibuf;
-	char buffer[_MAX_PATH];
-	fp->read(buffer, 4); // read the "BIG" at the beginning of the file.
-	buffer[4] = 0;
-	if (strcmp(buffer, BIGFileIdentifier) != 0) {
-		DEBUG_CRASH(("Error reading BIG file identifier in file %s", filename));
-		fp->close();
-		fp = nullptr;
-		return nullptr;
-	}
-
-	// read in the file size.
-	fp->read(&archiveFileSize, 4);
-
-	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - size of archive file is %d bytes", archiveFileSize));
-
-//	char t;
-
-	// read in the number of files contained in this BIG file.
-	// change the order of the bytes cause the file size is in reverse byte order for some reason.
-	fp->read(&numLittleFiles, 4);
-	numLittleFiles = betoh(numLittleFiles);
-
-	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - %d are contained in archive", numLittleFiles));
-//	for (Int i = 0; i < 2; ++i) {
-//		t = buffer[i];
-//		buffer[i] = buffer[(4-i)-1];
-//		buffer[(4-i)-1] = t;
-//	}
-
-	// seek to the beginning of the directory listing.
-	fp->seek(0x10, File::START);
-	// read in each directory listing.
-	ArchivedFileInfo fileInfo;
-	ArchiveFile *archiveFile = NEW ArchiveFile(filename, AsciiString::TheEmptyString);
-
-	for (Int i = 0; i < numLittleFiles; ++i) {
-		Int filesize = 0;
-		Int fileOffset = 0;
-		fp->read(&fileOffset, 4);
-		fp->read(&filesize, 4);
-
-		filesize = betoh(filesize);
-		fileOffset = betoh(fileOffset);
-
-		fileInfo.m_archiveFilename = archiveFileName;
-		fileInfo.m_offset = fileOffset;
-		fileInfo.m_size = filesize;
-
-		// read in the path name of the file.
-		Int pathIndex = -1;
-		do {
-			++pathIndex;
-			fp->read(buffer + pathIndex, 1);
-		} while (buffer[pathIndex] != 0);
-
-		Int filenameIndex = pathIndex;
-		while ((filenameIndex >= 0) && (buffer[filenameIndex] != '\\') && (buffer[filenameIndex] != '/')) {
-			--filenameIndex;
-		}
-
-		fileInfo.m_filename = (char *)(buffer + filenameIndex + 1);
-		fileInfo.m_filename.toLower();
-		buffer[filenameIndex + 1] = 0;
-
-		AsciiString path;
-		path = buffer;
-
-		AsciiString debugpath;
-		debugpath = path;
-		debugpath.concat(fileInfo.m_filename);
-//		DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
-
-		archiveFile->addFile(path, &fileInfo);
-	}
-
-	archiveFile->attachFile(fp);
-
-	// leave fp open as the archive file will be using it.
-
-	return archiveFile;
-}
-
-void StdBIGFileSystem::closeArchiveFile(const Char *filename) {
-	// Need to close the specified big file
-	ArchiveFileMap::iterator it =  m_archiveFileMap.find(filename);
-	if (it == m_archiveFileMap.end()) {
-		return;
-	}
-
-	if (stricmp(filename, MUSIC_BIG) == 0) {
-		// Stop the current audio
-		TheAudio->stopAudio(AudioAffect_Music);
-
-		// No need to turn off other audio, as the lookups will just fail.
-	}
-	DEBUG_ASSERTCRASH(stricmp(filename, MUSIC_BIG) == 0, ("Attempting to close Archive file '%s', need to add code to handle its shutdown correctly.", filename));
-
-	// may need to do some other processing here first.
-
-	delete (it->second);
-	m_archiveFileMap.erase(it);
-}
-
-void StdBIGFileSystem::closeAllArchiveFiles() {
-}
-
-void StdBIGFileSystem::closeAllFiles() {
-}
-
-Bool StdBIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
-
-	FilenameList filenameList;
-	TheLocalFileSystem->getFileListInDirectory(dir, "", fileMask, filenameList, TRUE);
-
-	Bool actuallyAdded = FALSE;
-	FilenameListIter it = filenameList.begin();
-	while (it != filenameList.end()) {
-#if RTS_ZEROHOUR
-		// TheSuperHackers @bugfix bobtista 18/11/2025 Skip duplicate INIZH.big in Data\INI to prevent CRC mismatches.
-		// English, Chinese, and Korean SKUs shipped with two INIZH.big files (one in Run directory, one in Run\Data\INI).
-		// The DeleteFile cleanup doesn't work on EA App/Origin installs because the folder is not writable, so we skip loading it instead.
-		if (it->endsWithNoCase("Data\\INI\\INIZH.big") || it->endsWithNoCase("Data/INI/INIZH.big")) {
-			it++;
-			continue;
-		}
-#endif
-
-		ArchiveFile *archiveFile = openArchiveFile((*it).str());
-
-		if (archiveFile != nullptr) {
-			DEBUG_LOG(("StdBIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.", (*it).str()));
-			loadIntoDirectoryTree(archiveFile, overwrite);
-			m_archiveFileMap[(*it)] = archiveFile;
-			DEBUG_LOG(("StdBIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.", (*it).str()));
-			actuallyAdded = TRUE;
-		}
-
-		it++;
-	}
-
-	return actuallyAdded;
-}
diff --git a/Core/Tools/Autorun/autorun.cpp b/Core/Tools/Autorun/autorun.cpp
index 2e5a428c2b3..4f3618dcf2a 100644
--- a/Core/Tools/Autorun/autorun.cpp
+++ b/Core/Tools/Autorun/autorun.cpp
@@ -119,7 +119,7 @@
 #include "GameClient/GameText.h"
 #include "Common/UnicodeString.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
+#include "Common/BIGFileSystem.h"
 #endif
 
 //-----------------------------------------------------------------------------
@@ -449,7 +449,7 @@ int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpszCmd
 	// create singletons
 	TheFileSystem->init();
 	TheLocalFileSystem = new Win32LocalFileSystem;
-	TheArchiveFileSystem = new Win32BIGFileSystem;
+	TheArchiveFileSystem = new BIGFileSystem;
 	TheGameText = CreateGameTextInterface();
 	TheGameText->init();
 
diff --git a/Core/Tools/MapCacheBuilder/Source/WinMain.cpp b/Core/Tools/MapCacheBuilder/Source/WinMain.cpp
index ab545a07892..fe7fcf1bc5d 100644
--- a/Core/Tools/MapCacheBuilder/Source/WinMain.cpp
+++ b/Core/Tools/MapCacheBuilder/Source/WinMain.cpp
@@ -51,8 +51,8 @@
 
 #include "Common/ThingFactory.h"
 #include "Common/FileSystem.h"
+#include "Common/BIGFileSystem.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
 #include "Common/SubsystemInterface.h"
 #include "GameClient/MapUtil.h"
 #include "W3DDevice/Common/W3DModuleFactory.h"
@@ -101,7 +101,6 @@
 #include <io.h>
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
 #include "WWLib/trim.h"
 
 
@@ -249,7 +248,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	TheFileSystem = new FileSystem;
 
 	initSubsystem(TheLocalFileSystem, (LocalFileSystem*)new Win32LocalFileSystem);
-	initSubsystem(TheArchiveFileSystem, (ArchiveFileSystem*)new Win32BIGFileSystem);
+	initSubsystem(TheArchiveFileSystem, (ArchiveFileSystem*)new BIGFileSystem);
 	INI ini;
 	initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");
 	initSubsystem(TheGameText, CreateGameTextInterface());
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
index bedd7c48520..dbb41d0f7b4 100644
--- a/Generals/Code/GameEngineDevice/CMakeLists.txt
+++ b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -70,7 +70,6 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameLogic/W3DGameLogic.h
     Include/W3DDevice/GameLogic/W3DGhostObject.h
     Include/W3DDevice/GameLogic/W3DTerrainLogic.h
-#    Include/Win32Device/Common/Win32BIGFileSystem.h
     Include/Win32Device/Common/Win32GameEngine.h
 #    Include/Win32Device/Common/Win32LocalFile.h
 #    Include/Win32Device/Common/Win32LocalFileSystem.h
@@ -167,7 +166,6 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameLogic/W3DGameLogic.cpp
     Source/W3DDevice/GameLogic/W3DGhostObject.cpp
     Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
-#    Source/Win32Device/Common/Win32BIGFileSystem.cpp
     Source/Win32Device/Common/Win32GameEngine.cpp
 #    Source/Win32Device/Common/Win32LocalFile.cpp
 #    Source/Win32Device/Common/Win32LocalFileSystem.cpp
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
index b17369dc844..01f5b0af14f 100644
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
+++ b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
@@ -37,7 +37,7 @@
 #include "GameLogic/GameLogic.h"
 #include "GameNetwork/NetworkInterface.h"
 #include "MilesAudioDevice/MilesAudioManager.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
+#include "Common/BIGFileSystem.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
 #include "W3DDevice/Common/W3DModuleFactory.h"
 #include "W3DDevice/GameLogic/W3DGameLogic.h"
@@ -93,7 +93,7 @@ inline ModuleFactory *Win32GameEngine::createModuleFactory() { return NEW W3DMod
 inline ThingFactory *Win32GameEngine::createThingFactory() { return NEW W3DThingFactory; }
 inline FunctionLexicon *Win32GameEngine::createFunctionLexicon() { return NEW W3DFunctionLexicon; }
 inline LocalFileSystem *Win32GameEngine::createLocalFileSystem() { return NEW Win32LocalFileSystem; }
-inline ArchiveFileSystem *Win32GameEngine::createArchiveFileSystem() { return NEW Win32BIGFileSystem; }
+inline ArchiveFileSystem *Win32GameEngine::createArchiveFileSystem() { return NEW BIGFileSystem; }
 inline ParticleSystemManager* Win32GameEngine::createParticleSystemManager(Bool dummy)
 {
 	if (dummy)
diff --git a/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp b/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp
index 4d18b320cd8..d5c928ff52a 100644
--- a/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp
@@ -85,7 +85,7 @@
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "Win32Device/GameClient/Win32DIKeyboard.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
+#include "Common/BIGFileSystem.h"
 
 #include "resource.h"
 #include "WinMain.h"
@@ -485,7 +485,7 @@ void GUIEdit::init()
 	// create file system
 	TheFileSystem = new FileSystem;
 	TheLocalFileSystem = new Win32LocalFileSystem;
-	TheArchiveFileSystem = new Win32BIGFileSystem;
+	TheArchiveFileSystem = new BIGFileSystem;
 	TheFileSystem->init();
 
 	//---------------------------------------------------------------------------
diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
index b3287235361..9c5421c320d 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
@@ -79,7 +79,7 @@
 #include <io.h>
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
+#include "Common/BIGFileSystem.h"
 
 
 static SubsystemInterfaceList TheSubsystemListRecord;
@@ -316,7 +316,7 @@ BOOL CWorldBuilderApp::InitInstance()
 	TheFileSystem = new FileSystem;
 
 	initSubsystem(TheLocalFileSystem, (LocalFileSystem*)new Win32LocalFileSystem);
-	initSubsystem(TheArchiveFileSystem, (ArchiveFileSystem*)new Win32BIGFileSystem);
+	initSubsystem(TheArchiveFileSystem, (ArchiveFileSystem*)new BIGFileSystem);
 
 	// Just for kicks, get the HINSTANCE that WOL would need
 	// if we were going to use it, which we aren't.
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
index e8567307646..d251e04bb38 100644
--- a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -81,7 +81,6 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameLogic/W3DGameLogic.h
     Include/W3DDevice/GameLogic/W3DGhostObject.h
     Include/W3DDevice/GameLogic/W3DTerrainLogic.h
-#    Include/Win32Device/Common/Win32BIGFileSystem.h
     Include/Win32Device/Common/Win32GameEngine.h
 #    Include/Win32Device/Common/Win32LocalFile.h
 #    Include/Win32Device/Common/Win32LocalFileSystem.h
@@ -180,7 +179,6 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameLogic/W3DGameLogic.cpp
     Source/W3DDevice/GameLogic/W3DGhostObject.cpp
     Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
-#    Source/Win32Device/Common/Win32BIGFileSystem.cpp
     Source/Win32Device/Common/Win32GameEngine.cpp
 #    Source/Win32Device/Common/Win32LocalFile.cpp
 #    Source/Win32Device/Common/Win32LocalFileSystem.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
index 2710cdf4555..e27eb8504c9 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
@@ -32,12 +32,12 @@
 
 #pragma once
 
+#include "Common/BIGFileSystem.h"
 #include "Common/GameEngine.h"
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/GameLogic.h"
 #include "GameNetwork/NetworkInterface.h"
 #include "MilesAudioDevice/MilesAudioManager.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
 #include "W3DDevice/Common/W3DModuleFactory.h"
 #include "W3DDevice/GameLogic/W3DGameLogic.h"
@@ -93,7 +93,7 @@ inline ModuleFactory *Win32GameEngine::createModuleFactory() { return NEW W3DMod
 inline ThingFactory *Win32GameEngine::createThingFactory() { return NEW W3DThingFactory; }
 inline FunctionLexicon *Win32GameEngine::createFunctionLexicon() { return NEW W3DFunctionLexicon; }
 inline LocalFileSystem *Win32GameEngine::createLocalFileSystem() { return NEW Win32LocalFileSystem; }
-inline ArchiveFileSystem *Win32GameEngine::createArchiveFileSystem() { return NEW Win32BIGFileSystem; }
+inline ArchiveFileSystem *Win32GameEngine::createArchiveFileSystem() { return NEW BIGFileSystem; }
 inline ParticleSystemManager* Win32GameEngine::createParticleSystemManager(Bool dummy)
 {
 	if (dummy)
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp
index 2cbc8ec3ffb..6ecfad34952 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp
@@ -85,7 +85,7 @@
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "Win32Device/GameClient/Win32DIKeyboard.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
+#include "Common/BIGFileSystem.h"
 
 #include "resource.h"
 #include "WinMain.h"
@@ -485,7 +485,7 @@ void GUIEdit::init()
 	// create file system
 	TheFileSystem = new FileSystem;
 	TheLocalFileSystem = new Win32LocalFileSystem;
-	TheArchiveFileSystem = new Win32BIGFileSystem;
+	TheArchiveFileSystem = new BIGFileSystem;
 	TheFileSystem->init();
 
 	//---------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
index d49589ee0c8..65d2fb82b8f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
@@ -79,7 +79,7 @@
 #include <io.h>
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
+#include "Common/BIGFileSystem.h"
 
 
 static SubsystemInterfaceList TheSubsystemListRecord;
@@ -326,7 +326,7 @@ BOOL CWorldBuilderApp::InitInstance()
 	TheFileSystem = new FileSystem;
 
 	initSubsystem(TheLocalFileSystem, (LocalFileSystem*)new Win32LocalFileSystem);
-	initSubsystem(TheArchiveFileSystem, (ArchiveFileSystem*)new Win32BIGFileSystem);
+	initSubsystem(TheArchiveFileSystem, (ArchiveFileSystem*)new BIGFileSystem);
 
 	// Just for kicks, get the HINSTANCE that WOL would need
 	// if we were going to use it, which we aren't.

From fcbc460c6861610084df4c5dff9f3a609f01289a Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Mon, 5 Oct 2026 20:11:49 +0200
Subject: [PATCH 09/13] refactor(archivefilesystem): Move loadMods to
 BIGFileSystem and rename loadBigFilesFromDirectory (#3505)

---
 .../Include/Common/ArchiveFileSystem.h        |  4 +-
 .../GameEngine/Include/Common/BIGFileSystem.h |  4 +-
 .../Common/System/ArchiveFileSystem.cpp       | 50 ----------------
 .../Source/Common/System/BIGFileSystem.cpp    | 60 +++++++++++++++++--
 4 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/Core/GameEngine/Include/Common/ArchiveFileSystem.h b/Core/GameEngine/Include/Common/ArchiveFileSystem.h
index 5583290bce0..ddad61637a6 100644
--- a/Core/GameEngine/Include/Common/ArchiveFileSystem.h
+++ b/Core/GameEngine/Include/Common/ArchiveFileSystem.h
@@ -141,9 +141,9 @@ class ArchiveFileSystem : public SubsystemInterface
 	void					getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.  Scans each Archive file.
 	Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo, FileInstance instance = 0) const; ///< see FileSystem.h
 
-	virtual Bool	loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
+	virtual Bool	loadArchiveFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
 
-	void loadMods();
+	virtual void loadMods() = 0;
 
 	ArchivedDirectoryInfo* friend_getArchivedDirectoryInfo(const Char* directory);
 
diff --git a/Core/GameEngine/Include/Common/BIGFileSystem.h b/Core/GameEngine/Include/Common/BIGFileSystem.h
index 602a63e4dd5..95e20c0ea6c 100644
--- a/Core/GameEngine/Include/Common/BIGFileSystem.h
+++ b/Core/GameEngine/Include/Common/BIGFileSystem.h
@@ -49,7 +49,9 @@ class BIGFileSystem : public ArchiveFileSystem
 	virtual void closeArchiveFile(const Char *filename) override;
 	virtual void closeAllFiles() override;															///< Close all files associated with ArchiveFiles
 
-	virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) override;
+	virtual Bool loadArchiveFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) override;
+
+	virtual void loadMods() override;
 protected:
 
 };
diff --git a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
index 17d49e8b372..2322827ef2b 100644
--- a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
+++ b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
@@ -51,8 +51,6 @@
 #include "Common/AsciiString.h"
 #include "Common/LocalFileSystem.h"
 #include "Common/PerfTimer.h"
-#include "../NGMP_include.h"
-#include "../OnlineServices_Init.h"
 
 
 //----------------------------------------------------------------------------
@@ -231,54 +229,6 @@ void ArchiveFileSystem::loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool ove
 	}
 }
 
-void ArchiveFileSystem::loadMods()
-{
-#if defined(GENERALS_ONLINE) && defined(GENERALS_ONLINE_COMMUNITY_PATCH_CHANGES)
-    // load community data patch BIG
-	if (NGMP_OnlineServicesManager::Settings.DataPacks_UseCommunityPatch()
-		&& !TheGlobalData->m_commandLineData.isCommunityDataPatchDisabled())
-    {
-        std::string strBigPath = std::format("{}GeneralsOnlineGameData/500_900_CommunityPatch_CoreINI.big", TheGlobalData->getPath_UserData().str());
-        bool bLoaded = false;
-        if (TheLocalFileSystem->doesFileExist(strBigPath.c_str()))
-        {
-            ArchiveFile* archiveFile = openArchiveFile(strBigPath.c_str());
-            if (archiveFile != nullptr)
-            {
-                // Sorted by filename so the patch respects the addon number order of BIGs in the game folder.
-                loadIntoDirectoryTree(archiveFile, FALSE, TRUE);
-                m_archiveFileMap[AsciiString(strBigPath.c_str())] = archiveFile;
-                bLoaded = true;
-            }
-        }
-        NetworkLog(ELogVerbosity::LOG_RELEASE, "Loaded community patch (%s): %d", strBigPath.c_str(), bLoaded);
-    }
-#endif
-
-	if (TheGlobalData->m_modBIG.isNotEmpty())
-	{
-		ArchiveFile *archiveFile = openArchiveFile(TheGlobalData->m_modBIG.str());
-
-		if (archiveFile != nullptr) {
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - loading %s into the directory tree.", TheGlobalData->m_modBIG.str()));
-			loadIntoDirectoryTree(archiveFile, TRUE);
-			m_archiveFileMap[TheGlobalData->m_modBIG] = archiveFile;
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - %s inserted into the archive file map.", TheGlobalData->m_modBIG.str()));
-		}
-		else
-		{
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - could not openArchiveFile(%s)", TheGlobalData->m_modBIG.str()));
-		}
-	}
-
-	if (TheGlobalData->m_modDir.isNotEmpty())
-	{
-		MAYBE_UNUSED Bool ret = loadBigFilesFromDirectory(TheGlobalData->m_modDir, "*.big", TRUE);
-		(void)ret;
-		DEBUG_ASSERTLOG(ret, ("loadBigFilesFromDirectory(%s) returned FALSE!", TheGlobalData->m_modDir.str()));
-	}
-}
-
 Bool ArchiveFileSystem::doesFileExist(const Char *filename, FileInstance instance) const
 {
 	ArchivedDirectoryInfoResult result = const_cast<ArchiveFileSystem*>(this)->getArchivedDirectoryInfo(filename);
diff --git a/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp b/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
index 6750525f15d..3bd1a29026c 100644
--- a/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
+++ b/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
@@ -42,6 +42,8 @@
 #endif
 
 #include "Utility/endian_compat.h"
+#include "../NGMP_include.h"
+#include "../OnlineServices_Init.h"
 
 
 static const char *BIGFileIdentifier = "BIGF";
@@ -58,7 +60,7 @@ void BIGFileSystem::init() {
 		return;
 	}
 
-	loadBigFilesFromDirectory("", "*.big");
+	loadArchiveFilesFromDirectory("", "*.big");
 
 #if RTS_ZEROHOUR
     // load original Generals assets
@@ -67,7 +69,7 @@ void BIGFileSystem::init() {
     //@todo this will need to be ramped up to a crash for release
     DEBUG_ASSERTCRASH(!installPath.isEmpty(), ("Be 1337! Go install Generals!"));
     if (!installPath.isEmpty())
-      loadBigFilesFromDirectory(installPath, "*.big");
+      loadArchiveFilesFromDirectory(installPath, "*.big");
 #endif
 }
 
@@ -236,7 +238,7 @@ void BIGFileSystem::closeAllArchiveFiles() {
 void BIGFileSystem::closeAllFiles() {
 }
 
-Bool BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
+Bool BIGFileSystem::loadArchiveFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
 
 	FilenameList filenameList;
 	TheLocalFileSystem->getFileListInDirectory(dir, "", fileMask, filenameList, TRUE);
@@ -257,10 +259,10 @@ Bool BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileM
 		ArchiveFile *archiveFile = openArchiveFile((*it).str());
 
 		if (archiveFile != nullptr) {
-			DEBUG_LOG(("BIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.", (*it).str()));
+			DEBUG_LOG(("BIGFileSystem::loadArchiveFilesFromDirectory - loading %s into the directory tree.", (*it).str()));
 			loadIntoDirectoryTree(archiveFile, overwrite);
 			m_archiveFileMap[(*it)] = archiveFile;
-			DEBUG_LOG(("BIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.", (*it).str()));
+			DEBUG_LOG(("BIGFileSystem::loadArchiveFilesFromDirectory - %s inserted into the archive file map.", (*it).str()));
 			actuallyAdded = TRUE;
 		}
 
@@ -269,3 +271,51 @@ Bool BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileM
 
 	return actuallyAdded;
 }
+
+void BIGFileSystem::loadMods()
+{
+#if defined(GENERALS_ONLINE) && defined(GENERALS_ONLINE_COMMUNITY_PATCH_CHANGES)
+	// load community data patch BIG
+	if (NGMP_OnlineServicesManager::Settings.DataPacks_UseCommunityPatch()
+		&& !TheGlobalData->m_commandLineData.isCommunityDataPatchDisabled())
+	{
+		std::string strBigPath = std::format("{}GeneralsOnlineGameData/500_900_CommunityPatch_CoreINI.big", TheGlobalData->getPath_UserData().str());
+		bool bLoaded = false;
+		if (TheLocalFileSystem->doesFileExist(strBigPath.c_str()))
+		{
+			ArchiveFile* archiveFile = openArchiveFile(strBigPath.c_str());
+			if (archiveFile != nullptr)
+			{
+				// Sorted by filename so the patch respects the addon number order of BIGs in the game folder.
+				loadIntoDirectoryTree(archiveFile, FALSE, TRUE);
+				m_archiveFileMap[AsciiString(strBigPath.c_str())] = archiveFile;
+				bLoaded = true;
+			}
+		}
+		NetworkLog(ELogVerbosity::LOG_RELEASE, "Loaded community patch (%s): %d", strBigPath.c_str(), bLoaded);
+	}
+#endif
+
+	if (TheGlobalData->m_modBIG.isNotEmpty())
+	{
+		ArchiveFile *archiveFile = openArchiveFile(TheGlobalData->m_modBIG.str());
+
+		if (archiveFile != nullptr) {
+			DEBUG_LOG(("BIGFileSystem::loadMods - loading %s into the directory tree.", TheGlobalData->m_modBIG.str()));
+			loadIntoDirectoryTree(archiveFile, TRUE);
+			m_archiveFileMap[TheGlobalData->m_modBIG] = archiveFile;
+			DEBUG_LOG(("BIGFileSystem::loadMods - %s inserted into the archive file map.", TheGlobalData->m_modBIG.str()));
+		}
+		else
+		{
+			DEBUG_LOG(("BIGFileSystem::loadMods - could not openArchiveFile(%s)", TheGlobalData->m_modBIG.str()));
+		}
+	}
+
+	if (TheGlobalData->m_modDir.isNotEmpty())
+	{
+		MAYBE_UNUSED Bool ret = loadArchiveFilesFromDirectory(TheGlobalData->m_modDir, "*.big", TRUE);
+		(void)ret;
+		DEBUG_ASSERTLOG(ret, ("loadArchiveFilesFromDirectory(%s) returned FALSE!", TheGlobalData->m_modDir.str()));
+	}
+}

From d8cf0bb12e3ba2e993add7c6973a0bb0a58ab863 Mon Sep 17 00:00:00 2001
From: Tin Tin Hamans <5984296+tintinhamans@users.noreply.github.com>
Date: Tue, 27 Oct 2026 21:39:08 +0100
Subject: [PATCH 10/13] fix(bigfilesystem): Reject malformed BIG archives
 (#3588)

---
 .../Source/Common/System/BIGFileSystem.cpp    | 94 +++++++++----------
 1 file changed, 45 insertions(+), 49 deletions(-)

diff --git a/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp b/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
index 3bd1a29026c..d5fb1ec8fd6 100644
--- a/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
+++ b/Core/GameEngine/Source/Common/System/BIGFileSystem.cpp
@@ -46,7 +46,35 @@
 #include "../OnlineServices_Init.h"
 
 
-static const char *BIGFileIdentifier = "BIGF";
+static const char BIGFileIdentifier[] = { 'B', 'I', 'G', 'F' };
+
+struct BIGFileHeader {
+	char identifier[sizeof(BIGFileIdentifier)];
+	UnsignedInt archiveFileSize; // little endian, retail reads it as Int so 2 GB max
+	UnsignedInt numFiles; // big endian
+	UnsignedInt firstEntryOffset; // big endian
+};
+
+struct BIGFileEntryHeader {
+	UnsignedInt fileOffset; // big endian
+	UnsignedInt fileSize; // big endian
+};
+
+static_assert(sizeof(BIGFileHeader) == 16, "Incorrect BIG header size");
+static_assert(sizeof(BIGFileEntryHeader) == 8, "Incorrect BIG entry header size");
+
+// Returns the length of the string, or -1 if it is truncated or does not fit the buffer.
+static Int readNullTerminatedString(File *fp, char *buffer, Int bufferSize) {
+	for (Int i = 0; i < bufferSize; ++i) {
+		if (fp->read(buffer + i, 1) != 1) {
+			return -1;
+		}
+		if (buffer[i] == 0) {
+			return i;
+		}
+	}
+	return -1;
+}
 
 BIGFileSystem::BIGFileSystem() : ArchiveFileSystem() {
 }
@@ -87,8 +115,9 @@ ArchiveFile * BIGFileSystem::openArchiveFile(const Char *filename) {
 	AsciiString archiveFileName;
 	archiveFileName = filename;
 	archiveFileName.toLower();
-	Int archiveFileSize = 0;
-	Int numLittleFiles = 0;
+	UnsignedInt archiveFileSize = 0;
+	UnsignedInt numLittleFiles = 0;
+	BIGFileHeader header;
 
 	DEBUG_LOG(("BIGFileSystem::openArchiveFile - opening BIG file %s", filename));
 
@@ -99,79 +128,46 @@ ArchiveFile * BIGFileSystem::openArchiveFile(const Char *filename) {
 
 	AsciiString asciibuf;
 	char buffer[_MAX_PATH];
-	// read the "BIG" at the beginning of the file.
-	buffer[4] = 0;
-	if (fp->read(buffer, 4) != 4 || strcmp(buffer, BIGFileIdentifier) != 0) {
-		DEBUG_CRASH(("Error reading BIG file identifier in file %s", filename));
+	if (fp->read(&header, sizeof(header)) != sizeof(header) || memcmp(header.identifier, BIGFileIdentifier, sizeof(BIGFileIdentifier)) != 0) {
+		DEBUG_CRASH(("Error reading BIG file header in file %s", filename));
 		fp->close();
 		fp = nullptr;
 		return nullptr;
 	}
 
-	// read in the file size.
-	if (fp->read(&archiveFileSize, 4) != 4) {
-		DEBUG_CRASH(("Error reading BIG file size in file %s", filename));
-		fp->close();
-		fp = nullptr;
-		return nullptr;
-	}
+	archiveFileSize = letoh(header.archiveFileSize);
+	numLittleFiles = betoh(header.numFiles);
 
-	DEBUG_LOG(("BIGFileSystem::openArchiveFile - size of archive file is %d bytes", archiveFileSize));
+	DEBUG_LOG(("BIGFileSystem::openArchiveFile - size of archive file is %u bytes", archiveFileSize));
 
 //	char t;
 
-	// read in the number of files contained in this BIG file.
-	// change the order of the bytes cause the file size is in reverse byte order for some reason.
-	if (fp->read(&numLittleFiles, 4) != 4) {
-		DEBUG_CRASH(("Error reading BIG file count in file %s", filename));
-		fp->close();
-		fp = nullptr;
-		return nullptr;
-	}
-	numLittleFiles = betoh(numLittleFiles);
-
-	DEBUG_LOG(("BIGFileSystem::openArchiveFile - %d are contained in archive", numLittleFiles));
+	DEBUG_LOG(("BIGFileSystem::openArchiveFile - %u are contained in archive", numLittleFiles));
 //	for (Int i = 0; i < 2; ++i) {
 //		t = buffer[i];
 //		buffer[i] = buffer[(4-i)-1];
 //		buffer[(4-i)-1] = t;
 //	}
 
-	// seek to the beginning of the directory listing.
-	fp->seek(0x10, File::START);
 	// read in each directory listing.
 	ArchivedFileInfo fileInfo;
 	ArchiveFile *archiveFile = NEW ArchiveFile(filename, AsciiString::TheEmptyString);
 
 	Bool corrupt = FALSE;
-	for (Int i = 0; i < numLittleFiles; ++i) {
-		Int filesize = 0;
-		Int fileOffset = 0;
-		if (fp->read(&fileOffset, 4) != 4 || fp->read(&filesize, 4) != 4) {
+	for (UnsignedInt i = 0; i < numLittleFiles; ++i) {
+		BIGFileEntryHeader entry;
+		if (fp->read(&entry, sizeof(entry)) != sizeof(entry)) {
 			corrupt = TRUE;
 			break;
 		}
 
-		filesize = betoh(filesize);
-		fileOffset = betoh(fileOffset);
-
 		fileInfo.m_archiveFilename = archiveFileName;
-		fileInfo.m_offset = fileOffset;
-		fileInfo.m_size = filesize;
+		fileInfo.m_offset = betoh(entry.fileOffset);
+		fileInfo.m_size = betoh(entry.fileSize);
 
 		// read in the path name of the file.
-		// the name must terminate within the buffer
-		Int pathIndex = -1;
-		Bool terminated = FALSE;
-		while (++pathIndex < (Int)sizeof(buffer)) {
-			if (fp->read(buffer + pathIndex, 1) != 1)
-				break;
-			if (buffer[pathIndex] == 0) {
-				terminated = TRUE;
-				break;
-			}
-		}
-		if (!terminated) {
+		const Int pathIndex = readNullTerminatedString(fp, buffer, sizeof(buffer));
+		if (pathIndex < 0) {
 			corrupt = TRUE;
 			break;
 		}

From 42596c256a32436e84fb0e8990b8519cdee2a372 Mon Sep 17 00:00:00 2001
From: Okladnoj <dmytrijokladnoj@gmail.com>
Date: Thu, 22 Oct 2026 20:11:04 +0300
Subject: [PATCH 11/13] bugfix(filesystem): Use lower_bound instead of find to
 place an overwriting archive first

---
 Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
index 2322827ef2b..44c436c9227 100644
--- a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
+++ b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
@@ -177,7 +177,7 @@ void ArchiveFileSystem::loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool ove
 		else if (overwrite)
 		{
 			// When overwriting, try place the new value at the beginning of the key list.
-			fileIt = dirInfo->m_files.find(token);
+			fileIt = dirInfo->m_files.lower_bound(token);
 		}
 		else
 		{

From 2fb01fd6545a5954720dad10982eaf1523613da8 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Sun, 27 Sep 2026 10:49:17 +0200
Subject: [PATCH 12/13] fix(string): Fix token clearing in
 AsciiString::nextToken(), UnicodeString::nextToken() (#3374)

---
 Core/GameEngine/Include/Common/AsciiString.h    |  4 ++--
 Core/GameEngine/Include/Common/UnicodeString.h  |  4 ++--
 .../Source/Common/System/AsciiString.cpp        | 17 +++++++++++------
 .../Source/Common/System/UnicodeString.cpp      | 17 +++++++++++------
 .../GameEngine/Source/Common/CommandLine.cpp    |  1 +
 .../GameEngine/Source/Common/CommandLine.cpp    |  1 +
 6 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/Core/GameEngine/Include/Common/AsciiString.h b/Core/GameEngine/Include/Common/AsciiString.h
index 66e4982927e..759f72ca913 100644
--- a/Core/GameEngine/Include/Common/AsciiString.h
+++ b/Core/GameEngine/Include/Common/AsciiString.h
@@ -353,12 +353,12 @@ class AsciiString
 	/**
 		conceptually similar to strtok():
 
-		extract the next seps-delimited token from the front
+		extract the next separators-delimited token from the front
 		of 'this' and copy it into 'token', returning true if a nonempty
 		token was found. (note that this modifies 'this' as well, stripping
 		the token off!)
 	*/
-	Bool nextToken(AsciiString* token, const char* seps = nullptr);
+	Bool nextToken(AsciiString* token, const char* separators = nullptr);
 
 	/**
 		return true iff the string is "NONE" (case-insensitive).
diff --git a/Core/GameEngine/Include/Common/UnicodeString.h b/Core/GameEngine/Include/Common/UnicodeString.h
index 0f3c2333c44..58d73d183ea 100644
--- a/Core/GameEngine/Include/Common/UnicodeString.h
+++ b/Core/GameEngine/Include/Common/UnicodeString.h
@@ -343,12 +343,12 @@ class UnicodeString
 	/**
 		conceptually similar to strtok():
 
-		extract the next whitespace-delimited token from the front
+		extract the next separators-delimited token from the front
 		of 'this' and copy it into 'token', returning true if a nonempty
 		token was found. (note that this modifies 'this' as well, stripping
 		the token off!)
 	*/
-	Bool nextToken(UnicodeString* token, UnicodeString delimiters = UnicodeString::TheEmptyString);
+	Bool nextToken(UnicodeString* token, const WideChar* separators = nullptr);
 
 //
 // You might think it would be a good idea to overload the * operator
diff --git a/Core/GameEngine/Source/Common/System/AsciiString.cpp b/Core/GameEngine/Source/Common/System/AsciiString.cpp
index afa1b96186b..1cb3bfb6046 100644
--- a/Core/GameEngine/Source/Common/System/AsciiString.cpp
+++ b/Core/GameEngine/Source/Common/System/AsciiString.cpp
@@ -607,16 +607,21 @@ Bool AsciiString::isNone() const
 }
 
 //-----------------------------------------------------------------------------
-Bool AsciiString::nextToken(AsciiString* tok, const char* seps)
+Bool AsciiString::nextToken(AsciiString* tok, const char* separators)
 {
-	if (this->isEmpty() || tok == this)
+	DEBUG_ASSERTCRASH(tok != this, ("Tokenizer and Token cannot be the same object"));
+
+	if (this->isEmpty())
+	{
+		tok->clear();
 		return false;
+	}
 
-	if (seps == nullptr)
-		seps = " \n\r\t";
+	if (separators == nullptr)
+		separators = " \n\r\t";
 
-	char* start = skipSeps(peek(), seps);
-	char* end = skipNonSeps(start, seps);
+	char* start = skipSeps(peek(), separators);
+	char* end = skipNonSeps(start, separators);
 
 	if (end > start)
 	{
diff --git a/Core/GameEngine/Source/Common/System/UnicodeString.cpp b/Core/GameEngine/Source/Common/System/UnicodeString.cpp
index e21c0ea38dc..3e8980b6395 100644
--- a/Core/GameEngine/Source/Common/System/UnicodeString.cpp
+++ b/Core/GameEngine/Source/Common/System/UnicodeString.cpp
@@ -460,20 +460,25 @@ Bool UnicodeString::endsWithNoCase(const WideChar* p) const
 }
 
 //-----------------------------------------------------------------------------
-Bool UnicodeString::nextToken(UnicodeString* tok, UnicodeString delimiters)
+Bool UnicodeString::nextToken(UnicodeString* tok, const WideChar* separators)
 {
-	if (this->isEmpty() || tok == this)
+	DEBUG_ASSERTCRASH(tok != this, ("Tokenizer and Token cannot be the same object"));
+
+	if (this->isEmpty())
+	{
+		tok->clear();
 		return false;
+	}
 
-	if (delimiters.isEmpty())
-		delimiters = L" \t\n\r";
+	if (separators == nullptr)
+		separators = L" \t\n\r";
 
 	Int offset;
 
-	offset = wcsspn(peek(), delimiters.str());
+	offset = wcsspn(peek(), separators);
 	WideChar* start = peek() + offset;
 
-	offset = wcscspn(start, delimiters.str());
+	offset = wcscspn(start, separators);
 	WideChar* end = start + offset;
 
 	if (end > start)
diff --git a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp
index 772830f0f67..0eee5949dc0 100644
--- a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp
+++ b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp
@@ -93,6 +93,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 	if (!token.endsWithNoCase(".map"))
 	{
 		DEBUG_CRASH(("Invalid map name %s", mapName.str()));
+		return;
 	}
 	// remove the .map from the end.
 	token.truncateBy(4);
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
index 7a43b85c8ca..3e1f2f91917 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
@@ -93,6 +93,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 	if (!token.endsWithNoCase(".map"))
 	{
 		DEBUG_CRASH(("Invalid map name %s", mapName.str()));
+		return;
 	}
 	// remove the .map from the end.
 	token.truncateBy(4);

From 24e01a76a486ad902835a8cb67bc04d1060ce26e Mon Sep 17 00:00:00 2001
From: tintinhamans <5984296+tintinhamans@users.noreply.github.com>
Date: Sat, 10 Oct 2026 03:43:44 +0200
Subject: [PATCH 13/13] fix(filesystem): Only list archive subdirectories when
 asked

---
 .../Source/Common/System/ArchiveFile.cpp       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
index 9e0db3f0ee2..ce82fa0b4a8 100644
--- a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
+++ b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
@@ -150,15 +150,17 @@ void ArchiveFile::getFileListInDirectory(const AsciiString& currentDirectory, co
 
 void ArchiveFile::getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
 {
-	DetailedArchivedDirectoryInfoMap::const_iterator diriter = dirInfo->m_directories.begin();
-	for (; diriter != dirInfo->m_directories.end(); ++diriter) {
-		const DetailedArchivedDirectoryInfo *tempDirInfo = &(diriter->second);
-		AsciiString tempDirName = currentDirectory;
-		if (!tempDirName.isEmpty() && !tempDirName.endsWith("\\")) {
-			tempDirName.concat('\\');
+	if (searchSubdirectories) {
+		DetailedArchivedDirectoryInfoMap::const_iterator diriter = dirInfo->m_directories.begin();
+		for (; diriter != dirInfo->m_directories.end(); ++diriter) {
+			const DetailedArchivedDirectoryInfo *tempDirInfo = &(diriter->second);
+			AsciiString tempDirName = currentDirectory;
+			if (!tempDirName.isEmpty() && !tempDirName.endsWith("\\")) {
+				tempDirName.concat('\\');
+			}
+			tempDirName.concat(tempDirInfo->m_directoryName);
+			getFileListInDirectory(tempDirInfo, tempDirName, searchName, filenameList, searchSubdirectories);
 		}
-		tempDirName.concat(tempDirInfo->m_directoryName);
-		getFileListInDirectory(tempDirInfo, tempDirName, searchName, filenameList, searchSubdirectories);
 	}
 
 	ArchivedFileInfoMap::const_iterator fileiter = dirInfo->m_files.begin();