ntdll: Move the NtCreateUserProcess() implementation to the Unix library.

dlls/ntdll/unix/loader.c

@@ -837,6 +837,7 @@ static struct unix_funcs unix_funcs =
     NtCreateSemaphore,
     NtCreateThreadEx,
     NtCreateTimer,
+    NtCreateUserProcess,
     NtCurrentTeb,
     NtDelayExecution,
     NtDeleteFile,
@@ -947,9 +948,7 @@ static struct unix_funcs unix_funcs =
     exit_thread,
     exit_process,
     get_thread_ldt_entry,
-    spawn_process,
     exec_process,
-    fork_and_exec,
     wine_server_call,
     server_send_fd,
     server_get_unix_fd,

dlls/ntdll/unix/unix_private.h

@@ -114,11 +114,7 @@ extern TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_co
 extern void CDECL DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN;
 extern void CDECL DECLSPEC_NORETURN exit_process( int status ) DECLSPEC_HIDDEN;
 extern NTSTATUS CDECL get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_len ) DECLSPEC_HIDDEN;
-extern NTSTATUS CDECL spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int socketfd,
-                                     const char *unixdir, char *winedebug, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN;
 extern NTSTATUS CDECL exec_process( const UNICODE_STRING *cmdline, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN;
-extern NTSTATUS CDECL fork_and_exec( const char *unix_name, const char *unix_dir,
-                                     const RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN;
 
 extern NTSTATUS CDECL nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret,
                                             UINT disposition, BOOLEAN check_case ) DECLSPEC_HIDDEN;
@@ -181,6 +177,8 @@ extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLS
 extern int virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN;
 extern SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) DECLSPEC_HIDDEN;
 extern NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) DECLSPEC_HIDDEN;
+extern void virtual_fill_image_information( const pe_image_info_t *pe_info,
+                                            SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN;
 
 extern void signal_init_threading(void) DECLSPEC_HIDDEN;
 extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN;

dlls/ntdll/unix/virtual.c

@@ -4035,7 +4035,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr )
  *
  * Helper for NtQuerySection.
  */
-static void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info )
+void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info )
 {
     info->TransferAddress      = wine_server_get_ptr( pe_info->entry_point );
     info->ZeroBits             = pe_info->zerobits;

dlls/ntdll/unixlib.h

@@ -28,7 +28,7 @@ struct ldt_copy;
 struct msghdr;
 
 /* increment this when you change the function table */
-#define NTDLL_UNIXLIB_VERSION 46
+#define NTDLL_UNIXLIB_VERSION 47
 
 struct unix_funcs
 {
@@ -77,6 +77,12 @@ struct unix_funcs
                                               SIZE_T stack_reserve, PS_ATTRIBUTE_LIST *attr_list );
     NTSTATUS      (WINAPI *NtCreateTimer)( HANDLE *handle, ACCESS_MASK access,
                                            const OBJECT_ATTRIBUTES *attr, TIMER_TYPE type );
+    NTSTATUS      (WINAPI *NtCreateUserProcess)( HANDLE *process_handle_ptr, HANDLE *thread_handle_ptr,
+                                                 ACCESS_MASK process_access, ACCESS_MASK thread_access,
+                                                 OBJECT_ATTRIBUTES *process_attr, OBJECT_ATTRIBUTES *thread_attr,
+                                                 ULONG process_flags, ULONG thread_flags,
+                                                 RTL_USER_PROCESS_PARAMETERS *params, PS_CREATE_INFO *info,
+                                                 PS_ATTRIBUTE_LIST *attr );
     TEB *         (WINAPI *NtCurrentTeb)(void);
     NTSTATUS      (WINAPI *NtDelayExecution)( BOOLEAN alertable, const LARGE_INTEGER *timeout );
     NTSTATUS      (WINAPI *NtDeleteFile)( OBJECT_ATTRIBUTES *attr );
@@ -257,12 +263,7 @@ struct unix_funcs
     void          (CDECL *exit_thread)( int status );
     void          (CDECL *exit_process)( int status );
     NTSTATUS      (CDECL *get_thread_ldt_entry)( HANDLE handle, void *data, ULONG len, ULONG *ret_len );
-    NTSTATUS      (CDECL *spawn_process)( const RTL_USER_PROCESS_PARAMETERS *params, int socketfd,
-                                          const char *unixdir, char *winedebug,
-                                          const pe_image_info_t *pe_info );
     NTSTATUS      (CDECL *exec_process)( const UNICODE_STRING *cmdline, const pe_image_info_t *pe_info );
-    NTSTATUS      (CDECL *fork_and_exec)( const char *unix_name, const char *unix_dir,
-                                          const RTL_USER_PROCESS_PARAMETERS *params );
 
     /* server functions */
     unsigned int  (CDECL *server_call)( void *req_ptr );