ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the new RtlExitUserThread function instead of exporting

Browse Source 
wine_server_exit_thread.
This commit is contained in:
Alexandre Julliard 2005-08-02 09:55:40 +00:00
parent 0a93f42b80
commit 4de75b5a6f
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/kernel/thread.c
View File

@ -248,11 +248,7 @@ void WINAPI ExitThread( DWORD code ) /* [in] Exit code for this thread */
LdrShutdownProcess(); LdrShutdownProcess();
exit( code ); exit( code );
} }
else else RtlExitUserThread( code );
{
LdrShutdownThread();
wine_server_exit_thread( code );
}
} }

3
dlls/ntdll/ntdll.spec
View File

@ -568,7 +568,7 @@
@ stdcall RtlEqualString(ptr ptr long) @ stdcall RtlEqualString(ptr ptr long)
@ stdcall RtlEqualUnicodeString(ptr ptr long) @ stdcall RtlEqualUnicodeString(ptr ptr long)
@ stdcall RtlEraseUnicodeString(ptr) @ stdcall RtlEraseUnicodeString(ptr)
# @ stub RtlExitUserThread @ stdcall RtlExitUserThread(long)
@ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr) @ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr)
@ stub RtlExtendHeap @ stub RtlExtendHeap
@ stdcall -ret64 RtlExtendedIntegerMultiply(long long long) @ stdcall -ret64 RtlExtendedIntegerMultiply(long long long)
@ -1384,7 +1384,6 @@
@ cdecl wine_server_handle_to_fd(long long ptr ptr) @ cdecl wine_server_handle_to_fd(long long ptr ptr)
@ cdecl wine_server_release_fd(long long) @ cdecl wine_server_release_fd(long long)
@ cdecl wine_server_send_fd(long) @ cdecl wine_server_send_fd(long)
@ cdecl wine_server_exit_thread(long)
# Codepages # Codepages
@ cdecl __wine_init_codepages(ptr ptr ptr) @ cdecl __wine_init_codepages(ptr ptr ptr)

1
dlls/ntdll/ntdll_misc.h
View File

@ -59,6 +59,7 @@ extern void server_init_process(void);
extern size_t server_init_thread( int unix_pid, int unix_tid, void *entry_point ); extern size_t server_init_thread( int unix_pid, int unix_tid, void *entry_point );
extern void DECLSPEC_NORETURN server_protocol_error( const char *err, ... ); extern void DECLSPEC_NORETURN server_protocol_error( const char *err, ... );
extern void DECLSPEC_NORETURN server_protocol_perror( const char *err ); extern void DECLSPEC_NORETURN server_protocol_perror( const char *err );
extern void DECLSPEC_NORETURN server_exit_thread( int status );
extern void DECLSPEC_NORETURN server_abort_thread( int status ); extern void DECLSPEC_NORETURN server_abort_thread( int status );
/* module handling */ /* module handling */

4
dlls/ntdll/server.c
View File

@ -119,9 +119,9 @@ static void fatal_perror( const char *err, ... )
/*********************************************************************** /***********************************************************************
* wine_server_exit_thread (NTDLL.@) * server_exit_thread
*/ */
void wine_server_exit_thread( int status ) void server_exit_thread( int status )
{ {
struct wine_pthread_thread_info info; struct wine_pthread_thread_info info;
ULONG size; ULONG size;

10
dlls/ntdll/thread.c
View File

@ -343,6 +343,16 @@ error:
} }
/***********************************************************************
* RtlExitUserThread (NTDLL.@)
*/
void WINAPI RtlExitUserThread( ULONG status )
{
LdrShutdownThread();
server_exit_thread( status );
}
/*********************************************************************** /***********************************************************************
* NtOpenThread (NTDLL.@) * NtOpenThread (NTDLL.@)
* ZwOpenThread (NTDLL.@) * ZwOpenThread (NTDLL.@)

1
include/wine/server.h
View File

@ -54,7 +54,6 @@ extern void wine_server_send_fd( int fd );
extern int wine_server_fd_to_handle( int fd, unsigned int access, int inherit, obj_handle_t *handle ); extern int wine_server_fd_to_handle( int fd, unsigned int access, int inherit, obj_handle_t *handle );
extern int wine_server_handle_to_fd( obj_handle_t handle, unsigned int access, int *unix_fd, int *flags ); extern int wine_server_handle_to_fd( obj_handle_t handle, unsigned int access, int *unix_fd, int *flags );
extern void wine_server_release_fd( obj_handle_t handle, int unix_fd ); extern void wine_server_release_fd( obj_handle_t handle, int unix_fd );
extern void DECLSPEC_NORETURN wine_server_exit_thread( int status );
/* do a server call and set the last error code */ /* do a server call and set the last error code */
inline static unsigned int wine_server_call_err( void *req_ptr ) inline static unsigned int wine_server_call_err( void *req_ptr )

1
include/winternl.h
View File

@ -1985,6 +1985,7 @@ BOOL WINAPI RtlEqualPrefixSid(PSID,PSID);
BOOL WINAPI RtlEqualSid(PSID,PSID); BOOL WINAPI RtlEqualSid(PSID,PSID);
BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN);
BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN;
NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*);
LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT);
LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT);