Commit 9e973954 authored by Alexandre Julliard's avatar Alexandre Julliard

ntdll: Get rid of the server_init_process_done() Unix library callback.

This time without setting Eip to 0. Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f7e4fd0c
...@@ -4073,8 +4073,6 @@ static void process_init(void) ...@@ -4073,8 +4073,6 @@ static void process_init(void)
teb->Tib.StackBase = stack.StackBase; teb->Tib.StackBase = stack.StackBase;
teb->Tib.StackLimit = stack.StackLimit; teb->Tib.StackLimit = stack.StackLimit;
teb->DeallocationStack = stack.DeallocationStack; teb->DeallocationStack = stack.DeallocationStack;
unix_funcs->server_init_process_done( kernel32_start_process );
} }
/*********************************************************************** /***********************************************************************
......
...@@ -1368,7 +1368,6 @@ static struct unix_funcs unix_funcs = ...@@ -1368,7 +1368,6 @@ static struct unix_funcs unix_funcs =
get_locales, get_locales,
virtual_release_address_space, virtual_release_address_space,
exec_process, exec_process,
server_init_process_done,
set_show_dot_files, set_show_dot_files,
load_so_dll, load_so_dll,
load_builtin_dll, load_builtin_dll,
...@@ -1401,6 +1400,7 @@ static void start_main_thread(void) ...@@ -1401,6 +1400,7 @@ static void start_main_thread(void)
init_files(); init_files();
NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs );
server_init_process_done();
} }
......
...@@ -1453,7 +1453,7 @@ void server_init_process(void) ...@@ -1453,7 +1453,7 @@ void server_init_process(void)
/*********************************************************************** /***********************************************************************
* server_init_process_done * server_init_process_done
*/ */
void CDECL server_init_process_done( void *relay ) void server_init_process_done(void)
{ {
PEB *peb = NtCurrentTeb()->Peb; PEB *peb = NtCurrentTeb()->Peb;
IMAGE_NT_HEADERS *nt = get_exe_nt_header(); IMAGE_NT_HEADERS *nt = get_exe_nt_header();
......
...@@ -117,7 +117,6 @@ extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; ...@@ -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 get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN;
extern void CDECL virtual_release_address_space(void) 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 exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN;
extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch,
CONTEXT *context ) DECLSPEC_HIDDEN; CONTEXT *context ) DECLSPEC_HIDDEN;
...@@ -167,6 +166,7 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * ...@@ -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, 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; 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(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 size_t server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN;
extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
struct _DISPATCHER_CONTEXT; struct _DISPATCHER_CONTEXT;
/* increment this when you change the function table */ /* increment this when you change the function table */
#define NTDLL_UNIXLIB_VERSION 101 #define NTDLL_UNIXLIB_VERSION 102
struct unix_funcs struct unix_funcs
{ {
...@@ -84,9 +84,6 @@ struct unix_funcs ...@@ -84,9 +84,6 @@ struct unix_funcs
/* thread/process functions */ /* thread/process functions */
NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ); NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status );
/* server functions */
void (CDECL *server_init_process_done)( void *relay );
/* file functions */ /* file functions */
void (CDECL *set_show_dot_files)( BOOL enable ); void (CDECL *set_show_dot_files)( BOOL enable );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment