[GEN][ZH] Unify all code of WWDownload (#785)

xezon · xezon · commit cdd8d6415df8 · 2025-04-30T20:47:12.000+02:00
diff --git a/Generals/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
@@ -21,5 +21,6 @@ target_sources(g_wwdownload PRIVATE ${WWDOWNLOAD_SRC})
 
 target_link_libraries(g_wwdownload PRIVATE
     g_wwcommon
+    gi_always
     gi_gameengine_include
 )
diff --git a/Generals/Code/Libraries/Source/WWVegas/WWDownload/registry.cpp b/Generals/Code/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))
diff --git a/Generals/Code/Libraries/Source/WWVegas/WWDownload/urlBuilder.cpp b/Generals/Code/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.
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
@@ -21,5 +21,6 @@ target_sources(z_wwdownload PRIVATE ${WWDOWNLOAD_SRC})
 
 target_link_libraries(z_wwdownload PRIVATE
     z_wwcommon
+    zi_always
     zi_gameengine_include
 )
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/FTP.CPP b/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/FTP.CPP
@@ -40,9 +40,10 @@
 
 #include "DownloadDebug.h"
 
-#ifndef RTS_DEBUG
-#define RTS_DEBUG
-#endif
+// umm... what?? BGC 3/27/03
+//#ifndef RTS_DEBUG
+//#define RTS_DEBUG
+//#endif
 
 /*************************************************************************/
 /*_$                      External References                            */
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/registry.cpp b/GeneralsMD/Code/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))
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/urlBuilder.cpp b/GeneralsMD/Code/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.

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@ target_sources(g_wwdownload PRIVATE ${WWDOWNLOAD_SRC})`
`21`	`21`
`22`	`22`	`target_link_libraries(g_wwdownload PRIVATE`
`23`	`23`	`g_wwcommon`
	`24`	`+ gi_always`
`24`	`25`	`gi_gameengine_include`
`25`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@ target_sources(z_wwdownload PRIVATE ${WWDOWNLOAD_SRC})`
`21`	`21`
`22`	`22`	`target_link_libraries(z_wwdownload PRIVATE`
`23`	`23`	`z_wwcommon`
	`24`	`+ zi_always`
`24`	`25`	`zi_gameengine_include`
`25`	`26`	`)`