Alexandre Julliard : ntdll: Get rid of the server_init_process_done() Unix library callback.
Module: wine Branch: master Commit: 9e973954fdfd2f9e22545bb6311053c835861193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e973954fdfd2f9e22545bb63...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Sep 1 13:03:44 2020 +0200
ntdll: Get rid of the server_init_process_done() Unix library callback.
This time without setting Eip to 0.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/loader.c | 2 -- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 +---- 5 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 96fa0566cf..7370857cfd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4073,8 +4073,6 @@ static void process_init(void) teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; - - unix_funcs->server_init_process_done( kernel32_start_process ); }
/*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ff75581286..6f25f4ae87 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1368,7 +1368,6 @@ static struct unix_funcs unix_funcs = get_locales, virtual_release_address_space, exec_process, - server_init_process_done, set_show_dot_files, load_so_dll, load_builtin_dll, @@ -1401,6 +1400,7 @@ static void start_main_thread(void) init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); + server_init_process_done(); }
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index e5d1e235eb..cc8b519b98 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1453,7 +1453,7 @@ void server_init_process(void) /*********************************************************************** * server_init_process_done */ -void CDECL server_init_process_done( void *relay ) +void server_init_process_done(void) { PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = get_exe_nt_header(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 26da1ac8c9..ce3c14d259 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -117,7 +117,6 @@ extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN;
-extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; @@ -167,6 +166,7 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; extern void server_init_process(void) DECLSPEC_HIDDEN; +extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern size_t server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 4c352c0a4b..6857e31c7d 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT;
/* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 101 +#define NTDLL_UNIXLIB_VERSION 102
struct unix_funcs { @@ -84,9 +84,6 @@ struct unix_funcs /* thread/process functions */ NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status );
- /* server functions */ - void (CDECL *server_init_process_done)( void *relay ); - /* file functions */ void (CDECL *set_show_dot_files)( BOOL enable );
-
Alexandre Julliard