libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-04 15:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AD: Implement sanity checks for detection tables

Browse Source
This commit is contained in:
Eugene Sandulenko 2022-11-03 21:37:05 +01:00
parent 6bf2881735
commit a56c6c487a
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
2 changed files with 34 additions and 0 deletions

33
engines/advancedDetector.cpp

@ -876,6 +876,11 @@ void AdvancedMetaEngineDetection::preprocessDescriptions() {
g->gameId, getName(), g->filesDescriptions[0].md5);
}
}
#ifndef RELEASE_BUILD
// Check the provided tables for sanity
detectClashes();
#endif
}
Common::StringArray AdvancedMetaEngineDetection::getPathsFromEntry(const ADGameDescription *g) {
@ -924,3 +929,31 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
return Common::Error();
}
void AdvancedMetaEngineDetection::detectClashes() const {
// First, check that we do not have duplicated entries in _gameIds
Common::HashMap<Common::String, int, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> idsMap;
for (const PlainGameDescriptor *g = _gameIds; g->gameId; g++) {
if (idsMap.contains(g->gameId))
debug(0, "WARNING: Detection gameId for '%s' in engine '%s' has duplicates", g->gameId, getName());
idsMap[g->gameId] = 0;
}
for (const byte *descPtr = _gameDescriptors; ((const ADGameDescription *)descPtr)->gameId != nullptr; descPtr += _descItemSize) {
const ADGameDescription *g = (const ADGameDescription *)descPtr;
if (!idsMap.contains(g->gameId)) {
debug(0, "WARNING: Detection gameId for '%s' in engine '%s' is not present in gameids", g->gameId, getName());
} else {
idsMap[g->gameId]++;
}
}
for (auto &k : idsMap) {
if (k._value == 0 && k._key != getName())
debug(0, "WARNING: Detection gameId for '%s' in engine '%s' has no games in the detection table", k._key.c_str(), getName());
}
}

1
engines/advancedDetector.h

@ -408,6 +408,7 @@ private:
void initSubSystems(const ADGameDescription *gameDesc) const;
void preprocessDescriptions();
bool isEntryGrayListed(const ADGameDescription *g) const;
void detectClashes() const;
private:
Common::HashMap<Common::String, bool, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _grayListMap;