=?UTF-8?Q?Michael=20M=C3=BCller=20?=: libwine: Do not restrict base address of main thread on 64 bit mac os.

Alexandre Julliard julliard at winehq.org
Thu Nov 29 15:33:00 CST 2018


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

Author: Michael Müller <michael at fds-team.de>
Date:   Mon Nov 26 17:27:05 2018 -0600

libwine: Do not restrict base address of main thread on 64 bit mac os.

Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/wine/loader.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 0af3b8e..8f40ea0 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -709,6 +709,7 @@ struct apple_stack_info
  * Callback for wine_mmap_enum_reserved_areas to allocate space for
  * the secondary thread's stack.
  */
+#ifndef _WIN64
 static int apple_alloc_thread_stack( void *base, size_t size, void *arg )
 {
     struct apple_stack_info *info = arg;
@@ -725,6 +726,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg )
                                   info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED );
     return (info->stack != (void *)-1);
 }
+#endif
 
 /***********************************************************************
  *           apple_create_wine_thread
@@ -742,6 +744,7 @@ static void apple_create_wine_thread( void *init_func )
 
     if (!pthread_attr_init( &attr ))
     {
+#ifndef _WIN64
         struct apple_stack_info info;
 
         /* Try to put the new thread's stack in the reserved area.  If this
@@ -753,6 +756,7 @@ static void apple_create_wine_thread( void *init_func )
             wine_mmap_remove_reserved_area( info.stack, info.desired_size, 0 );
             pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size );
         }
+#endif
 
         if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) &&
             !pthread_create( &thread, &attr, init_func, NULL ))




More information about the wine-cvs mailing list