Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2025-02-20 02:29:11 +00:00
Code Issues Projects Releases Wiki Activity

Disk copy 4.2 image support for LaunchAPPL -e minivmac (fixes #76)

Browse Source
This commit is contained in:
Wolfgang Thaller 2019-01-19 11:46:42 +01:00
parent f8a06b6d68
commit 999897be07
1 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
LaunchAPPL/Client/MiniVMac.cc
View File

@ -1,6 +1,7 @@
#include "MiniVMac.h" #include "MiniVMac.h"
#include "Launcher.h" #include "Launcher.h"
#include "Utilities.h" #include "Utilities.h"
#include "BinaryIO.h"
extern "C" { extern "C" {
#include "hfs.h" #include "hfs.h"
@ -34,6 +35,7 @@ class MiniVMacLauncher : public Launcher
hfsvol *vol; hfsvol *vol;
void CopySystemFile(const std::string& fn, bool required); void CopySystemFile(const std::string& fn, bool required);
fs::path ConvertImage(const fs::path& path);
public: public:
MiniVMacLauncher(po::variables_map& options); MiniVMacLauncher(po::variables_map& options);
virtual ~MiniVMacLauncher(); virtual ~MiniVMacLauncher();
@ -64,13 +66,58 @@ static void copyDirectoryRecursively(const fs::path& sourceDir, const fs::path&
for (const auto& dirEnt : fs::recursive_directory_iterator{sourceDir}) for (const auto& dirEnt : fs::recursive_directory_iterator{sourceDir})
{ {
const auto& path = dirEnt.path(); auto path = dirEnt.path();
auto relativePathStr = path.string().substr(sourceDir.string().size()); auto relativePathStr = path.string().substr(sourceDir.string().size());
fs::copy(path, destinationDir / relativePathStr); auto dst = destinationDir / relativePathStr;
if(fs::is_directory(path))
fs::create_directory(dst);
else
fs::copy_file(path, dst);
} }
} }
#endif #endif
fs::path MiniVMacLauncher::ConvertImage(const fs::path& path)
{
fs::ifstream in(path);
in.seekg(0x40);
uint32_t diskCopyLength = longword(in);
in.seekg(0x52);
uint16_t diskCopySig = word(in);
//in.seekg(1024);
//uint16_t rawHFSSig = word(in);
in.seekg(0x54 + 1024);
uint16_t diskCopyHFSSig = word(in);
in.seekg(0, std::ios::end);
uint32_t actualSize = in.tellg();
if(diskCopySig == 0x0100 && actualSize == diskCopyLength + 0x54
&& diskCopyLength % 512 == 0 && diskCopyHFSSig == 0x4244)
{
auto outPath = tempDir / fs::unique_path();
fs::ofstream out(outPath);
in.seekg(0x54);
char buf[4096];
while(in.read(buf, sizeof(buf)), in.gcount() > 0)
out.write(buf, in.gcount());
return outPath;
}
else
return path;
}
MiniVMacLauncher::MiniVMacLauncher(po::variables_map &options) MiniVMacLauncher::MiniVMacLauncher(po::variables_map &options)
: Launcher(options), : Launcher(options),
sysvol(NULL), vol(NULL) sysvol(NULL), vol(NULL)
@ -82,6 +129,9 @@ MiniVMacLauncher::MiniVMacLauncher(po::variables_map &options)
systemImage = fs::absolute(options["system-image"].as<std::string>(), vmacDir); systemImage = fs::absolute(options["system-image"].as<std::string>(), vmacDir);
fs::path autoquitImage = fs::absolute(options["autoquit-image"].as<std::string>(), vmacDir); fs::path autoquitImage = fs::absolute(options["autoquit-image"].as<std::string>(), vmacDir);
systemImage = ConvertImage(systemImage);
autoquitImage = ConvertImage(autoquitImage);
std::vector<unsigned char> bootblock1(1024); std::vector<unsigned char> bootblock1(1024);
fs::ifstream(systemImage).read((char*) bootblock1.data(), 1024); fs::ifstream(systemImage).read((char*) bootblock1.data(), 1024);