Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-06-28 15:29:52 +00:00
Code Issues Projects Releases Wiki Activity

clean up some other RM code

Browse Source
This commit is contained in:
Kelvin Sherlock 2015-02-07 12:30:39 -05:00
parent 6197910e3e
commit 3ff0697e46
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
toolbox/rm.cpp
View File

@ -890,24 +890,19 @@ namespace RM
Handle nativeHandle = NULL; Handle nativeHandle = NULL;
if (theData)
{
uint32_t handleSize;
MM::Native::GetHandleSize(theData, handleSize);
if (handleSize) auto info = MM::GetHandleInfo(theData);
{ if (info.error()) return SetResError(MacOS::addResFailed);
nativeHandle = ::NewHandle(handleSize);
nativeHandle = ::NewHandle(info->size);
if (!nativeHandle) return SetResError(MacOS::addResFailed); if (!nativeHandle) return SetResError(MacOS::addResFailed);
uint32_t src = memoryReadLong(theData);
std::memcpy(*(uint8_t **)nativeHandle, memoryPointer(src), handleSize); std::memcpy(*(uint8_t **)nativeHandle, memoryPointer(info->address), info->size);
rhandle_map.insert({theData, nativeHandle}); rhandle_map.insert({theData, nativeHandle});
}
}
// AddResource assumes ownership of the handle. // AddResource assumes ownership of the handle.
::AddResource(nativeHandle, theType, theID, memoryPointer(namePtr)); ::AddResource(nativeHandle, theType, theID, memoryPointer(namePtr));
return SetResError(::ResError()); return SetResError(::ResError());
@ -1147,10 +1142,9 @@ namespace RM
// if it has a size, it's loaded... // if it has a size, it's loaded...
uint32_t handleSize; auto info = MM::GetHandleInfo(theResource);
err = MM::Native::GetHandleSize(theResource, handleSize); if (info.error()) return SetResError(resNotFound);
if (err) return SetResError(err); if (info->size) return SetResError(0);
if (handleSize) return SetResError(0);
// otherwise, load it // otherwise, load it
@ -1162,7 +1156,7 @@ namespace RM
::LoadResource(nativeHandle); ::LoadResource(nativeHandle);
err = ::ResError(); err = ::ResError();
if (err) return SetResError(err); // ?!?! if (err) return SetResError(err);
size = ::GetHandleSize(nativeHandle); size = ::GetHandleSize(nativeHandle);
@ -1174,8 +1168,9 @@ namespace RM
if (size) if (size)
{ {
uint32_t ptr = memoryReadLong(theResource); info = MM::GetHandleInfo(theResource);
std::memcpy(memoryPointer(ptr), *(void **)nativeHandle, size);
std::memcpy(memoryPointer(info->address), *(void **)nativeHandle, size);
} }
return SetResError(0); return SetResError(0);