fix(registry): prioritize HKEY_CURRENT_USER over HKEY_LOCAL_MACHINE to prevent stale values

bobtista · bobtista · commit 4f4d124a5fed · 2025-11-12T23:40:24.000-05:00
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/registry.cpp b/Core/Libraries/Source/WWVegas/WWDownload/registry.cpp
@@ -120,12 +120,12 @@ bool GetStringFromRegistry(std::string path, std::string key, std::string& val)
 #endif
 
 	fullPath.append(path);
-	if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val))
+	if (getStringFromRegistry(HKEY_CURRENT_USER, fullPath.c_str(), key.c_str(), val))
 	{
 		return true;
 	}
 
-	return getStringFromRegistry(HKEY_CURRENT_USER, fullPath.c_str(), key.c_str(), val);
+	return getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val);
 }
 
 bool GetUnsignedIntFromRegistry(std::string path, std::string key, unsigned int& val)
@@ -137,12 +137,12 @@ bool GetUnsignedIntFromRegistry(std::string path, std::string key, unsigned int&
 #endif
 
 	fullPath.append(path);
-	if (getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val))
+	if (getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.c_str(), key.c_str(), val))
 	{
 		return true;
 	}
 
-	return getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.c_str(), key.c_str(), val);
+	return getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val);
 }
 
 bool SetStringInRegistry( std::string path, std::string key, std::string val)
@@ -154,9 +154,6 @@ bool SetStringInRegistry( std::string path, std::string key, std::string val)
 #endif
 	fullPath.append(path);
 
-	if (setStringInRegistry( HKEY_LOCAL_MACHINE, fullPath, key, val))
-		return true;
-
 	return setStringInRegistry( HKEY_CURRENT_USER, fullPath, key, val );
 }
 
@@ -169,9 +166,6 @@ bool SetUnsignedIntInRegistry( std::string path, std::string key, unsigned int v
 #endif
 	fullPath.append(path);
 
-	if (setUnsignedIntInRegistry( HKEY_LOCAL_MACHINE, fullPath, key, val))
-		return true;
-
 	return setUnsignedIntInRegistry( HKEY_CURRENT_USER, fullPath, key, val );
 }
 
diff --git a/Generals/Code/GameEngine/Source/Common/System/registry.cpp b/Generals/Code/GameEngine/Source/Common/System/registry.cpp
@@ -121,12 +121,12 @@ Bool GetStringFromRegistry(AsciiString path, AsciiString key, AsciiString& val)
 
 	fullPath.concat(path);
 	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
-	if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
+	if (getStringFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
 	}
 
-	return getStringFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val);
+	return getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val);
 }
 
 Bool GetUnsignedIntFromRegistry(AsciiString path, AsciiString key, UnsignedInt& val)
@@ -135,12 +135,12 @@ Bool GetUnsignedIntFromRegistry(AsciiString path, AsciiString key, UnsignedInt&
 
 	fullPath.concat(path);
 	DEBUG_LOG(("GetUnsignedIntFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
-	if (getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
+	if (getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
 	}
 
-	return getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val);
+	return getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val);
 }
 
 AsciiString GetRegistryLanguage(void)
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp
@@ -121,12 +121,12 @@ Bool GetStringFromGeneralsRegistry(AsciiString path, AsciiString key, AsciiStrin
 
 	fullPath.concat(path);
 	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
-	if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
+	if (getStringFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
 	}
 
-	return getStringFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val);
+	return getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val);
 }
 
 Bool GetStringFromRegistry(AsciiString path, AsciiString key, AsciiString& val)
@@ -135,12 +135,12 @@ Bool GetStringFromRegistry(AsciiString path, AsciiString key, AsciiString& val)
 
 	fullPath.concat(path);
 	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
-	if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
+	if (getStringFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
 	}
 
-	return getStringFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val);
+	return getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val);
 }
 
 Bool GetUnsignedIntFromRegistry(AsciiString path, AsciiString key, UnsignedInt& val)
@@ -149,12 +149,12 @@ Bool GetUnsignedIntFromRegistry(AsciiString path, AsciiString key, UnsignedInt&
 
 	fullPath.concat(path);
 	DEBUG_LOG(("GetUnsignedIntFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
-	if (getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
+	if (getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
 	}
 
-	return getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val);
+	return getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val);
 }
 
 AsciiString GetRegistryLanguage(void)

Original file line number	Diff line number	Diff line change
`@@ -120,12 +120,12 @@ bool GetStringFromRegistry(std::string path, std::string key, std::string& val)`
`120`	`120`	`#endif`
`121`	`121`
`122`	`122`	`fullPath.append(path);`
`123`		`- if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val))`
	`123`	`+ if (getStringFromRegistry(HKEY_CURRENT_USER, fullPath.c_str(), key.c_str(), val))`
`124`	`124`	`{`
`125`	`125`	`return true;`
`126`	`126`	`}`
`127`	`127`
`128`		`- return getStringFromRegistry(HKEY_CURRENT_USER, fullPath.c_str(), key.c_str(), val);`
	`128`	`+ return getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`bool GetUnsignedIntFromRegistry(std::string path, std::string key, unsigned int& val)`
`@@ -137,12 +137,12 @@ bool GetUnsignedIntFromRegistry(std::string path, std::string key, unsigned int&`
`137`	`137`	`#endif`
`138`	`138`
`139`	`139`	`fullPath.append(path);`
`140`		`- if (getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val))`
	`140`	`+ if (getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.c_str(), key.c_str(), val))`
`141`	`141`	`{`
`142`	`142`	`return true;`
`143`	`143`	`}`
`144`	`144`
`145`		`- return getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.c_str(), key.c_str(), val);`
	`145`	`+ return getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.c_str(), key.c_str(), val);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`bool SetStringInRegistry( std::string path, std::string key, std::string val)`
`@@ -154,9 +154,6 @@ bool SetStringInRegistry( std::string path, std::string key, std::string val)`
`154`	`154`	`#endif`
`155`	`155`	`fullPath.append(path);`
`156`	`156`
`157`		`- if (setStringInRegistry( HKEY_LOCAL_MACHINE, fullPath, key, val))`
`158`		`- return true;`
`159`		`-`
`160`	`157`	`return setStringInRegistry( HKEY_CURRENT_USER, fullPath, key, val );`
`161`	`158`	`}`
`162`	`159`
`@@ -169,9 +166,6 @@ bool SetUnsignedIntInRegistry( std::string path, std::string key, unsigned int v`
`169`	`166`	`#endif`
`170`	`167`	`fullPath.append(path);`
`171`	`168`
`172`		`- if (setUnsignedIntInRegistry( HKEY_LOCAL_MACHINE, fullPath, key, val))`
`173`		`- return true;`
`174`		`-`
`175`	`169`	`return setUnsignedIntInRegistry( HKEY_CURRENT_USER, fullPath, key, val );`
`176`	`170`	`}`
`177`	`171`
Original file line number	Diff line number	Diff line change
`@@ -121,12 +121,12 @@ Bool GetStringFromRegistry(AsciiString path, AsciiString key, AsciiString& val)`
`121`	`121`
`122`	`122`	`fullPath.concat(path);`
`123`	`123`	`DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));`
`124`		`- if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))`
	`124`	`+ if (getStringFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val))`
`125`	`125`	`{`
`126`	`126`	`return TRUE;`
`127`	`127`	`}`
`128`	`128`
`129`		`- return getStringFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val);`
	`129`	`+ return getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`Bool GetUnsignedIntFromRegistry(AsciiString path, AsciiString key, UnsignedInt& val)`
`@@ -135,12 +135,12 @@ Bool GetUnsignedIntFromRegistry(AsciiString path, AsciiString key, UnsignedInt&`
`135`	`135`
`136`	`136`	`fullPath.concat(path);`
`137`	`137`	`DEBUG_LOG(("GetUnsignedIntFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));`
`138`		`- if (getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))`
	`138`	`+ if (getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val))`
`139`	`139`	`{`
`140`	`140`	`return TRUE;`
`141`	`141`	`}`
`142`	`142`
`143`		`- return getUnsignedIntFromRegistry(HKEY_CURRENT_USER, fullPath.str(), key.str(), val);`
	`143`	`+ return getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`AsciiString GetRegistryLanguage(void)`