~ubuntu-branches/ubuntu/wily/wine1.6/wily

« back to all changes in this revision

Viewing changes to dlls/ntdll/thread.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2014-03-17 17:43:36 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140317174336-9we01jr5mzhomw16
Tags: 1:1.6.2-0ubuntu1
* New upstream release
  - Color management support updated to liblcms version 2.
  - Various bug fixes.
* Drop upstreamed patches for liblcms and freetype support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
188
188
    return status;
189
189
}
190
190
 
 
191
#ifdef __APPLE__
 
192
#include <mach/mach.h>
 
193
#include <mach/mach_error.h>
 
194
 
 
195
static ULONG get_dyld_image_info_addr(void)
 
196
{
 
197
    ULONG ret = 0;
 
198
#ifdef TASK_DYLD_INFO
 
199
    struct task_dyld_info dyld_info;
 
200
    mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT;
 
201
    if (task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &size) == KERN_SUCCESS)
 
202
        ret = dyld_info.all_image_info_addr;
 
203
#endif
 
204
    return ret;
 
205
}
 
206
#endif  /* __APPLE__ */
 
207
 
191
208
#ifdef __linux__
192
209
extern typeof(pthread_create) *__glob_pthread_create, *call_pthread_create;
193
210
extern typeof(pthread_join) *__glob_pthread_join, *call_pthread_join;
320
337
    InitializeListHead( &ldr.InMemoryOrderModuleList );
321
338
    InitializeListHead( &ldr.InInitializationOrderModuleList );
322
339
    InitializeListHead( &tls_links );
 
340
#ifdef __APPLE__
 
341
    peb->Reserved[0] = get_dyld_image_info_addr();
 
342
#endif
323
343
 
324
344
    /* allocate and initialize the initial TEB */
325
345