Unify code of WWDownload library and move its files to Core

Core/Libraries/Source/WWVegas/CMakeLists.txt

@@ -30,7 +30,7 @@ add_subdirectory(WWMath)
 add_subdirectory(WWSaveLoad)
 add_subdirectory(WWStub)
 # add_subdirectory(WW3D2)
-# add_subdirectory(WWDownload)
+add_subdirectory(WWDownload)
 # add_subdirectory(wwshade)
 
 # Helpful interface to bundle the ww modules together.
@@ -40,7 +40,7 @@ target_include_directories(core_wwvegas INTERFACE
     .
     #WW3D2
     WWDebug
-    #WWDownload
+    WWDownload
     WWLib
     WWMath
     WWSaveLoad
@@ -54,6 +54,5 @@ target_link_libraries(core_wwvegas INTERFACE
     core_wwlib
     core_wwmath
     core_wwsaveload
-    # core_wwshade
     # core_wwutil
 )

Core/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt

@@ -0,0 +1,21 @@
+set(WWDOWNLOAD_SRC
+    Download.cpp
+    Download.h
+    DownloadDebug.h
+    downloaddefs.h
+    FTP.CPP
+    ftp.h
+    ftpdefs.h
+    registry.cpp
+    Registry.h
+    urlBuilder.cpp
+    urlBuilder.h
+)
+
+add_library(corei_wwdownload INTERFACE)
+
+target_sources(corei_wwdownload INTERFACE ${WWDOWNLOAD_SRC})
+
+target_link_libraries(corei_wwdownload INTERFACE
+    core_wwcommon
+)

Generals/Code/Libraries/Source/WWVegas/WWDownload/FTP.CPP → Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals(tm)
+**	Command & Conquer Generals Zero Hour(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
 **	This program is free software: you can redistribute it and/or modify

GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/registry.cpp → Core/Libraries/Source/WWVegas/WWDownload/registry.cpp

@@ -113,7 +113,11 @@ bool setUnsignedIntInRegistry( HKEY root, std::string path, std::string key, uns
 
 bool GetStringFromRegistry(std::string path, std::string key, std::string& val)
 {
+#if RTS_GENERALS
+	std::string fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Generals";
+#elif RTS_ZEROHOUR
 	std::string fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour";
+#endif
 
 	fullPath.append(path);
 	if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val))
@@ -126,7 +130,11 @@ bool GetStringFromRegistry(std::string path, std::string key, std::string& val)
 
 bool GetUnsignedIntFromRegistry(std::string path, std::string key, unsigned int& val)
 {
+#if RTS_GENERALS
+	std::string fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Generals";
+#elif RTS_ZEROHOUR
 	std::string fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour";
+#endif
 
 	fullPath.append(path);
 	if (getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val))
@@ -139,7 +147,11 @@ bool GetUnsignedIntFromRegistry(std::string path, std::string key, unsigned int&
 
 bool SetStringInRegistry( std::string path, std::string key, std::string val)
 {
+#if RTS_GENERALS
+	std::string fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Generals";
+#elif RTS_ZEROHOUR
 	std::string fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour";
+#endif
 	fullPath.append(path);
 
 	if (setStringInRegistry( HKEY_LOCAL_MACHINE, fullPath, key, val))
@@ -150,7 +162,11 @@ bool SetStringInRegistry( std::string path, std::string key, std::string val)
 
 bool SetUnsignedIntInRegistry( std::string path, std::string key, unsigned int val)
 {
+#if RTS_GENERALS
+	std::string fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Generals";
+#elif RTS_ZEROHOUR
 	std::string fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour";
+#endif
 	fullPath.append(path);
 
 	if (setUnsignedIntInRegistry( HKEY_LOCAL_MACHINE, fullPath, key, val))

GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/urlBuilder.cpp → Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.cpp

@@ -23,7 +23,11 @@
 void FormatURLFromRegistry( std::string& gamePatchURL, std::string& mapPatchURL,
 													 std::string& configURL, std::string& motdURL )
 {
+#if RTS_GENERALS
+	std::string sku = "generals";
+#elif RTS_ZEROHOUR
 	std::string sku = "GeneralsZH";
+#endif
 	std::string language = "english";
 	unsigned int version = 0; // invalid version - can't get on with a corrupt reg.
 	unsigned int mapVersion = 0; // invalid version - can't get on with a corrupt reg.

Generals/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt

@@ -1,25 +1,8 @@
-# Set source files
-set(WWDOWNLOAD_SRC
-    Download.cpp
-    Download.h
-    DownloadDebug.h
-    downloaddefs.h
-    FTP.CPP
-    ftp.h
-    ftpdefs.h
-    registry.cpp
-    Registry.h
-    urlBuilder.cpp
-    urlBuilder.h
-)
-
-# Targets to build.
 add_library(g_wwdownload STATIC)
 set_target_properties(g_wwdownload PROPERTIES OUTPUT_NAME wwdownload)
 
-target_sources(g_wwdownload PRIVATE ${WWDOWNLOAD_SRC})
-
 target_link_libraries(g_wwdownload PRIVATE
-    g_wwcommon
+    corei_wwdownload
+    gi_always
     gi_gameengine_include
 )