[Scummvm-git-logs] scummvm master -> 31eac85ab97a1fc0cf44742fb43bc82b7e7422ad

[sev-]

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

Summary:
10d6059fb1 AD: Properly dump -1 size when requested
31eac85ab9 AD: Use size-rd for MACRESFORK sizes in dumper


Commit: 10d6059fb139460464e8da6c96f0a9f2a49bf14d
    https://github.com/scummvm/scummvm/commit/10d6059fb139460464e8da6c96f0a9f2a49bf14d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-06-14T23:33:06+02:00

Commit Message:
AD: Properly dump -1 size when requested

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index b67e2351a0a..b7c9642fd0a 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -683,7 +683,7 @@ void AdvancedMetaEngineDetectionBase::dumpDetectionEntries() const {
 
 		for (auto fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
 			const char *fname = fileDesc->fileName;
-			int64 fsize = fileDesc->fileSize == AD_NO_SIZE ? -1 : fileDesc->fileSize;
+			int64 fsize = fileDesc->fileSize == AD_NO_SIZE ? -1ll : fileDesc->fileSize;
 			Common::String md5 = fileDesc->md5;
 			MD5Properties md5prop = gameFileToMD5Props(fileDesc, g->flags);
 			Common::String md5Prefix = md5PropToGameFile(md5prop);


Commit: 31eac85ab97a1fc0cf44742fb43bc82b7e7422ad
    https://github.com/scummvm/scummvm/commit/31eac85ab97a1fc0cf44742fb43bc82b7e7422ad
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-06-14T23:33:06+02:00

Commit Message:
AD: Use size-rd for MACRESFORK sizes in dumper

We are computing size of the data portion of the resource fork

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index b7c9642fd0a..1a1f63c9caf 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -686,12 +686,13 @@ void AdvancedMetaEngineDetectionBase::dumpDetectionEntries() const {
 			int64 fsize = fileDesc->fileSize == AD_NO_SIZE ? -1ll : fileDesc->fileSize;
 			Common::String md5 = fileDesc->md5;
 			MD5Properties md5prop = gameFileToMD5Props(fileDesc, g->flags);
+			Common::String sizeSuffix = (md5prop & kMD5MacResFork) ? "-rd" : "";
 			Common::String md5Prefix = md5PropToGameFile(md5prop);
 			Common::String key = md5;
 			if (md5Prefix != "" && md5.find(':') == Common::String::npos)
 				key = md5Prefix + ':' + md5;
 
-			printf("\trom ( name \"%s\" size %lld md5-%d %s )\n", escapeString(fname).c_str(), static_cast<long long int>(fsize), _md5Bytes, key.c_str());
+			printf("\trom ( name \"%s\" size%s %lld md5-%d %s )\n", escapeString(fname).c_str(), sizeSuffix.c_str(), static_cast<long long int>(fsize), _md5Bytes, key.c_str());
 		}
 		printf(")\n\n"); // Closing for 'game ('
 	}