Alexandre Julliard : server: Pass full object attributes in the create_mailslot request.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jan 18 11:09:02 CST 2016
Module: wine
Branch: master
Commit: 14825a7a558bb74a97071ce0547ce320fcf76642
URL: http://source.winehq.org/git/wine.git/?a=commit;h=14825a7a558bb74a97071ce0547ce320fcf76642
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jan 15 18:57:02 2016 +0900
server: Pass full object attributes in the create_mailslot request.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/file.c | 12 +++++++-----
include/wine/server_protocol.h | 8 +++-----
server/mailslot.c | 19 +++++++++++--------
server/protocol.def | 4 +---
server/request.h | 8 +++-----
server/trace.c | 4 +---
6 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 4cac2ca..d547591 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3627,6 +3627,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess,
{
LARGE_INTEGER timeout;
NTSTATUS ret;
+ data_size_t len;
+ struct object_attributes *objattr;
TRACE("%p %08x %p %p %08x %08x %08x %p\n",
pHandle, DesiredAccess, attr, IoStatusBlock,
@@ -3636,6 +3638,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess,
if (!attr) return STATUS_INVALID_PARAMETER;
if (!attr->ObjectName) return STATUS_OBJECT_PATH_SYNTAX_BAD;
+ if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;
+
/*
* For a NULL TimeOut pointer set the default timeout value
*/
@@ -3647,17 +3651,15 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess,
SERVER_START_REQ( create_mailslot )
{
req->access = DesiredAccess;
- req->attributes = attr->Attributes;
- req->rootdir = wine_server_obj_handle( attr->RootDirectory );
req->max_msgsize = MaxMessageSize;
req->read_timeout = timeout.QuadPart;
- wine_server_add_data( req, attr->ObjectName->Buffer,
- attr->ObjectName->Length );
+ wine_server_add_data( req, objattr, len );
ret = wine_server_call( req );
if( ret == STATUS_SUCCESS )
*pHandle = wine_server_ptr_handle( reply->handle );
}
SERVER_END_REQ;
-
+
+ RtlFreeHeap( GetProcessHeap(), 0, objattr );
return ret;
}
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index aba649e..e5b7506 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -4673,12 +4673,10 @@ struct create_mailslot_request
{
struct request_header __header;
unsigned int access;
- unsigned int attributes;
- obj_handle_t rootdir;
timeout_t read_timeout;
unsigned int max_msgsize;
- /* VARARG(name,unicode_str); */
- char __pad_36[4];
+ /* VARARG(objattr,object_attributes); */
+ char __pad_28[4];
};
struct create_mailslot_reply
{
@@ -6169,6 +6167,6 @@ union generic_reply
struct terminate_job_reply terminate_job_reply;
};
-#define SERVER_PROTOCOL_VERSION 495
+#define SERVER_PROTOCOL_VERSION 496
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/mailslot.c b/server/mailslot.c
index 97ea3f6..cb9510c 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
@@ -395,7 +395,8 @@ void create_mailslot_device( struct directory *root, const struct unicode_str *n
static struct mailslot *create_mailslot( struct directory *root,
const struct unicode_str *name, unsigned int attr,
- int max_msgsize, timeout_t read_timeout )
+ int max_msgsize, timeout_t read_timeout,
+ const struct security_descriptor *sd )
{
struct object *obj;
struct unicode_str new_name;
@@ -442,6 +443,8 @@ static struct mailslot *create_mailslot( struct directory *root,
mailslot->max_msgsize = max_msgsize;
mailslot->read_timeout = read_timeout;
list_init( &mailslot->writers );
+ if (sd) default_set_sd( &mailslot->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
+ DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION );
if (!socketpair( PF_UNIX, SOCK_DGRAM, 0, fds ))
{
@@ -508,16 +511,16 @@ DECL_HANDLER(create_mailslot)
struct mailslot *mailslot;
struct unicode_str name;
struct directory *root = NULL;
+ const struct security_descriptor *sd;
+ const struct object_attributes *objattr = get_req_object_attributes( &sd, &name );
- reply->handle = 0;
- get_req_unicode_str( &name );
- if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 )))
- return;
+ if (!objattr) return;
+ if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return;
- if ((mailslot = create_mailslot( root, &name, req->attributes, req->max_msgsize,
- req->read_timeout )))
+ if ((mailslot = create_mailslot( root, &name, objattr->attributes, req->max_msgsize,
+ req->read_timeout, sd )))
{
- reply->handle = alloc_handle( current->process, mailslot, req->access, req->attributes );
+ reply->handle = alloc_handle( current->process, mailslot, req->access, objattr->attributes );
release_object( mailslot );
}
diff --git a/server/protocol.def b/server/protocol.def
index 8250bed..72a63e4 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3277,11 +3277,9 @@ struct handle_info
/* Create a mailslot */
@REQ(create_mailslot)
unsigned int access; /* wanted access rights */
- unsigned int attributes; /* object attributes */
- obj_handle_t rootdir; /* root directory */
timeout_t read_timeout;
unsigned int max_msgsize;
- VARARG(name,unicode_str); /* mailslot name */
+ VARARG(objattr,object_attributes); /* object attributes */
@REPLY
obj_handle_t handle; /* handle to the mailslot */
@END
diff --git a/server/request.h b/server/request.h
index d9163a0..310bcf4 100644
--- a/server/request.h
+++ b/server/request.h
@@ -2082,11 +2082,9 @@ C_ASSERT( sizeof(struct get_system_handles_request) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_system_handles_reply, count) == 8 );
C_ASSERT( sizeof(struct get_system_handles_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, access) == 12 );
-C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, attributes) == 16 );
-C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, rootdir) == 20 );
-C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, read_timeout) == 24 );
-C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, max_msgsize) == 32 );
-C_ASSERT( sizeof(struct create_mailslot_request) == 40 );
+C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, read_timeout) == 16 );
+C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, max_msgsize) == 24 );
+C_ASSERT( sizeof(struct create_mailslot_request) == 32 );
C_ASSERT( FIELD_OFFSET(struct create_mailslot_reply, handle) == 8 );
C_ASSERT( sizeof(struct create_mailslot_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_mailslot_info_request, handle) == 12 );
diff --git a/server/trace.c b/server/trace.c
index 552e8c2..82f8342 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -3866,11 +3866,9 @@ static void dump_get_system_handles_reply( const struct get_system_handles_reply
static void dump_create_mailslot_request( const struct create_mailslot_request *req )
{
fprintf( stderr, " access=%08x", req->access );
- fprintf( stderr, ", attributes=%08x", req->attributes );
- fprintf( stderr, ", rootdir=%04x", req->rootdir );
dump_timeout( ", read_timeout=", &req->read_timeout );
fprintf( stderr, ", max_msgsize=%08x", req->max_msgsize );
- dump_varargs_unicode_str( ", name=", cur_size );
+ dump_varargs_object_attributes( ", objattr=", cur_size );
}
static void dump_create_mailslot_reply( const struct create_mailslot_reply *req )
More information about the wine-cvs
mailing list