libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Support resource fork coming from OSX zip or FAT

Browse Source
This commit is contained in:
Vladimir Serbinenko 2022-12-14 06:44:35 +01:00 committed by Eugene Sandulenko
parent 0979c692de
commit 2ca39a0745
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
common/macresman.cpp
View File

@ -168,6 +168,53 @@ bool MacResManager::open(const Path &fileName) {
return open(fileName, SearchMan);
}
SeekableReadStream *MacResManager::openAppleDoubleWithAppleOrOSXNaming(Archive& archive, const Path &fileName) {
SeekableReadStream *stream = archive.createReadStreamForMember(constructAppleDoubleName(fileName));
if (stream)
return stream;
const ArchiveMemberPtr archiveMember = archive.getMember(fileName);
const Common::FSNode *plainFsNode = dynamic_cast<const Common::FSNode *>(archiveMember.get());
// Try finding __MACOSX
Common::StringArray components = (plainFsNode ? Common::Path(plainFsNode->getPath(), '/') : fileName).splitComponents();
if (components.empty() || components[components.size() - 1].empty())
return nullptr;
for (int i = components.size() - 1; i >= 0; i--) {
Common::StringArray newComponents;
int j;
for (j = 0; j < i; j++)
newComponents.push_back(components[j]);
newComponents.push_back("__MACOSX");
for (; j < (int) components.size() - 1; j++)
newComponents.push_back(components[j]);
newComponents.push_back("._" + components[(int) components.size() - 1]);
Common::Path newPath = Common::Path::joinComponents(newComponents);
stream = archive.createReadStreamForMember(newPath);
if (!stream) {
Common::FSNode *fsn = new Common::FSNode(newPath);
if (fsn && fsn->exists())
stream = fsn->createReadStream();
else
delete fsn;
}
if (stream) {
bool appleDouble = (stream->readUint32BE() == 0x00051607);
stream->seek(0);
if (appleDouble) {
return stream;
}
}
delete stream;
}
return nullptr;
}
bool MacResManager::open(const Path &fileName, Archive &archive) {
close();
@ -219,7 +266,7 @@ bool MacResManager::open(const Path &fileName, Archive &archive) {
delete stream;
// Then try for AppleDouble using Apple's naming
stream = archive.createReadStreamForMember(constructAppleDoubleName(fileName));
stream = openAppleDoubleWithAppleOrOSXNaming(archive, fileName);
if (stream && loadFromAppleDouble(stream)) {
_baseFileName = fileName;
return true;
@ -356,7 +403,7 @@ bool MacResManager::getFileFinderInfo(const Path &fileName, Archive &archive, Ma
// Try for AppleDouble using Apple's naming
stream.reset();
stream.reset(archive.createReadStreamForMember(constructAppleDoubleName(fileName)));
stream.reset(openAppleDoubleWithAppleOrOSXNaming(archive, fileName));
if (stream && getFinderInfoFromAppleDouble(stream.get(), outFinderInfo, outFinderExtendedInfo))
return true;

2
common/macresman.h
View File

@ -318,6 +318,8 @@ private:
static Path constructAppleDoubleName(Path name);
static Path disassembleAppleDoubleName(Path name, bool *isAppleDouble);
static SeekableReadStream *openAppleDoubleWithAppleOrOSXNaming(Archive& archive, const Path &fileName);
/**
* Do a sanity check whether the given stream is a raw resource fork.
*