Fixed MEM_SYSTEM handling to avoid unmapping areas that we didn't mmap.
This commit is contained in:
parent
5ab5e1c5df
commit
fe5b19d15b
|
@ -771,10 +771,16 @@ LPVOID WINAPI VirtualAlloc(
|
|||
|
||||
if ((type & MEM_RESERVE) || !base)
|
||||
{
|
||||
view_size = size + (base ? 0 : granularity_mask + 1);
|
||||
if (type & MEM_SYSTEM)
|
||||
ptr = base;
|
||||
else
|
||||
{
|
||||
if (!(view = VIRTUAL_CreateView( base, size, VFLAG_VALLOC | VFLAG_SYSTEM, vprot, 0 )))
|
||||
{
|
||||
SetLastError( ERROR_OUTOFMEMORY );
|
||||
return NULL;
|
||||
}
|
||||
return (LPVOID)base;
|
||||
}
|
||||
view_size = size + (base ? 0 : granularity_mask + 1);
|
||||
ptr = (UINT)wine_anon_mmap( (LPVOID)base, view_size, VIRTUAL_GetUnixProt( vprot ), 0 );
|
||||
if (ptr == (UINT)-1)
|
||||
{
|
||||
|
@ -803,9 +809,7 @@ LPVOID WINAPI VirtualAlloc(
|
|||
SetLastError( ERROR_INVALID_ADDRESS );
|
||||
return NULL;
|
||||
}
|
||||
if (!(view = VIRTUAL_CreateView( ptr, size,
|
||||
VFLAG_VALLOC | ((type & MEM_SYSTEM) ? VFLAG_SYSTEM : 0),
|
||||
vprot, 0 )))
|
||||
if (!(view = VIRTUAL_CreateView( ptr, size, VFLAG_VALLOC, vprot, 0 )))
|
||||
{
|
||||
munmap( (void *)ptr, size );
|
||||
SetLastError( ERROR_OUTOFMEMORY );
|
||||
|
|
Loading…
Reference in New Issue