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

Author: Mauller

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

@@ -1173,15 +1173,24 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 
 	TheWritableGlobalData->m_userDataDir.clear();
 
-	char temp[_MAX_PATH];
-	if (::SHGetSpecialFolderPath(nullptr, temp, CSIDL_PERSONAL, true))
+	PWSTR pszPath = nullptr;
+	HRESULT hr = SHGetKnownFolderPath(FOLDERID_Documents, KF_FLAG_DEFAULT, nullptr, &pszPath);
+	if (SUCCEEDED(hr) && pszPath)
 	{
-		if (temp[strlen(temp)-1] != '\\')
-			strcat(temp, "\\");
-		strcat(temp, TheWritableGlobalData->m_userDataLeafName.str());
-		strcat(temp, "\\");
-		CreateDirectory(temp, nullptr);
-		TheWritableGlobalData->m_userDataDir = temp;
+		AsciiString myDocumentsDirectory;
+		myDocumentsDirectory.translate(UnicodeString(pszPath));
+		CoTaskMemFree(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;
 	}
 
 	// override INI values with user preferences

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

@@ -1038,10 +1038,13 @@ GlobalData::GlobalData()
 
   // Set user data directory based on registry settings instead of INI parameters. This allows us to
   // localize the leaf name.
-  char temp[_MAX_PATH + 1];
-  if (::SHGetSpecialFolderPath(nullptr, temp, CSIDL_PERSONAL, true))
-  {
-    AsciiString myDocumentsDirectory = temp;
+	PWSTR pszPath = nullptr;
+	HRESULT hr = SHGetKnownFolderPath(FOLDERID_Documents, KF_FLAG_DEFAULT, nullptr, &pszPath);
+	if (SUCCEEDED(hr) && pszPath)
+	{
+		AsciiString myDocumentsDirectory;
+		myDocumentsDirectory.translate(UnicodeString(pszPath));
+		CoTaskMemFree(pszPath);
 
     if (myDocumentsDirectory.getCharAt(myDocumentsDirectory.getLength() -1) != '\\')
       myDocumentsDirectory.concat( '\\' );