[PATCH 7/7] ntdll: On macOS, transform the main thread into a Wine thread (running a CFRunLoop) on launch.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/ntdll/unix/server.c       |  5 +++
 dlls/ntdll/unix/thread.c       | 64 ++++++++++++++++++++++++++++++++++
 dlls/ntdll/unix/unix_private.h |  1 +
 3 files changed, 70 insertions(+)

diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 258a959de72..84f89367545 100644
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -1751,6 +1751,11 @@ void server_init_process_done(void)
     thread_data->syscall_table = KeServiceDescriptorTable;
     thread_data->syscall_trace = TRACE_ON(syscall);

+#ifdef __APPLE__
+    /* This must run after signal_init_process() so the syscall dispatcher pointer is present at 0x7ffe1000 */
+    transform_mac_main_thread();
+#endif
+
     /* always send the native TEB */
     if (!(teb = NtCurrentTeb64())) teb = NtCurrentTeb();

diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index fa41412c4e3..329e0119d6b 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -63,6 +63,8 @@
 #endif

#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#include <dispatch/dispatch.h>
 #include <mach/mach.h>
 #endif
 #ifdef __FreeBSD__
@@ -1471,6 +1473,7 @@ done:
     return status;
 }

+
 /***********************************************************************
  *              NtCreateThread   (NTDLL.@)
  */
@@ -2771,3 +2774,64 @@ NTSTATUS WINAPI NtGetNextThread( HANDLE process, HANDLE thread, ACCESS_MASK acce
     *handle = ret_handle;
     return ret;
 }
+
+
+#ifdef __APPLE__
+static dispatch_semaphore_t main_thread_transformed_semaphore;
+
+static void signal_semaphore_and_start_thread( TEB *teb )
+{
+    dispatch_semaphore_signal( main_thread_transformed_semaphore );
+    start_thread( teb );
+}
+
+
+/***********************************************************************
+ *           run_on_mac_main_thread
+ */
+static NTSTATUS run_on_mac_main_thread( struct ntdll_thread_data *thread_data, TEB *teb )
+{
+    CFRunLoopSourceContext source_context = { 0 };
+    CFRunLoopSourceRef source;
+
+    source_context.perform = (void (*)(void *))signal_semaphore_and_start_thread;
+    source_context.info = teb;
+    source = CFRunLoopSourceCreate( NULL, 0, &source_context );
+    if (!source)
+        return STATUS_NO_MEMORY;
+
+    CFRunLoopAddSource( CFRunLoopGetMain(), source, kCFRunLoopCommonModes );
+    CFRunLoopSourceSignal( source );
+    CFRunLoopWakeUp( CFRunLoopGetMain() );
+    CFRelease( source );
+    return STATUS_SUCCESS;
+}
+
+
+/***********************************************************************
+ *           transform_mac_main_thread
+ *
+ * Transform the process main thread into a Wine thread
+ */
+void transform_mac_main_thread( void )
+{
+    NTSTATUS status;
+    HANDLE handle;
+
+    main_thread_transformed_semaphore = dispatch_semaphore_create( 0 );
+
+    status = create_thread( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(),
+                            p__wine_mac_run_cfrunloop, NULL,
+                            THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER | THREAD_CREATE_FLAGS_SKIP_LOADER_INIT,
+                            0, 0, 0, NULL, run_on_mac_main_thread );
+    if (!status)
+    {
+        NtClose( handle );
+        dispatch_semaphore_wait( main_thread_transformed_semaphore, DISPATCH_TIME_FOREVER );
+    }
+    else
+        ERR("Failed to transform main thread: %x\n", status);
+
+    dispatch_release( main_thread_transformed_semaphore );
+}
+#endif
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 46e617490b8..6d2ce3bedc2 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -262,6 +262,7 @@ extern void set_process_instrumentation_callback( void *callback );
 extern void *get_cpu_area( USHORT machine );
 extern void set_thread_id( TEB *teb, DWORD pid, DWORD tid );
 extern NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR limit, SIZE_T reserve_size, SIZE_T commit_size );
+extern void transform_mac_main_thread( void );
 extern void DECLSPEC_NORETURN abort_thread( int status );
 extern void DECLSPEC_NORETURN abort_process( int status );
 extern void DECLSPEC_NORETURN exit_process( int status );