Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2025-02-16 12:30:53 +00:00
Code Issues Projects Releases Wiki Activity

loader -- use resource manager for all resource manager stuff.

Browse Source
This commit is contained in:
Kelvin Sherlock 2016-08-01 14:11:02 -04:00
parent 94f4c1c528
commit b69d6ec19c
3 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
toolbox/loader.cpp
View File

@ -26,11 +26,12 @@
#include <string>
#include <cstring>
#include <cassert>
#include <vector>
#include <algorithm>
#include <unordered_map>
#include <CoreServices/CoreServices.h>
//#include <CoreServices/CoreServices.h>
#include <cpu/defs.h>
#include <cpu/CpuModule.h>
@ -45,6 +46,16 @@
#include <macos/sysequ.h>
enum {
fsCurPerm = 0x00, /* open access permissions in ioPermssn */
fsRdPerm = 0x01,
fsWrPerm = 0x02,
fsRdWrPerm = 0x03,
fsRdWrShPerm = 0x04,
fsRdDenyPerm = 0x10, /* for use with OpenDeny and OpenRFDeny */
fsWrDenyPerm = 0x20 /* for use with OpenDeny and OpenRFDeny */
};
using ToolBox::Log;
namespace Loader {
@ -241,14 +252,12 @@ namespace Loader {
uint16_t LoadFile(const std::string &path)
{
uint16_t err;
#if 0
HFSUniStr255 fork = {0,{0}};
ResFileRefNum refNum;
FSRef ref;
OSErr err;
// open the file
// load code seg 0
// iterate and load other segments
// TODO -- call RM::Native::OpenResourceFile(...);
@ -266,7 +275,14 @@ namespace Loader {
&refNum);
if (err) return err;
#endif
// open the file
// load code seg 0
// iterate and load other segments
auto tmp = RM::Native::OpenResFile(path, fsRdPerm);
if (tmp.error()) return tmp.error();
// in case of restart?
Segments.clear();

81
toolbox/rm.cpp
View File

@ -252,6 +252,32 @@ namespace RM
return SetResError(0);
}
tool_return<int16_t> OpenResFile(const std::string &path, uint16_t permission)
{
OSErr error;
FSRef ref;
ResFileRefNum refNum;
error = ::FSPathMakeRef( (const UInt8 *)path.c_str(), &ref, NULL);
if (error != noErr)
return (MacOS::macos_error)error;
HFSUniStr255 fork = {0,{0}};
::FSGetResourceForkName(&fork);
refNum = -1;
error = ::FSOpenResourceFile(&ref,
fork.length,
fork.unicode,
permission,
&refNum);
if (error != noErr)
return (MacOS::macos_error)error;
return refNum;
}
}
uint16_t CloseResFile(uint16_t trap)
@ -642,31 +668,7 @@ namespace RM
tool_return<int16_t> OpenResCommon(const std::string &path, uint16_t permission = 0)
{
OSErr error;
FSRef ref;
ResFileRefNum refNum;
error = ::FSPathMakeRef( (const UInt8 *)path.c_str(), &ref, NULL);
if (error != noErr)
return (MacOS::macos_error)error;
HFSUniStr255 fork = {0,{0}};
::FSGetResourceForkName(&fork);
refNum = -1;
error = ::FSOpenResourceFile(&ref,
fork.length,
fork.unicode,
permission,
&refNum);
if (error != noErr)
return (MacOS::macos_error)error;
return refNum;
}
uint16_t OpenResFile(uint16_t trap)
{
@ -681,7 +683,7 @@ namespace RM
Log("%04x OpenResFile(%s)\n", trap, sname.c_str());
auto rv = OpenResCommon(sname);
auto rv = Native::OpenResFile(sname);
ToolReturn<2>(sp, rv.value_or(-1));
@ -719,7 +721,7 @@ namespace RM
return SetResError(MacOS::dirNFErr);
}
auto rv = OpenResCommon(sname, permission);
auto rv = Native::OpenResFile(sname, permission);
ToolReturn<2>(sp, rv.value_or(-1));
@ -751,7 +753,7 @@ namespace RM
return SetResError(MacOS::dirNFErr);
}
auto rv = OpenResCommon(sname, permission);
auto rv = Native::OpenResFile(sname, permission);
ToolReturn<2>(sp, rv.value_or(-1));
@ -764,14 +766,10 @@ namespace RM
{
// FUNCTION OpenRFPerm (fileName: Str255; vRefNum: Integer;
// permission: SignedByte): Integer;
ResFileRefNum refNum;
FSRef ref;
uint32_t sp;
uint32_t fileName;
uint16_t vRefNum;
uint16_t permission;
OSErr error;
sp = StackFrame<8>(fileName, vRefNum, permission);
@ -779,26 +777,11 @@ namespace RM
Log("%04x OpenRFPerm(%s, %04x, %04x)\n",
trap, sname.c_str(), vRefNum, permission);
error = ::FSPathMakeRef( (const UInt8 *)sname.c_str(), &ref, NULL);
if (error != noErr)
{
ToolReturn<2>(sp, (uint16_t)-1);
return SetResError(error);
}
auto rv = Native::OpenResFile(sname, permission);
HFSUniStr255 fork = {0,{0}};
::FSGetResourceForkName(&fork);
ToolReturn<2>(sp, rv.value_or(-1));
refNum = -1;
error = ::FSOpenResourceFile(&ref,
fork.length,
fork.unicode,
permission,
&refNum);
ToolReturn<2>(sp, (uint16_t)refNum);
return SetResError(error);
return SetResError(rv.error());
}
uint16_t Count1Resources(uint16_t trap)

2
toolbox/rm.h
View File

@ -14,7 +14,7 @@ namespace RM
tool_return<void> SetResLoad(bool tf);
tool_return<uint32_t> GetResource(uint32_t type, uint16_t id);
tool_return<void> OpenResFile(const std::string &path_name, uint16_t permissions = 0);
tool_return<int16_t> OpenResFile(const std::string &path_name, uint16_t permissions = 0);
tool_return<void> CloseResFile(uint16_t refNum);
}