Move event objects into directory name space.
Vitaliy Margolen
wine-patch at kievinfo.com
Thu Dec 1 11:14:19 CST 2005
ChangeLog:
Move event objects into directory name space.
dlls/kernel/sync.c | 4 ++--
dlls/ntdll/sync.c | 2 ++
server/console.c | 2 +-
server/event.c | 22 +++++++++++++++++-----
server/named_pipe.c | 2 +-
server/object.h | 4 ++--
server/process.c | 2 +-
server/protocol.def | 2 ++
8 files changed, 28 insertions(+), 12 deletions(-)
-------------- next part --------------
357398084d7c3f1b4e5c6abd41ea1583a2f49fde
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 2ae9508..8ccc651 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -463,7 +463,7 @@ HANDLE WINAPI CreateEventW( SECURITY_ATT
}
attr.Length = sizeof(attr);
- attr.RootDirectory = 0;
+ attr.RootDirectory = get_BaseNamedObjects_handle();
attr.ObjectName = NULL;
attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF |
((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0);
@@ -524,7 +524,7 @@ HANDLE WINAPI OpenEventW( DWORD access,
if (!is_version_nt()) access = EVENT_ALL_ACCESS;
attr.Length = sizeof(attr);
- attr.RootDirectory = 0;
+ attr.RootDirectory = get_BaseNamedObjects_handle();
attr.ObjectName = NULL;
attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0);
attr.SecurityDescriptor = NULL;
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 7ed7060..3132fdb 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -177,6 +177,7 @@ NTSTATUS WINAPI NtCreateEvent(
{
req->access = DesiredAccess;
req->attributes = (attr) ? attr->Attributes : 0;
+ req->rootdir = (attr) ? attr->RootDirectory : 0;
req->manual_reset = ManualReset;
req->initial_state = InitialState;
if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len );
@@ -205,6 +206,7 @@ NTSTATUS WINAPI NtOpenEvent(
{
req->access = DesiredAccess;
req->attributes = (attr) ? attr->Attributes : 0;
+ req->rootdir = (attr) ? attr->RootDirectory : 0;
if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len );
ret = wine_server_call( req );
*EventHandle = reply->handle;
diff --git a/server/console.c b/server/console.c
index d13c7de..e567d60 100644
--- a/server/console.c
+++ b/server/console.c
@@ -233,7 +233,7 @@ static struct object *create_console_inp
console_input->history_index = 0;
console_input->history_mode = 0;
console_input->edition_mode = 0;
- console_input->event = create_event( NULL, 0, 1, 0 );
+ console_input->event = create_event( NULL, NULL, 0, 1, 0 );
if (!console_input->history || !console_input->evt)
{
diff --git a/server/event.c b/server/event.c
index bd73b88..8443837 100644
--- a/server/event.c
+++ b/server/event.c
@@ -63,12 +63,12 @@ static const struct object_ops event_ops
};
-struct event *create_event( const struct unicode_str *name, unsigned int attr,
- int manual_reset, int initial_state )
+struct event *create_event( struct directory *root, const struct unicode_str *name,
+ unsigned int attr, int manual_reset, int initial_state )
{
struct event *event;
- if ((event = create_named_object( sync_namespace, &event_ops, name, attr )))
+ if ((event = create_named_object_dir( root, name, attr, &event_ops )))
{
if (get_error() != STATUS_OBJECT_NAME_EXISTS)
{
@@ -150,24 +150,36 @@ DECL_HANDLER(create_event)
{
struct event *event;
struct unicode_str name;
+ struct directory *root = NULL;
reply->handle = 0;
get_req_unicode_str( &name );
- if ((event = create_event( &name, req->attributes, req->manual_reset, req->initial_state )))
+ if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 )))
+ return;
+
+ if ((event = create_event( root, &name, req->attributes, req->manual_reset, req->initial_state )))
{
reply->handle = alloc_handle( current->process, event, req->access,
req->attributes & OBJ_INHERIT );
release_object( event );
}
+
+ if (root) release_object( root );
}
/* open a handle to an event */
DECL_HANDLER(open_event)
{
struct unicode_str name;
+ struct directory *root = NULL;
get_req_unicode_str( &name );
- reply->handle = open_object( sync_namespace, &name, &event_ops, req->access, req->attributes );
+ if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 )))
+ return;
+
+ reply->handle = open_object_dir( root, &name, req->attributes, &event_ops, req->access );
+
+ if (root) release_object( root );
}
/* do an event operation */
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 37eaf2c..0aa5733 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -402,7 +402,7 @@ static int pipe_server_flush( struct fd
/* this kind of sux -
there's no unix way to be alerted when a pipe becomes empty */
- server->event = create_event( NULL, 0, 0, 0 );
+ server->event = create_event( NULL, NULL, 0, 0, 0 );
if (!server->event)
return 0;
gettimeofday( &tv, NULL );
diff --git a/server/object.h b/server/object.h
index c30c137..d138729 100644
--- a/server/object.h
+++ b/server/object.h
@@ -129,8 +129,8 @@ extern void dump_objects(void);
struct event;
-extern struct event *create_event( const struct unicode_str *name, unsigned int attr,
- int manual_reset, int initial_state );
+extern struct event *create_event( struct directory *root, const struct unicode_str *name,
+ unsigned int attr, int manual_reset, int initial_state );
extern struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access );
extern void pulse_event( struct event *event );
extern void set_event( struct event *event );
diff --git a/server/process.c b/server/process.c
index fab6761..6e65da5 100644
--- a/server/process.c
+++ b/server/process.c
@@ -997,7 +997,7 @@ DECL_HANDLER(init_process_done)
generate_startup_debug_events( process, req->entry );
set_process_startup_state( process, STARTUP_DONE );
- if (req->gui) process->idle_event = create_event( NULL, 0, 1, 0 );
+ if (req->gui) process->idle_event = create_event( NULL, NULL, 0, 1, 0 );
if (current->suspend + process->suspend > 0) stop_thread( current );
if (process->debugger) set_process_debug_flag( process, 1 );
}
diff --git a/server/protocol.def b/server/protocol.def
index 91256e5..afd57d6 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -496,6 +496,7 @@ enum apc_type { APC_NONE, APC_USER, APC_
@REQ(create_event)
unsigned int access; /* wanted access rights */
unsigned int attributes; /* object attributes */
+ obj_handle_t rootdir; /* root directory */
int manual_reset; /* manual reset event */
int initial_state; /* initial state of the event */
VARARG(name,unicode_str); /* object name */
@@ -515,6 +516,7 @@ enum event_op { PULSE_EVENT, SET_EVENT,
@REQ(open_event)
unsigned int access; /* wanted access rights */
unsigned int attributes; /* object attributes */
+ obj_handle_t rootdir; /* root directory */
VARARG(name,unicode_str); /* object name */
@REPLY
obj_handle_t handle; /* handle to the event */
More information about the wine-patches
mailing list