January 2007 - Wine-Commits

Francois Gouget : localspl: Remove unneeded cast.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: 8c613a79e6cd24516acc8b4e9b046651a699db2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c613a79e6cd24516acc8b4e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:36:02 2007 +0100 localspl: Remove unneeded cast. --- dlls/localspl/localmon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 66d95cf..f7dcb62 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -490,7 +490,7 @@ BOOL WINAPI localmon_XcvOpenPort(LPCWSTR } else { - *phXcv = (HANDLE) NULL; + *phXcv = NULL; return FALSE; } }

1 0

Alexandre Julliard : server: Print a trace when sending a signal to a thread.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: ae4ecb6c6448f6069f81f14ba0f84f0fc1b54e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4ecb6c6448f6069f81f14ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 12:23:29 2007 +0100 server: Print a trace when sending a signal to a thread. --- server/mach.c | 2 ++ server/ptrace.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/mach.c b/server/mach.c index ec121e2..111953c 100644 --- a/server/mach.c +++ b/server/mach.c @@ -243,6 +243,8 @@ int send_thread_signal( struct thread *t thread->unix_tid = -1; } } + if (debug_level && ret != -1) + fprintf( stderr, "%04x: *sent signal* signal=%d\n", thread->id, sig ); return (ret != -1); } diff --git a/server/ptrace.c b/server/ptrace.c index 37c15c0..14a29f5 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -262,6 +262,8 @@ int send_thread_signal( struct thread *t thread->unix_tid = -1; } } + if (debug_level && ret != -1) + fprintf( stderr, "%04x: *sent signal* signal=%d\n", thread->id, sig ); return (ret != -1); }

1 0

Alexandre Julliard : ntdll: Block async signals during process init and thread creation.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: 8891d6de48fdc43ef045fcc7470297952a97ed92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8891d6de48fdc43ef045fcc74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 12:23:04 2007 +0100 ntdll: Block async signals during process init and thread creation. --- dlls/ntdll/loader.c | 19 +------------------ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/server.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 13 ++++++++++++- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3e3bc05..7ff3ca1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2139,24 +2139,7 @@ void WINAPI LdrInitializeThunk( ULONG un RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); - /* Install signal handlers; this cannot be done before, since we cannot - * send exceptions to the debugger before the create process event that - * is sent by REQ_INIT_PROCESS_DONE. - * We do need the handlers in place by the time the request is over, so - * we set them up here. If we segfault between here and the server call - * something is very wrong... */ - if (!SIGNAL_Init()) exit(1); - - /* Signal the parent process to continue */ - SERVER_START_REQ( init_process_done ) - { - req->module = peb->ImageBaseAddress; - req->entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; - req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); - status = wine_server_call( req ); - } - SERVER_END_REQ; - + status = server_init_process_done(); if (status != STATUS_SUCCESS) goto error; RtlEnterCriticalSection( &loader_section ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 725665d..4a8c474 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -58,6 +58,7 @@ extern void virtual_init_threading(void) /* server support */ extern abs_time_t server_start_time; extern void server_init_process(void); +extern NTSTATUS server_init_process_done(void); 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_perror( const char *err ); diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ded9f5b..ce0c3af 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1018,6 +1018,7 @@ void server_init_process(void) sigaddset( &server_block_set, SIGUSR1 ); sigaddset( &server_block_set, SIGUSR2 ); sigaddset( &server_block_set, SIGCHLD ); + pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ ntdll_get_thread_data()->request_fd = receive_fd( &dummy_handle ); @@ -1029,6 +1030,38 @@ void server_init_process(void) /*********************************************************************** + * server_init_process_done + */ +NTSTATUS server_init_process_done(void) +{ + PEB *peb = NtCurrentTeb()->Peb; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); + NTSTATUS status; + + /* Install signal handlers; this cannot be done earlier, since we cannot + * send exceptions to the debugger before the create process event that + * is sent by REQ_INIT_PROCESS_DONE. + * We do need the handlers in place by the time the request is over, so + * we set them up here. If we segfault between here and the server call + * something is very wrong... */ + if (!SIGNAL_Init()) exit(1); + + /* Signal the parent process to continue */ + SERVER_START_REQ( init_process_done ) + { + req->module = peb->ImageBaseAddress; + req->entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; + req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); + status = wine_server_call( req ); + } + SERVER_END_REQ; + + pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); + return status; +} + + +/*********************************************************************** * server_init_thread * * Send an init thread request. Return 0 if OK. diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 4a82e43..356ba11 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -346,6 +346,8 @@ static void start_thread( struct wine_pt size = page_size; NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, PAGE_NOACCESS, NULL ); + pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); + RtlAcquirePebLock(); InsertHeadList( &tls_links, &teb->TlsLinks ); RtlReleasePebLock(); @@ -380,6 +382,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN PRTL_THREAD_START_ROUTINE start, void *param, HANDLE *handle_ptr, CLIENT_ID *id ) { + sigset_t sigset; struct ntdll_thread_data *thread_data; struct ntdll_thread_regs *thread_regs = NULL; struct startup_info *info = NULL; @@ -416,7 +419,13 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN } SERVER_END_REQ; - if (status) goto error; + if (status) + { + close( request_pipe[1] ); + return status; + } + + pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, &sigset ); addr = NULL; size = sigstack_total_size; @@ -469,6 +478,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN status = STATUS_NO_MEMORY; goto error; } + pthread_functions.sigprocmask( SIG_SETMASK, &sigset, NULL ); if (id) id->UniqueThread = (HANDLE)tid; if (handle_ptr) *handle_ptr = handle; @@ -484,6 +494,7 @@ error: NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } if (handle) NtClose( handle ); + pthread_functions.sigprocmask( SIG_SETMASK, &sigset, NULL ); close( request_pipe[1] ); return status; }

1 0

Alexandre Julliard : ntdll: Make the server signal mask global.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: c388c58b9f8074b52ded31e3397646f3b305bfbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c388c58b9f8074b52ded31e33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 12:20:56 2007 +0100 ntdll: Make the server signal mask global. --- dlls/ntdll/ntdll_misc.h | 5 +++-- dlls/ntdll/server.c | 26 +++++++++++++------------- dlls/ntdll/signal_i386.c | 6 +----- dlls/ntdll/signal_powerpc.c | 5 +---- dlls/ntdll/signal_sparc.c | 3 +-- dlls/ntdll/signal_x86_64.c | 5 +---- 6 files changed, 20 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b06646c..725665d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -63,8 +63,9 @@ extern void DECLSPEC_NORETURN server_pro 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 ); -void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ); -void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ); +extern sigset_t server_block_set; +extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ); +extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ); extern int server_remove_fd_from_cache( obj_handle_t handle ); extern int server_get_unix_fd( obj_handle_t handle, unsigned int access, int *unix_fd, int *needs_close, enum server_fd_type *type, int *flags ); diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 42c3ace..ded9f5b 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -89,7 +89,7 @@ abs_time_t server_start_time = { 0, 0 }; extern struct wine_pthread_functions pthread_functions; -static sigset_t block_set; /* signals to block during server calls */ +sigset_t server_block_set; /* signals to block during server calls */ static int fd_socket = -1; /* socket to exchange file descriptors with the server */ static RTL_CRITICAL_SECTION fd_cache_section; @@ -156,7 +156,7 @@ void server_exit_thread( int status ) fds[1] = ntdll_get_thread_data()->wait_fd[1]; fds[2] = ntdll_get_thread_data()->reply_fd; fds[3] = ntdll_get_thread_data()->request_fd; - pthread_functions.sigprocmask( SIG_BLOCK, &block_set, NULL ); + pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, NULL ); size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &info.stack_base, &size, MEM_RELEASE | MEM_SYSTEM ); @@ -179,7 +179,7 @@ void server_exit_thread( int status ) */ void server_abort_thread( int status ) { - pthread_functions.sigprocmask( SIG_BLOCK, &block_set, NULL ); + pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, NULL ); close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); @@ -318,7 +318,7 @@ unsigned int wine_server_call( void *req struct __server_request_info * const req = req_ptr; sigset_t old_set; - pthread_functions.sigprocmask( SIG_BLOCK, &block_set, &old_set ); + pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, &old_set ); send_request( req ); wait_reply( req ); pthread_functions.sigprocmask( SIG_SETMASK, &old_set, NULL ); @@ -331,7 +331,7 @@ unsigned int wine_server_call( void *req */ void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) { - pthread_functions.sigprocmask( SIG_BLOCK, &block_set, sigset ); + pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, sigset ); RtlEnterCriticalSection( cs ); } @@ -1010,14 +1010,14 @@ void server_init_process(void) } /* setup the signal mask */ - sigemptyset( &block_set ); - sigaddset( &block_set, SIGALRM ); - sigaddset( &block_set, SIGIO ); - sigaddset( &block_set, SIGINT ); - sigaddset( &block_set, SIGHUP ); - sigaddset( &block_set, SIGUSR1 ); - sigaddset( &block_set, SIGUSR2 ); - sigaddset( &block_set, SIGCHLD ); + sigemptyset( &server_block_set ); + sigaddset( &server_block_set, SIGALRM ); + sigaddset( &server_block_set, SIGIO ); + sigaddset( &server_block_set, SIGINT ); + sigaddset( &server_block_set, SIGHUP ); + sigaddset( &server_block_set, SIGUSR1 ); + sigaddset( &server_block_set, SIGUSR2 ); + sigaddset( &server_block_set, SIGCHLD ); /* receive the first thread request fd on the main socket */ ntdll_get_thread_data()->request_fd = receive_fd( &dummy_handle ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fdbfb64..46bf9c2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1341,12 +1341,8 @@ BOOL SIGNAL_Init(void) } #endif /* HAVE_SIGALTSTACK */ - sigemptyset( &sig_act.sa_mask ); - sigaddset( &sig_act.sa_mask, SIGINT ); - sigaddset( &sig_act.sa_mask, SIGUSR1 ); - sigaddset( &sig_act.sa_mask, SIGUSR2 ); + sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART; - #ifdef SA_ONSTACK sig_act.sa_flags |= SA_ONSTACK; #endif diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index c584b88..2787786 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -630,10 +630,7 @@ static int set_handler( int sig, void (* struct sigaction sig_act; sig_act.sa_sigaction = func; - sigemptyset( &sig_act.sa_mask ); - sigaddset( &sig_act.sa_mask, SIGINT ); - sigaddset( &sig_act.sa_mask, SIGALRM ); - + sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_RESTART | SA_SIGINFO; return sigaction( sig, &sig_act, NULL ); } diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 92f20aa..7412a8e 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -436,9 +436,8 @@ static int set_handler( int sig, void (* { struct sigaction sig_act; - sig_act.sa_handler = NULL; sig_act.sa_sigaction = func; - sigemptyset( &sig_act.sa_mask ); + sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO; return sigaction( sig, &sig_act, NULL ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 53a24e5..69f6272 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -462,10 +462,7 @@ static int set_handler( int sig, void (* struct sigaction sig_act; sig_act.sa_sigaction = func; - sigemptyset( &sig_act.sa_mask ); - sigaddset( &sig_act.sa_mask, SIGINT ); - sigaddset( &sig_act.sa_mask, SIGUSR2 ); - + sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK; return sigaction( sig, &sig_act, NULL ); }

1 0

Alexandre Julliard : ntdll: Avoid heap allocations during thread creation.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: fb75c66897b28bd6a9c28cdd9e46db258b037ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb75c66897b28bd6a9c28cdd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 12:20:10 2007 +0100 ntdll: Avoid heap allocations during thread creation. --- dlls/ntdll/thread.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index cf96186..4a82e43 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -231,6 +231,7 @@ HANDLE thread_init(void) sigstack_total_size = get_signal_stack_total_size(); while (1 << sigstack_zero_bits < sigstack_total_size) sigstack_zero_bits++; assert( 1 << sigstack_zero_bits == sigstack_total_size ); /* must be a power of 2 */ + assert( sigstack_total_size >= sizeof(TEB) + sizeof(struct startup_info) ); thread_info.teb_size = sigstack_total_size; addr = NULL; @@ -344,7 +345,6 @@ static void start_thread( struct wine_pt /* setup the guard page */ size = page_size; NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, PAGE_NOACCESS, NULL ); - RtlFreeHeap( GetProcessHeap(), 0, info ); RtlAcquirePebLock(); InsertHeadList( &tls_links, &teb->TlsLinks ); @@ -418,12 +418,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN if (status) goto error; - if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*info) ))) - { - status = STATUS_NO_MEMORY; - goto error; - } - addr = NULL; size = sigstack_total_size; if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, sigstack_zero_bits, @@ -431,6 +425,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN goto error; teb = addr; teb->Peb = NtCurrentTeb()->Peb; + info = (struct startup_info *)(teb + 1); info->pthread_info.teb_size = size; if ((status = init_teb( teb ))) goto error; @@ -488,7 +483,6 @@ error: SIZE_T size = 0; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - RtlFreeHeap( GetProcessHeap(), 0, info ); if (handle) NtClose( handle ); close( request_pipe[1] ); return status;

1 0

Alexandre Julliard : ntdll: Make the fd cache section an uninterruptible section.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: 735dbc406b6c76227e3d695c98a87697b88bedaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=735dbc406b6c76227e3d695c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 12:19:25 2007 +0100 ntdll: Make the fd cache section an uninterruptible section. --- dlls/ntdll/server.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 6d8c24e..42c3ace 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -558,13 +558,14 @@ int server_remove_fd_from_cache( obj_han int server_get_unix_fd( obj_handle_t handle, unsigned int access, int *unix_fd, int *needs_close, enum server_fd_type *type, int *flags ) { + sigset_t sigset; obj_handle_t fd_handle; int ret = 0, removable = 0, fd; *unix_fd = -1; *needs_close = 0; - RtlEnterCriticalSection( &fd_cache_section ); + server_enter_uninterrupted_section( &fd_cache_section, &sigset ); fd = get_cached_fd( handle, type ); if (fd != -1 && !flags) goto done; @@ -593,7 +594,7 @@ int server_get_unix_fd( obj_handle_t han SERVER_END_REQ; done: - RtlLeaveCriticalSection( &fd_cache_section ); + server_leave_uninterrupted_section( &fd_cache_section, &sigset ); if (!ret) *unix_fd = fd; return ret; }

1 0

Alexandre Julliard : ntdll: Fix NtDuplicateObject to only close the file descriptor if it' s in the same process.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: 3410354d61c3c2c6f9963dcec132d6560b1504d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3410354d61c3c2c6f9963dcec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 12:18:51 2007 +0100 ntdll: Fix NtDuplicateObject to only close the file descriptor if it's in the same process. --- dlls/ntdll/om.c | 7 +++++-- include/wine/server_protocol.h | 3 ++- server/handle.c | 1 + server/protocol.def | 1 + server/trace.c | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 56612dc..cac8713 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -314,8 +314,11 @@ NTSTATUS WINAPI NtDuplicateObject( HANDL if (dest) *dest = reply->handle; if (reply->closed) { - int fd = server_remove_fd_from_cache( source ); - if (fd != -1) close( fd ); + if (reply->self) + { + int fd = server_remove_fd_from_cache( source ); + if (fd != -1) close( fd ); + } } else if (options & DUPLICATE_CLOSE_SOURCE) WARN( "failed to close handle %p in process %p\n", source, source_process ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ca98f28..6f7a652 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -740,6 +740,7 @@ struct dup_handle_reply { struct reply_header __header; obj_handle_t handle; + int self; int closed; }; #define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE @@ -4575,6 +4576,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 270 +#define SERVER_PROTOCOL_VERSION 271 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/handle.c b/server/handle.c index 887fbca..f8f007d 100644 --- a/server/handle.c +++ b/server/handle.c @@ -536,6 +536,7 @@ DECL_HANDLER(dup_handle) reply->closed = close_handle( src, req->src_handle ); set_error( err ); } + reply->self = (src == current->process); release_object( src ); } } diff --git a/server/protocol.def b/server/protocol.def index 343fbbb..535ef12 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -635,6 +635,7 @@ typedef union unsigned int options; /* duplicate options (see below) */ @REPLY obj_handle_t handle; /* duplicated handle in dst process */ + int self; /* is the source the current process? */ int closed; /* whether the source handle has been closed */ @END #define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE diff --git a/server/trace.c b/server/trace.c index 6766faf..4e63093 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1025,6 +1025,7 @@ static void dump_dup_handle_request( con static void dump_dup_handle_reply( const struct dup_handle_reply *req ) { fprintf( stderr, " handle=%p,", req->handle ); + fprintf( stderr, " self=%d,", req->self ); fprintf( stderr, " closed=%d", req->closed ); }

1 0

Alexandre Julliard : ntdll: Avoid heap allocation in fd cache. Fixed a couple of races.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: 027491f6af1ca919f9c1d20995e3e150e03bc978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027491f6af1ca919f9c1d2099… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 12:18:29 2007 +0100 ntdll: Avoid heap allocation in fd cache. Fixed a couple of races. --- dlls/ntdll/file.c | 6 +++- dlls/ntdll/om.c | 9 ++++- dlls/ntdll/server.c | 85 ++++++++++++++++++++++++--------------------------- 3 files changed, 52 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 543fcfb..a79d227 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1107,7 +1107,11 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE h { req->handle = handle; io->u.Status = wine_server_call(req); - if (!io->u.Status) server_remove_fd_from_cache( handle ); + if (!io->u.Status) + { + int fd = server_remove_fd_from_cache( handle ); + if (fd != -1) close( fd ); + } } SERVER_END_REQ; break; diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index af03e7d..56612dc 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -313,7 +313,10 @@ NTSTATUS WINAPI NtDuplicateObject( HANDL { if (dest) *dest = reply->handle; if (reply->closed) - server_remove_fd_from_cache( source ); + { + int fd = server_remove_fd_from_cache( source ); + if (fd != -1) close( fd ); + } else if (options & DUPLICATE_CLOSE_SOURCE) WARN( "failed to close handle %p in process %p\n", source, source_process ); } @@ -337,13 +340,15 @@ NTSTATUS WINAPI NtDuplicateObject( HANDL NTSTATUS WINAPI NtClose( HANDLE Handle ) { NTSTATUS ret; + int fd = server_remove_fd_from_cache( Handle ); + SERVER_START_REQ( close_handle ) { req->handle = Handle; ret = wine_server_call( req ); - if (!ret) server_remove_fd_from_cache( Handle ); } SERVER_END_REQ; + if (fd != -1) close( fd ); return ret; } diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a333082..6d8c24e 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -458,10 +458,8 @@ static int receive_fd( obj_handle_t *han } -inline static unsigned int handle_to_index( obj_handle_t handle ) -{ - return ((unsigned long)handle >> 2) - 1; -} +/***********************************************************************/ +/* fd cache support */ struct fd_cache_entry { @@ -469,8 +467,19 @@ struct fd_cache_entry enum server_fd_type type; }; -static struct fd_cache_entry *fd_cache; -static unsigned int fd_cache_size; +#define FD_CACHE_BLOCK_SIZE (65536 / sizeof(struct fd_cache_entry)) +#define FD_CACHE_ENTRIES 128 + +static struct fd_cache_entry *fd_cache[FD_CACHE_ENTRIES]; +static struct fd_cache_entry fd_cache_initial_block[FD_CACHE_BLOCK_SIZE]; + +inline static unsigned int handle_to_index( obj_handle_t handle, unsigned int *entry ) +{ + unsigned long idx = ((unsigned long)handle >> 2) - 1; + *entry = idx / FD_CACHE_BLOCK_SIZE; + return idx % FD_CACHE_BLOCK_SIZE; +} + /*********************************************************************** * add_fd_to_cache @@ -479,35 +488,31 @@ static unsigned int fd_cache_size; */ static int add_fd_to_cache( obj_handle_t handle, int fd, enum server_fd_type type ) { - unsigned int idx = handle_to_index( handle ); + unsigned int entry, idx = handle_to_index( handle, &entry ); + int prev_fd; - if (idx >= fd_cache_size) + if (entry >= FD_CACHE_ENTRIES) { - unsigned int i, size = max( 32, fd_cache_size * 2 ); - struct fd_cache_entry *new_cache; + FIXME( "too many allocated handles, not caching %p\n", handle ); + return 0; + } - if (size <= idx) size = idx + 1; - if (fd_cache) - new_cache = RtlReAllocateHeap( GetProcessHeap(), 0, fd_cache, size*sizeof(fd_cache[0]) ); + if (!fd_cache[entry]) /* do we need to allocate a new block of entries? */ + { + if (!entry) fd_cache[0] = fd_cache_initial_block; else - new_cache = RtlAllocateHeap( GetProcessHeap(), 0, size*sizeof(fd_cache[0]) ); - - if (new_cache) { - for (i = fd_cache_size; i < size; i++) new_cache[i].fd = -1; - fd_cache = new_cache; - fd_cache_size = size; + void *ptr = wine_anon_mmap( NULL, FD_CACHE_BLOCK_SIZE * sizeof(struct fd_cache_entry), + PROT_READ | PROT_WRITE, 0 ); + if (ptr == MAP_FAILED) return 0; + fd_cache[entry] = ptr; } } - if (idx < fd_cache_size) - { - assert( fd_cache[idx].fd == -1 ); - fd_cache[idx].fd = fd; - fd_cache[idx].type = type; - TRACE("added %p (%d) type %d to cache\n", handle, fd, type ); - return 1; - } - return 0; + /* store fd+1 so that 0 can be used as the unset value */ + prev_fd = interlocked_xchg( &fd_cache[entry][idx].fd, fd + 1 ) - 1; + fd_cache[entry][idx].type = type; + if (prev_fd != -1) close( prev_fd ); + return 1; } @@ -518,13 +523,13 @@ static int add_fd_to_cache( obj_handle_t */ static inline int get_cached_fd( obj_handle_t handle, enum server_fd_type *type ) { - unsigned int idx = handle_to_index( handle ); + unsigned int entry, idx = handle_to_index( handle, &entry ); int fd = -1; - if (idx < fd_cache_size) + if (entry < FD_CACHE_ENTRIES && fd_cache[entry]) { - fd = fd_cache[idx].fd; - if (type) *type = fd_cache[idx].type; + fd = fd_cache[entry][idx].fd - 1; + if (type) *type = fd_cache[entry][idx].type; } return fd; } @@ -535,22 +540,12 @@ static inline int get_cached_fd( obj_han */ int server_remove_fd_from_cache( obj_handle_t handle ) { - unsigned int idx = handle_to_index( handle ); + unsigned int entry, idx = handle_to_index( handle, &entry ); int fd = -1; - RtlEnterCriticalSection( &fd_cache_section ); - if (idx < fd_cache_size) - { - fd = fd_cache[idx].fd; - fd_cache[idx].fd = -1; - } - RtlLeaveCriticalSection( &fd_cache_section ); + if (entry < FD_CACHE_ENTRIES && fd_cache[entry]) + fd = interlocked_xchg( &fd_cache[entry][idx].fd, 0 ) - 1; - if (fd != -1) - { - close( fd ); - TRACE("removed %p (%d) from cache\n", handle, fd ); - } return fd; }

1 0

Christoph Frick : dinput: Calc more caps infos ahead and store it in JoystickImpl.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: a6947bde231932da117ecd2746837409d0f76861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6947bde231932da117ecd274… Author: Christoph Frick <frick(a)sc-networks.de> Date: Wed Jan 17 11:14:20 2007 +0100 dinput: Calc more caps infos ahead and store it in JoystickImpl. --- dlls/dinput/joystick_linuxinput.c | 47 ++++++++++-------------------------- 1 files changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 1f98d6d..a0ce49c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -145,6 +145,10 @@ struct JoystickImpl /* LUT for KEY_ to offset in rgbButtons */ BYTE buttons[KEY_MAX]; + DWORD numAxes; + DWORD numPOVs; + DWORD numButtons; + /* Force feedback variables */ EffectListItem* top_effect; int ff_state; @@ -354,7 +358,6 @@ static JoystickImpl *alloc_device(REFGUI JoystickImpl* newDevice; LPDIDATAFORMAT df = NULL; int i, idx = 0; - int axis = 0, btn = 0; newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickImpl)); if (!newDevice) return NULL; @@ -388,7 +391,7 @@ static JoystickImpl *alloc_device(REFGUI newDevice->props[idx].wantmin = newDevice->props[idx].havemin = newDevice->joydev->axes[i][AXIS_ABSMIN]; newDevice->props[idx].wantmax = newDevice->props[idx].havemax = newDevice->joydev->axes[i][AXIS_ABSMAX]; newDevice->props[idx].deadzone = 0; - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(axis++) | DIDFT_ABSAXIS; + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS; } for (i = 0; i < WINE_JOYSTICK_MAX_POVS; i++) @@ -401,17 +404,17 @@ static JoystickImpl *alloc_device(REFGUI memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[i + WINE_JOYSTICK_MAX_AXES], df->dwObjSize); newDevice->axes[ABS_HAT0X + i * 2] = newDevice->axes[ABS_HAT0Y + i * 2] = i; - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_POV; + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numPOVs++) | DIDFT_POV; } /* Buttons can be anywhere, so check all */ - for (i = 0; i < KEY_MAX && btn < WINE_JOYSTICK_MAX_BUTTONS; i++) + for (i = 0; i < KEY_MAX && newDevice->numButtons < WINE_JOYSTICK_MAX_BUTTONS; i++) { if (!test_bit(newDevice->joydev->keybits, i)) continue; - memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[btn + WINE_JOYSTICK_MAX_AXES + WINE_JOYSTICK_MAX_POVS], df->dwObjSize); - newDevice->buttons[i] = 0x80 | btn; - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(btn++) | DIDFT_PSHBUTTON; + memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[newDevice->numButtons + WINE_JOYSTICK_MAX_AXES + WINE_JOYSTICK_MAX_POVS], df->dwObjSize); + newDevice->buttons[i] = 0x80 | newDevice->numButtons; + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numButtons++) | DIDFT_PSHBUTTON; } df->dwNumObjs = idx; @@ -851,7 +854,6 @@ static HRESULT WINAPI JoystickAImpl_GetC LPDIDEVCAPS lpDIDevCaps) { JoystickImpl *This = (JoystickImpl *)iface; - int i,axes,buttons,povs; TRACE("%p->(%p)\n",iface,lpDIDevCaps); @@ -871,35 +873,12 @@ static HRESULT WINAPI JoystickAImpl_GetC else lpDIDevCaps->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - axes=0; - for (i=0;i<ABS_MAX;i++) { - if (!test_bit(This->joydev->absbits,i)) continue; - switch (i) { - case ABS_HAT0X: case ABS_HAT0Y: - case ABS_HAT1X: case ABS_HAT1Y: - case ABS_HAT2X: case ABS_HAT2Y: - case ABS_HAT3X: case ABS_HAT3Y: - /* will be handled as POV - see below */ - break; - default: - axes++; - } - } - buttons=0; - for (i=0;i<KEY_MAX;i++) if (test_bit(This->joydev->keybits,i)) buttons++; - povs=0; - for (i=0; i<4; i++) { - if (test_bit(This->joydev->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->joydev->absbits,ABS_HAT0Y+(i<<1))) { - povs ++; - } - } - if (This->joydev->has_ff) lpDIDevCaps->dwFlags |= DIDC_FORCEFEEDBACK; - lpDIDevCaps->dwAxes = axes; - lpDIDevCaps->dwButtons = buttons; - lpDIDevCaps->dwPOVs = povs; + lpDIDevCaps->dwAxes = This->numAxes; + lpDIDevCaps->dwButtons = This->numButtons; + lpDIDevCaps->dwPOVs = This->numPOVs; return DI_OK; }

1 0

H. Verbeet : wined3d: Give shader constants their own debug channel.
by Alexandre Julliard Jan. 18, 2007

Jan. 18, 2007

Module: wine Branch: master Commit: 955fb95eb6f927458b29ef74f0b183c5195a8d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=955fb95eb6f927458b29ef74f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 17 21:41:46 2007 +0100 wined3d: Give shader constants their own debug channel. --- dlls/wined3d/arb_program_shader.c | 7 ++++--- dlls/wined3d/glsl_shader.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 073a3ad..f76e4c7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -33,6 +33,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); #define GLINFO_LOCATION (*gl_info) @@ -56,7 +57,7 @@ static void shader_arb_load_constantsF(I if (!constant_list) { if (TRACE_ON(d3d_shader)) { for (i = 0; i < max_constants; ++i) { - TRACE("Loading constants %i: %f, %f, %f, %f\n", i, + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i * 4 + 0], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); } @@ -69,7 +70,7 @@ static void shader_arb_load_constantsF(I if (TRACE_ON(d3d_shader)) { LIST_FOR_EACH_ENTRY(constant, constant_list, constant_entry, entry) { i = constant->idx; - TRACE("Loading constants %i: %f, %f, %f, %f\n", i, + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i * 4 + 0], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); } @@ -85,7 +86,7 @@ static void shader_arb_load_constantsF(I if (TRACE_ON(d3d_shader)) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { GLfloat* values = (GLfloat*)lconst->value; - TRACE("Loading local constants %i: %f, %f, %f, %f\n", lconst->idx, + TRACE_(d3d_constants)("Loading local constants %i: %f, %f, %f, %f\n", lconst->idx, values[0], values[1], values[2], values[3]); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4bc4e21..9a11b5b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -32,6 +32,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); #define GLINFO_LOCATION (*gl_info) @@ -113,7 +114,7 @@ static void shader_glsl_load_constantsF( for (i = 0; i < max_constants; ++i) { tmp_loc = constant_locations[i]; if (tmp_loc != -1) { - TRACE("Loading constants %i: %f, %f, %f, %f\n", i, + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i * 4 + 0], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); } @@ -134,7 +135,7 @@ static void shader_glsl_load_constantsF( i = constant->idx; tmp_loc = constant_locations[i]; if (tmp_loc != -1) { - TRACE("Loading constants %i: %f, %f, %f, %f\n", i, + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i * 4 + 0], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); } @@ -157,7 +158,7 @@ static void shader_glsl_load_constantsF( tmp_loc = constant_locations[lconst->idx]; if (tmp_loc != -1) { GLfloat* values = (GLfloat*)lconst->value; - TRACE("Loading local constants %i: %f, %f, %f, %f\n", lconst->idx, + TRACE_(d3d_constants)("Loading local constants %i: %f, %f, %f, %f\n", lconst->idx, values[0], values[1], values[2], values[3]); } } @@ -194,7 +195,7 @@ void shader_glsl_load_constantsI( for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { - TRACE("Loading constants %i: %i, %i, %i, %i\n", + TRACE_(d3d_constants)("Loading constants %i: %i, %i, %i, %i\n", i, constants[i*4], constants[i*4+1], constants[i*4+2], constants[i*4+3]); /* TODO: Benchmark and see if it would be beneficial to store the @@ -216,7 +217,7 @@ void shader_glsl_load_constantsI( unsigned int idx = lconst->idx; GLint* values = (GLint*) lconst->value; - TRACE("Loading local constants %i: %i, %i, %i, %i\n", idx, + TRACE_(d3d_constants)("Loading local constants %i: %i, %i, %i, %i\n", idx, values[0], values[1], values[2], values[3]); snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, idx); @@ -252,7 +253,7 @@ void shader_glsl_load_constantsB( for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { - TRACE("Loading constants %i: %i;\n", i, constants[i*4]); + TRACE_(d3d_constants)("Loading constants %i: %i;\n", i, constants[i*4]); /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ @@ -273,7 +274,7 @@ void shader_glsl_load_constantsB( unsigned int idx = lconst->idx; GLint* values = (GLint*) lconst->value; - TRACE("Loading local constants %i: %i\n", idx, values[0]); + TRACE_(d3d_constants)("Loading local constants %i: %i\n", idx, values[0]); snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, idx); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name));

1 0