Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2024-11-28 05:51:04 +00:00
Code Issues Projects Releases Wiki Activity

MiniVMac.cc: New method ReadSystemResources

Browse Source 
Move the System file resource-reading code out of GetSystemVersion and
into a new ReadSystemResources method which stores the resources in a
new member variable so that it can be used by multiple methods.
This commit is contained in:
Ryan Schmidt 2022-09-22 05:27:51 -05:00
parent 8fdb2f3a84
commit 425bb8b054
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
LaunchAPPL/Client/MiniVMac.cc
View File

@ -76,9 +76,11 @@ class MiniVMacLauncher : public Launcher
hfsvol *sysvol; hfsvol *sysvol;
hfsvol *vol; hfsvol *vol;
std::unique_ptr<Resources> systemRes;
void CopySystemFile(const std::string& fn, bool required); void CopySystemFile(const std::string& fn, bool required);
uint16_t GetSystemVersion(const std::string& systemFileName); void ReadSystemResources(const std::string& systemFileName);
uint16_t GetSystemVersion();
void MakeAlias(const std::string& dest, const std::string& src); void MakeAlias(const std::string& dest, const std::string& src);
fs::path ConvertImage(const fs::path& path); fs::path ConvertImage(const fs::path& path);
public: public:
@ -200,7 +202,8 @@ MiniVMacLauncher::MiniVMacLauncher(po::variables_map &options)
hfs_setcwd(sysvol, ent.blessed); hfs_setcwd(sysvol, ent.blessed);
string systemFileName(bootblock1.begin() + 0xB, bootblock1.begin() + 0xB + bootblock1[0xA]); string systemFileName(bootblock1.begin() + 0xB, bootblock1.begin() + 0xB + bootblock1[0xA]);
uint16_t sysver = GetSystemVersion(systemFileName); ReadSystemResources(systemFileName);
uint16_t sysver = GetSystemVersion();
bool usesAutQuit7 = (sysver >= 0x700); bool usesAutQuit7 = (sysver >= 0x700);
std::string optionsKey = usesAutQuit7 ? "autquit7-image" : "autoquit-image"; std::string optionsKey = usesAutQuit7 ? "autquit7-image" : "autoquit-image";
@ -424,7 +427,7 @@ void MiniVMacLauncher::MakeAlias(const std::string& dest, const std::string& src
} }
uint16_t MiniVMacLauncher::GetSystemVersion(const std::string& systemFileName) void MiniVMacLauncher::ReadSystemResources(const std::string& systemFileName)
{ {
hfsdirent fileent; hfsdirent fileent;
hfs_stat(sysvol, systemFileName.c_str(), &fileent); hfs_stat(sysvol, systemFileName.c_str(), &fileent);
@ -434,8 +437,13 @@ uint16_t MiniVMacLauncher::GetSystemVersion(const std::string& systemFileName)
hfs_read(system, buffer.data(), fileent.u.file.rsize); hfs_read(system, buffer.data(), fileent.u.file.rsize);
hfs_close(system); hfs_close(system);
std::istringstream systemResStream(std::string((char*)buffer.data(), buffer.size())); std::istringstream systemResStream(std::string((char*)buffer.data(), buffer.size()));
Resources systemRes(systemResStream); systemRes = std::make_unique<Resources>(systemResStream);
Resource vers = systemRes.resources[ResRef('vers', 1)]; }
uint16_t MiniVMacLauncher::GetSystemVersion()
{
Resource vers = systemRes->resources[ResRef('vers', 1)];
return (uint16_t)vers.getData()[0] << 8 | vers.getData()[1]; return (uint16_t)vers.getData()[0] << 8 | vers.getData()[1];
} }