ntdll: Disable releasing the address space on Mac OS since dyld doesn't support this.

This commit is contained in:
Alexandre Julliard 2009-06-29 13:21:37 +02:00
parent c95acb9115
commit 1ac7576d47
2 changed files with 5 additions and 3 deletions

View file

@ -1681,14 +1681,16 @@ void virtual_release_address_space( BOOL free_high_mem )
server_enter_uninterrupted_section( &csVirtual, &sigset ); server_enter_uninterrupted_section( &csVirtual, &sigset );
#ifndef __APPLE__ /* dyld doesn't support parts of the WINE_DOS segment being unmapped */
range.base = (char *)0x20000000; range.base = (char *)0x20000000;
range.limit = (char *)0x7f000000; range.limit = (char *)0x7f000000;
while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */; while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */;
#endif
/* no large address space on win9x */ /* no large address space on win9x */
if (free_high_mem && NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) if (free_high_mem && NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT)
{ {
range.base = (char *)0x80000000; range.base = (char *)0x82000000;
range.limit = address_space_limit; range.limit = address_space_limit;
while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */; while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */;
user_space_limit = working_set_limit = address_space_limit; user_space_limit = working_set_limit = address_space_limit;

View file

@ -40,9 +40,9 @@
#ifdef __APPLE__ #ifdef __APPLE__
asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x70000000"); asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000");
asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000");
extern char __wine_dos[0x70000000], __wine_shared_heap[0x03000000]; extern char __wine_dos[0x40000000], __wine_shared_heap[0x03000000];
static const struct wine_preload_info wine_main_preload_info[] = static const struct wine_preload_info wine_main_preload_info[] =
{ {