Ken Thomases : loader: On Mac, move the top-down allocations area down to avoid regions reserved by the system.

Alexandre Julliard julliard at winehq.org
Wed May 15 14:32:24 CDT 2019


Module: wine
Branch: stable
Commit: 9ebf93be20662a24f741985f8b956574d7b7001a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9ebf93be20662a24f741985f8b956574d7b7001a

Author: Ken Thomases <ken at codeweavers.com>
Date:   Thu Jan 31 17:08:25 2019 -0600

loader: On Mac, move the top-down allocations area down to avoid regions reserved by the system.

On macOS 10.14 (Mojave), there's a system-wide VM mapping for common system
libraries starting at 0x00007fff00000000.

Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 07d80641d074d7aed5da83515d87765dcc6606ff)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 loader/preloader_mac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c
index 83d24af..ff62d32 100644
--- a/loader/preloader_mac.c
+++ b/loader/preloader_mac.c
@@ -78,7 +78,7 @@ static struct wine_preload_info preload_info[] =
     { (void *)0x000000010000, 0x00100000 },  /* DOS area */
     { (void *)0x000000110000, 0x67ef0000 },  /* low memory area */
     { (void *)0x00007ff00000, 0x000f0000 },  /* shared user data */
-    { (void *)0x7fff40000000, 0x01ff0000 },  /* top-down allocations + virtual heap */
+    { (void *)0x7ffef0000000, 0x01ff0000 },  /* top-down allocations + virtual heap */
 #endif /* __i386__ */
     { 0, 0 },                            /* PE exe range set with WINEPRELOADRESERVE */
     { 0, 0 }                             /* end of list */




More information about the wine-cvs mailing list