[Scummvm-git-logs] scummvm branch-2-7 -> e34e91181580996b299b99138f781189b2b67c56

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1514e3ee76 ENGINES: Fix punycode encoding of directory separator in unknown game report
e34e911815 JANITORIAL: Clarify comment


Commit: 1514e3ee76b326597229bce28fc57fb3af0400c2
    https://github.com/scummvm/scummvm/commit/1514e3ee76b326597229bce28fc57fb3af0400c2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2023-01-20T23:49:22+01:00

Commit Message:
ENGINES: Fix punycode encoding of directory separator in unknown game report

Changed paths:
    engines/game.cpp


diff --git a/engines/game.cpp b/engines/game.cpp
index fddc22e6e83..1e3ffb752df 100644
--- a/engines/game.cpp
+++ b/engines/game.cpp
@@ -269,8 +269,9 @@ Common::U32String generateUnknownGameReport(const DetectedGames &detectedGames,
 		if (!md5Prefix.empty())
 			md5Prefix += ":";
 
+		Common::Path filepath(strchr(filenames[i].c_str(), ':') + 1);
 		report += Common::String::format("  {\"%s\", 0, \"%s%s\", %lld},\n",
-			Common::punycode_encodefilename(Common::U32String(strchr(filenames[i].c_str(), ':') + 1)).c_str(), // Skip the md5 prefix
+			filepath.punycodeEncode().toString().c_str(), // Skip the md5 prefix
 			md5Prefix.c_str(), file.md5.c_str(), (long long)file.size);
 	}
 


Commit: e34e91181580996b299b99138f781189b2b67c56
    https://github.com/scummvm/scummvm/commit/e34e91181580996b299b99138f781189b2b67c56
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-20T23:49:31+01:00

Commit Message:
JANITORIAL: Clarify comment

Changed paths:
    engines/game.cpp


diff --git a/engines/game.cpp b/engines/game.cpp
index 1e3ffb752df..6b0df5275bc 100644
--- a/engines/game.cpp
+++ b/engines/game.cpp
@@ -269,9 +269,10 @@ Common::U32String generateUnknownGameReport(const DetectedGames &detectedGames,
 		if (!md5Prefix.empty())
 			md5Prefix += ":";
 
+		// Skip the md5 prefix and since we could have full paths, take it into account
 		Common::Path filepath(strchr(filenames[i].c_str(), ':') + 1);
 		report += Common::String::format("  {\"%s\", 0, \"%s%s\", %lld},\n",
-			filepath.punycodeEncode().toString().c_str(), // Skip the md5 prefix
+			filepath.punycodeEncode().toString().c_str(),
 			md5Prefix.c_str(), file.md5.c_str(), (long long)file.size);
 	}