Commit e325efbd authored by Alexandre Julliard's avatar Alexandre Julliard

preloader: Allocate more space in low memory as well as for top-down allocations.

parent 6c9ade05
...@@ -17118,7 +17118,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6; } ...@@ -17118,7 +17118,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6; }
IOKITLIB="-framework IOKit -framework CoreFoundation" 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" if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
then then
......
...@@ -1147,7 +1147,7 @@ case $host_os in ...@@ -1147,7 +1147,7 @@ case $host_os in
dnl declare needed frameworks dnl declare needed frameworks
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
AC_SUBST(IOKITLIB,"-framework IOKit -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" if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
then then
dnl CoreServices needed by AudioUnit dnl CoreServices needed by AudioUnit
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
#include "main.h" #include "main.h"
#ifdef __APPLE__ #ifdef __APPLE__
asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x20000000"); asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000");
asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x01020000"); asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x02000000");
extern char __wine_dos[0x20000000], __wine_shared_heap[0x01020000]; extern char __wine_dos[0x60000000], __wine_shared_heap[0x02000000];
static const struct wine_preload_info wine_main_preload_info[] = static const struct wine_preload_info wine_main_preload_info[] =
{ {
......
...@@ -108,9 +108,9 @@ ...@@ -108,9 +108,9 @@
static struct wine_preload_info preload_info[] = static struct wine_preload_info preload_info[] =
{ {
{ (void *)0x00000000, 0x00110000 }, /* DOS area */ { (void *)0x00000000, 0x60000000 }, /* low memory area */
{ (void *)0x7ffe0000, 0x01020000 }, /* shared user data + shared heap */ { (void *)0x7f000000, 0x02000000 }, /* top-down allocations + shared heap */
{ (void *)0x00110000, 0x1fef0000 }, /* PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */
{ 0, 0 } /* end of list */ { 0, 0 } /* end of list */
}; };
......
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