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

Fix ResLoad not actually loading

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-06-30 13:12:27 -04:00
parent a40bf9ee39
commit ce66961c7e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolbox/rm.cpp
View File

@ -28,6 +28,8 @@ using namespace OS::Internal;
namespace namespace
{ {
bool ResLoad = true;
#if 0 #if 0
struct ResEntry struct ResEntry
{ {
@ -121,6 +123,10 @@ namespace RM
if (!nativeHandle) return SetResError(resNotFound); if (!nativeHandle) return SetResError(resNotFound);
// in OS X 10.8, ::SetResLoad(false) seems to be permanent.
// therefore, explicitly load it if needed. (PascalIIgs)
if (ResLoad) ::LoadResource(nativeHandle);
size = ::GetHandleSize(nativeHandle); size = ::GetHandleSize(nativeHandle);
error = MM::Native::NewHandle(size, false, theHandle, ptr); error = MM::Native::NewHandle(size, false, theHandle, ptr);
@ -323,6 +329,7 @@ namespace RM
Log("%04x SetResLoad(%04x)\n", trap, load); Log("%04x SetResLoad(%04x)\n", trap, load);
ResLoad = load;
::SetResLoad(load); ::SetResLoad(load);
memoryWriteByte(load ? 0xff : 0x00, MacOS::ResLoad); // word or byte? memoryWriteByte(load ? 0xff : 0x00, MacOS::ResLoad); // word or byte?