diff --git a/server/event.c b/server/event.c
index 77d036b934d..db4a7a04fef 100644
--- a/server/event.c
+++ b/server/event.c
@@ -61,7 +61,7 @@ static struct event *create_event( const WCHAR *name, size_t len,
 
 struct event *get_event_obj( struct process *process, int handle, unsigned int access )
 {
-    return (struct event *)get_handle_obj( current->process, handle, access, &event_ops );
+    return (struct event *)get_handle_obj( process, handle, access, &event_ops );
 }
 
 void pulse_event( struct event *event )
diff --git a/server/file.c b/server/file.c
index 4ae1f7d05d5..5369c24c145 100644
--- a/server/file.c
+++ b/server/file.c
@@ -371,11 +371,9 @@ void file_set_error(void)
     }
 }
 
-struct file *get_file_obj( struct process *process, int handle,
-                           unsigned int access )
+struct file *get_file_obj( struct process *process, int handle, unsigned int access )
 {
-    return (struct file *)get_handle_obj( current->process, handle,
-                                          access, &file_ops );
+    return (struct file *)get_handle_obj( process, handle, access, &file_ops );
 }
 
 int file_get_mmap_fd( struct file *file )