bugfix(globaldata): Fix the handling of documents folder redirection by using SHGetKnownFolderPath() - Vista+ required

Author: Mauller

Generals/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -1173,6 +1173,7 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 
 	TheWritableGlobalData->m_userDataDir.clear();
 
+#if defined(_MSC_VER) && _MSC_VER < 1300
 	char temp[_MAX_PATH];
 	if (::SHGetSpecialFolderPath(nullptr, temp, CSIDL_PERSONAL, true))
 	{
@@ -1183,6 +1184,29 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 		CreateDirectory(temp, nullptr);
 		TheWritableGlobalData->m_userDataDir = temp;
 	}
+#else
+	// TheSuperHackers @bugfix Mauller 20/03/2026 Fix the handling of folder redirection
+	// OneDrive and Group Policy folder redirection is better supported by SHGetKnownFolderPath()
+	PWSTR pszPath = nullptr;
+	HRESULT hr = SHGetKnownFolderPath(FOLDERID_Documents, KF_FLAG_DEFAULT, nullptr, &pszPath);
+	if (SUCCEEDED(hr) && pszPath)
+	{
+		AsciiString myDocumentsDirectory;
+		myDocumentsDirectory.translate(UnicodeString(pszPath));
+
+		if (myDocumentsDirectory.getCharAt(myDocumentsDirectory.getLength() -1) != '\\')
+			myDocumentsDirectory.concat( '\\' );
+
+		myDocumentsDirectory.concat(TheWritableGlobalData->m_userDataLeafName.str());
+
+		if (myDocumentsDirectory.getCharAt( myDocumentsDirectory.getLength() - 1) != '\\')
+			myDocumentsDirectory.concat( '\\' );
+
+		CreateDirectory(myDocumentsDirectory.str(), nullptr);
+		TheWritableGlobalData->m_userDataDir = myDocumentsDirectory;
+	}
+	CoTaskMemFree(pszPath);
+#endif
 
 	// override INI values with user preferences
 	OptionPreferences optionPref;

GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -1038,6 +1038,7 @@ GlobalData::GlobalData()
 
   // Set user data directory based on registry settings instead of INI parameters. This allows us to
   // localize the leaf name.
+#if defined(_MSC_VER) && _MSC_VER < 1300
   char temp[_MAX_PATH + 1];
   if (::SHGetSpecialFolderPath(nullptr, temp, CSIDL_PERSONAL, true))
   {
@@ -1062,6 +1063,37 @@ GlobalData::GlobalData()
     CreateDirectory(myDocumentsDirectory.str(), nullptr);
     m_userDataDir = myDocumentsDirectory;
   }
+#else
+	// TheSuperHackers @bugfix Mauller 20/03/2026 Fix the handling of folder redirection
+	// OneDrive and Group Policy folder redirection is better supported by SHGetKnownFolderPath()
+	PWSTR pszPath = nullptr;
+	HRESULT hr = SHGetKnownFolderPath(FOLDERID_Documents, KF_FLAG_DEFAULT, nullptr, &pszPath);
+	if (SUCCEEDED(hr) && pszPath)
+	{
+		AsciiString myDocumentsDirectory;
+		myDocumentsDirectory.translate(UnicodeString(pszPath));
+
+		if (myDocumentsDirectory.getCharAt(myDocumentsDirectory.getLength() -1) != '\\')
+			myDocumentsDirectory.concat( '\\' );
+
+		AsciiString leafName;
+
+		if ( !GetStringFromRegistry( "", "UserDataLeafName", leafName ) )
+		{
+			// Use something, anything
+			// [MH] had to remove this, otherwise mapcache build step won't run... DEBUG_CRASH( ( "Could not find registry key UserDataLeafName; defaulting to \"Command and Conquer Generals Zero Hour Data\" " ) );
+			leafName = "Command and Conquer Generals Zero Hour Data";
+		}
+
+		myDocumentsDirectory.concat( leafName );
+		if (myDocumentsDirectory.getCharAt( myDocumentsDirectory.getLength() - 1) != '\\')
+			myDocumentsDirectory.concat( '\\' );
+
+		CreateDirectory(myDocumentsDirectory.str(), nullptr);
+		m_userDataDir = myDocumentsDirectory;
+	}
+	CoTaskMemFree(pszPath);
+#endif
 
 	//-allAdvice feature
 	//m_allAdvice = FALSE;