From 540490d0c5ba7c8310271b1c7fd68259a77a2f28 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Wed, 21 Jan 2015 14:31:03 -0500 Subject: [PATCH] GetNamedResource trap --- toolbox/rm.cpp | 25 +++++++++++++++++++++++++ toolbox/toolbox.cpp | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/toolbox/rm.cpp b/toolbox/rm.cpp index 60d736e..402207f 100644 --- a/toolbox/rm.cpp +++ b/toolbox/rm.cpp @@ -260,7 +260,32 @@ namespace RM return SetResError(d0); } + uint16_t GetNamedResource(uint16_t trap) + { + // FUNCTION GetNamedResource (theType: ResType; name: Str255): Handle; + uint32_t sp; + uint32_t theType; + uint32_t name; + + sp = StackFrame<8>(theType, name); + + std::string sname = ToolBox::ReadPString(name); + + Log("%04x GetNamedResource(%08x ('%s'), %s)\n", + trap, theType, TypeToString(theType).c_str(), sname.c_str()); + + uint32_t resourceHandle; + uint32_t d0; + d0 = Native::LoadResource(theType, resourceHandle, + [theType, name](){ + return ::GetNamedResource(theType, memoryPointer(name)); + } + ); + + ToolReturn<4>(sp, resourceHandle); + return SetResError(d0); + } uint16_t GetResource(uint16_t trap) { diff --git a/toolbox/toolbox.cpp b/toolbox/toolbox.cpp index a4d5f8d..12da08f 100644 --- a/toolbox/toolbox.cpp +++ b/toolbox/toolbox.cpp @@ -496,6 +496,10 @@ namespace ToolBox { d0 = RM::GetResource(trap); break; + case 0xa9a1: + d0 = RM::GetNamedResource(trap); + break; + case 0xa9a2: d0 = RM::LoadResource(trap); break;