Commit 9ffd7938 authored by Ove Kaaven's avatar Ove Kaaven Committed by Alexandre Julliard

Fixed a couple of dosmem block resize bugs.

parent 718bba93
......@@ -576,12 +576,35 @@ LPVOID DOSMEM_ResizeBlock(HMODULE16 hModule, void* ptr, UINT size, UINT16* pseg)
info_block->free += orgsize - dm->size;
} else {
/* the collapse didn't help, try getting a new block */
block = DOSMEM_GetBlock(hModule, size, pseg);
if (block) {
/* we got one, copy the old data there (we do need to, right?) */
memcpy(block, ((char*)dm) + sizeof(dosmem_entry),
(size<orgsize) ? size : orgsize);
/* free old block */
info_block->blocks--;
info_block->free += dm->size;
dm->size |= DM_BLOCK_FREE;
} else {
/* and Bill Gates said 640K should be enough for everyone... */
/* need to split original and collapsed blocks apart again,
* and free the collapsed blocks again, before exiting */
if( blocksize - orgsize > 0x20 )
{
/* split dm so that the next one stays
* paragraph-aligned (and next gains free bit) */
dm->size = (((orgsize + 0xf + sizeof(dosmem_entry)) & ~0xf) -
sizeof(dosmem_entry));
next = (dosmem_entry*)(((char*)dm) +
sizeof(dosmem_entry) + dm->size);
next->size = (blocksize - (dm->size +
sizeof(dosmem_entry))) | DM_BLOCK_FREE
;
} else dm->size &= DM_BLOCK_MASK;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment