From: Rémi Bernon rbernon@codeweavers.com
--- server/completion.c | 2 +- server/console.c | 4 ++-- server/debugger.c | 4 ++-- server/device.c | 2 +- server/event.c | 7 ++++++- server/fd.c | 6 +++--- server/object.h | 2 +- server/process.c | 6 +++--- server/queue.c | 2 +- server/thread.c | 6 +++--- server/timer.c | 2 +- 11 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/server/completion.c b/server/completion.c index a2028a89823..caef8fba2a8 100644 --- a/server/completion.c +++ b/server/completion.c @@ -279,7 +279,7 @@ static struct completion *create_completion( struct object *root, const struct u list_init( &completion->wait_queue ); completion->depth = 0;
- if (!(completion->sync = create_event_sync( 1, 0 ))) + if (!(completion->sync = create_internal_sync( 1, 0 ))) { release_object( completion ); return NULL; diff --git a/server/console.c b/server/console.c index f0cb6689d4b..08bad277a3f 100644 --- a/server/console.c +++ b/server/console.c @@ -554,7 +554,7 @@ static struct object *create_console(void) init_async_queue( &console->ioctl_q ); init_async_queue( &console->read_q );
- if (!(console->sync = create_event_sync( 1, 0 ))) goto error; + if (!(console->sync = create_internal_sync( 1, 0 ))) goto error; if (!(console->fd = alloc_pseudo_fd( &console_fd_ops, &console->obj, FILE_SYNCHRONOUS_IO_NONALERT ))) goto error; allow_fd_caching( console->fd ); return &console->obj; @@ -977,7 +977,7 @@ static struct object *create_console_server( void ) list_init( &server->queue ); list_init( &server->read_queue );
- if (!(server->sync = create_event_sync( 1, 1 ))) goto error; + if (!(server->sync = create_internal_sync( 1, 1 ))) goto error; if (!(server->fd = alloc_pseudo_fd( &console_server_fd_ops, &server->obj, FILE_SYNCHRONOUS_IO_NONALERT ))) goto error; allow_fd_caching(server->fd); return &server->obj; diff --git a/server/debugger.c b/server/debugger.c index 2956ee17b8e..31ce91a36a8 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -372,7 +372,7 @@ static struct debug_obj *create_debug_obj( struct object *root, const struct uni debug_obj->flags = flags; list_init( &debug_obj->event_queue );
- if (!(debug_obj->sync = create_event_sync( 1, 0 ))) + if (!(debug_obj->sync = create_internal_sync( 1, 0 ))) { release_object( debug_obj ); return NULL; @@ -451,7 +451,7 @@ static struct debug_event *alloc_debug_event( struct thread *thread, int code, c fill_debug_event[code - DbgCreateThreadStateChange]( event, arg ); event->data.code = code;
- if (!(event->sync = create_event_sync( 1, 0 ))) + if (!(event->sync = create_internal_sync( 1, 0 ))) { release_object( event ); return NULL; diff --git a/server/device.c b/server/device.c index f4b3f19028b..859ca9a2b52 100644 --- a/server/device.c +++ b/server/device.c @@ -848,7 +848,7 @@ static struct device_manager *create_device_manager(void) list_init( &manager->requests ); wine_rb_init( &manager->kernel_objects, compare_kernel_object );
- if (!(manager->sync = create_event_sync( 1, 0 ))) + if (!(manager->sync = create_internal_sync( 1, 0 ))) { release_object( manager ); return NULL; diff --git a/server/event.c b/server/event.c index c69554fc657..cb9fe49460e 100644 --- a/server/event.c +++ b/server/event.c @@ -87,7 +87,7 @@ static const struct object_ops event_sync_ops = no_destroy /* destroy */ };
-struct event_sync *create_event_sync( int manual, int signaled ) +static struct event_sync *create_event_sync( int manual, int signaled ) { struct event_sync *event;
@@ -98,6 +98,11 @@ struct event_sync *create_event_sync( int manual, int signaled ) return event; }
+struct event_sync *create_internal_sync( int manual, int signaled ) +{ + return create_event_sync( manual, signaled ); +} + static void event_sync_dump( struct object *obj, int verbose ) { struct event_sync *event = (struct event_sync *)obj; diff --git a/server/fd.c b/server/fd.c index 1b932cc3ae3..5a43888e719 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1441,7 +1441,7 @@ static struct file_lock *add_lock( struct fd *fd, int shared, file_pos_t start, lock->fd = fd; lock->process = current->process;
- if (!(lock->sync = create_event_sync( 1, 0 ))) goto error; + if (!(lock->sync = create_internal_sync( 1, 0 ))) goto error; /* now try to set a Unix lock */ if (!set_unix_lock( lock->fd, lock->start, lock->end, lock->shared ? F_RDLCK : F_WRLCK )) goto error; list_add_tail( &fd->locks, &lock->fd_entry ); @@ -1724,7 +1724,7 @@ static struct fd *alloc_fd_object(void) list_init( &fd->inode_entry ); list_init( &fd->locks );
- if (!(fd->sync = create_event_sync( 1, 1 ))) goto error; + if (!(fd->sync = create_internal_sync( 1, 1 ))) goto error; if ((fd->poll_index = add_poll_user( fd )) == -1) goto error;
return fd; @@ -1767,7 +1767,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use list_init( &fd->inode_entry ); list_init( &fd->locks );
- if (!(fd->sync = create_event_sync( 1, 1 ))) + if (!(fd->sync = create_internal_sync( 1, 1 ))) { release_object( fd ); return NULL; diff --git a/server/object.h b/server/object.h index 203734a565f..0a7b5bf7c84 100644 --- a/server/object.h +++ b/server/object.h @@ -222,7 +222,7 @@ struct event_sync; struct event; struct keyed_event;
-extern struct event_sync *create_event_sync( int manual, int signaled ); +extern struct event_sync *create_internal_sync( int manual, int signaled ); extern void signal_sync( struct event_sync *sync ); extern void reset_sync( struct event_sync *sync );
diff --git a/server/process.c b/server/process.c index b9bc02b6469..48a1d2d697d 100644 --- a/server/process.c +++ b/server/process.c @@ -259,7 +259,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ job->completion_key = 0; job->parent = NULL;
- if (!(job->sync = create_event_sync( 1, 0 ))) + if (!(job->sync = create_internal_sync( 1, 0 ))) { release_object( job ); return NULL; @@ -722,7 +722,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla goto error; } if (!(process->msg_fd = create_anonymous_fd( &process_fd_ops, fd, &process->obj, 0 ))) goto error; - if (!(process->sync = create_event_sync( 1, 0 ))) goto error; + if (!(process->sync = create_internal_sync( 1, 0 ))) goto error;
/* create the handle table */ if (!parent) @@ -1222,7 +1222,7 @@ DECL_HANDLER(new_process) info->process = NULL; info->data = NULL;
- if (!(info->sync = create_event_sync( 1, 0 ))) + if (!(info->sync = create_internal_sync( 1, 0 ))) { close( socket_fd ); goto done; diff --git a/server/queue.c b/server/queue.c index 89e862d25a4..4ccecc5c26a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -323,7 +323,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ list_init( &queue->expired_timers ); for (i = 0; i < NB_MSG_KINDS; i++) list_init( &queue->msg_list[i] );
- if (!(queue->sync = create_event_sync( 1, 0 ))) goto error; + if (!(queue->sync = create_internal_sync( 1, 0 ))) goto error; if (!(queue->shared = alloc_shared_object())) goto error;
SHARED_WRITE_BEGIN( queue->shared, queue_shm_t ) diff --git a/server/thread.c b/server/thread.c index 853aff4cc84..8bd1e0cff3b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -487,7 +487,7 @@ static struct context *create_thread_context( struct thread *thread ) memset( &context->regs, 0, sizeof(context->regs) ); context->regs[CTX_NATIVE].machine = native_machine;
- if (!(context->sync = create_event_sync( 1, 0 ))) + if (!(context->sync = create_internal_sync( 1, 0 ))) { release_object( context ); return NULL; @@ -560,7 +560,7 @@ struct thread *create_thread( int fd, struct process *process, const struct secu return NULL; } if (!(thread->request_fd = create_anonymous_fd( &thread_fd_ops, fd, &thread->obj, 0 ))) goto error; - if (!(thread->sync = create_event_sync( 1, 0 ))) goto error; + if (!(thread->sync = create_internal_sync( 1, 0 ))) goto error; if (get_inproc_device_fd() >= 0 && !(thread->alert_sync = create_inproc_internal_sync( 1, 0 ))) goto error;
if (process->desktop) @@ -734,7 +734,7 @@ static struct thread_apc *create_apc( struct object *owner, const union apc_call apc->result.type = APC_NONE; if (owner) grab_object( owner );
- if (!(apc->sync = create_event_sync( 1, 0 ))) + if (!(apc->sync = create_internal_sync( 1, 0 ))) { release_object( apc ); return NULL; diff --git a/server/timer.c b/server/timer.c index 522fc6a7113..e8811594cac 100644 --- a/server/timer.c +++ b/server/timer.c @@ -113,7 +113,7 @@ static struct timer *create_timer( struct object *root, const struct unicode_str timer->timeout = NULL; timer->thread = NULL;
- if (!(timer->sync = create_event_sync( manual, 0 ))) + if (!(timer->sync = create_internal_sync( manual, 0 ))) { release_object( timer ); return NULL;