Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-11-22 15:31:50 +00:00
Code Issues Projects Releases Wiki Activity

multiple MM::SetHandleSize fixes

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-06-26 23:23:22 -04:00
parent 13657ab760
commit 7f3b7bcd13
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolbox/mm.cpp
View File

@ -766,13 +766,17 @@ namespace MM
mplite_free(&pool, ptr); mplite_free(&pool, ptr);
info.address = 0; info.address = 0;
info.size = 0; info.size = 0;
memoryWriteLong(info.address, hh);
return SetMemError(0); return SetMemError(0);
} }
// 2. - resizing from 0. // 2. - resizing from 0.
if (!ptr) if (!mcptr)
{ {
if (info.locked) return SetMemError(MacOS::memLockedErr);
ptr = (uint8_t *)mplite_malloc(&pool, newSize); ptr = (uint8_t *)mplite_malloc(&pool, newSize);
if (!ptr) return SetMemError(MacOS::memFullErr); if (!ptr) return SetMemError(MacOS::memFullErr);
@ -780,6 +784,7 @@ namespace MM
info.address = mcptr; info.address = mcptr;
info.size = newSize; info.size = newSize;
memoryWriteLong(info.address, hh);
return SetMemError(0); return SetMemError(0);
} }
@ -789,7 +794,7 @@ namespace MM
// 3. - locked // 3. - locked
if (info.locked) if (info.locked)
{ {
if (mplite_resize(&pool, ptr, newSize) == MPLITE_OK) if (mplite_resize(&pool, ptr, mplite_roundup(&pool, newSize)) == MPLITE_OK)
{ {
info.size = newSize; info.size = newSize;
return SetMemError(0); return SetMemError(0);
@ -800,7 +805,7 @@ namespace MM
// 4. - resize. // 4. - resize.
ptr = (uint8_t *)mplite_realloc(&pool, ptr, newSize); ptr = (uint8_t *)mplite_realloc(&pool, ptr, mplite_roundup(&pool, newSize));
if (ptr) if (ptr)
{ {
@ -808,6 +813,7 @@ namespace MM
info.address = mcptr; info.address = mcptr;
info.size = newSize; info.size = newSize;
memoryWriteLong(info.address, hh);
return SetMemError(0); return SetMemError(0);
} }