Module: wine Branch: refs/heads/master Commit: e325efbd8dfe650a4cec7caf24b30961506aa2b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e325efbd8dfe650a4cec7caf...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jul 24 15:25:39 2006 +0200
preloader: Allocate more space in low memory as well as for top-down allocations.
---
configure | 2 +- configure.ac | 2 +- loader/main.c | 6 +++--- loader/preloader.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure b/configure index 9de6bf4..dcc6a5c 100755 --- a/configure +++ b/configure @@ -17118,7 +17118,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6;
IOKITLIB="-framework IOKit -framework CoreFoundation"
- LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7ffe0000" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"
if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then diff --git a/configure.ac b/configure.ac index 95d78b1..05d2c54 100644 --- a/configure.ac +++ b/configure.ac @@ -1147,7 +1147,7 @@ case $host_os in dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") - AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7ffe0000"]) + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"]) if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then dnl CoreServices needed by AudioUnit diff --git a/loader/main.c b/loader/main.c index 5d20449..d74d4a4 100644 --- a/loader/main.c +++ b/loader/main.c @@ -24,9 +24,9 @@ #include "wine/library.h" #include "main.h"
#ifdef __APPLE__ -asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x20000000"); -asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x01020000"); -extern char __wine_dos[0x20000000], __wine_shared_heap[0x01020000]; +asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000"); +asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x02000000"); +extern char __wine_dos[0x60000000], __wine_shared_heap[0x02000000];
static const struct wine_preload_info wine_main_preload_info[] = { diff --git a/loader/preloader.c b/loader/preloader.c index d9b749c..46e96a5 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -108,9 +108,9 @@ #endif
static struct wine_preload_info preload_info[] = { - { (void *)0x00000000, 0x00110000 }, /* DOS area */ - { (void *)0x7ffe0000, 0x01020000 }, /* shared user data + shared heap */ - { (void *)0x00110000, 0x1fef0000 }, /* PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */ + { (void *)0x00000000, 0x60000000 }, /* low memory area */ + { (void *)0x7f000000, 0x02000000 }, /* top-down allocations + shared heap */ + { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ };