wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b21a3240705fdaf9f70a0eb1d2ff4736efcd35c9.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-02-05 19:52:28 +01:00
parent f6e35db051
commit 750454d6f1
8 changed files with 324 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/server-Pipe_ObjectName/0001-server-Link-named-pipes-to-their-device.patch
View File

@@ -1,25 +0,0 @@
From 8ff87be88de81b45327a9fc0eeacbc357544be20 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 17 Aug 2015 01:10:10 +0200
Subject: server: Link named pipes to their device.
---
server/named_pipe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 53bec02..0ce3e59 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -743,7 +743,7 @@ static struct named_pipe *create_named_pipe( struct directory *root, const struc
else
{
struct named_pipe_device *dev = (struct named_pipe_device *)obj;
- if ((pipe = create_object( dev->pipes, &named_pipe_ops, &new_name, NULL )))
+ if ((pipe = create_object( dev->pipes, &named_pipe_ops, &new_name, &dev->obj )))
clear_error();
}
--
2.5.0

193
patches/server-Pipe_ObjectName/0001-server-Store-a-reference-to-the-parent-object-for-pi.patch Normal file
View File

@@ -0,0 +1,193 @@
From dea19bf17349a7c1c2398a44e15587dae8fbce44 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 17 Aug 2015 01:11:47 +0200
Subject: server: Store a reference to the parent object for pipe servers. (v2)
---
dlls/ntdll/tests/om.c | 3 ---
server/named_pipe.c | 45 +++++++++++++++++++++++++++++++++++++--------
server/object.c | 18 ++++++++++++------
3 files changed, 49 insertions(+), 17 deletions(-)
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index 3d0487c..84507de 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -1401,14 +1401,11 @@ static void test_query_object(void)
status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len );
ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status );
str = (UNICODE_STRING *)buffer;
- todo_wine
ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len );
str = (UNICODE_STRING *)buffer;
expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR);
- todo_wine
ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */
"unexpected len %u\n", len );
- todo_wine
ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_pipe") * sizeof(WCHAR),
"name too short %s\n", wine_dbgstr_w(str->Buffer) );
trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len );
diff --git a/server/named_pipe.c b/server/named_pipe.c
index ffa9e32..c92a117 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -148,6 +148,8 @@ static const struct object_ops named_pipe_ops =
/* server end functions */
static void pipe_server_dump( struct object *obj, int verbose );
static struct fd *pipe_server_get_fd( struct object *obj );
+static int pipe_server_link_name( struct object *obj, struct object_name *name, struct object *parent );
+static void pipe_server_unlink_name( struct object *obj, struct object_name *name );
static int pipe_server_close_handle( struct object *obj, struct process *process, obj_handle_t handle );
static void pipe_server_destroy( struct object *obj);
static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async, int blocking );
@@ -170,8 +172,8 @@ static const struct object_ops pipe_server_ops =
default_get_sd, /* get_sd */
default_set_sd, /* set_sd */
no_lookup_name, /* lookup_name */
- no_link_name, /* link_name */
- NULL, /* unlink_name */
+ pipe_server_link_name, /* link_name */
+ pipe_server_unlink_name, /* unlink_name */
no_open_file, /* open_file */
no_alloc_handle, /* alloc_handle */
pipe_server_close_handle, /* close_handle */
@@ -196,6 +198,8 @@ static const struct fd_ops pipe_server_fd_ops =
static void pipe_client_dump( struct object *obj, int verbose );
static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry );
static struct fd *pipe_client_get_fd( struct object *obj );
+static int pipe_client_link_name( struct object *obj, struct object_name *name, struct object *parent );
+static void pipe_client_unlink_name( struct object *obj, struct object_name *name );
static int pipe_client_close_handle( struct object *obj, struct process *process, obj_handle_t handle );
static void pipe_client_destroy( struct object *obj );
static obj_handle_t pipe_client_flush( struct fd *fd, const async_data_t *async, int blocking );
@@ -216,8 +220,8 @@ static const struct object_ops pipe_client_ops =
default_get_sd, /* get_sd */
default_set_sd, /* set_sd */
no_lookup_name, /* lookup_name */
- no_link_name, /* link_name */
- NULL, /* unlink_name */
+ pipe_client_link_name, /* link_name */
+ pipe_client_unlink_name, /* unlink_name */
no_open_file, /* open_file */
no_alloc_handle, /* alloc_handle */
pipe_client_close_handle, /* close_handle */
@@ -399,6 +403,17 @@ static void do_disconnect( struct pipe_server *server )
server->fd = NULL;
}
+static int pipe_server_link_name( struct object *obj, struct object_name *name, struct object *parent )
+{
+ assert( parent->ops == &named_pipe_ops );
+ name->parent = grab_object( parent );
+ return 1;
+}
+
+static void pipe_server_unlink_name( struct object *obj, struct object_name *name )
+{
+}
+
static int pipe_server_close_handle( struct object *obj, struct process *process, obj_handle_t handle )
{
#ifdef __linux__
@@ -442,6 +457,17 @@ static void pipe_server_destroy( struct object *obj)
release_object( server->pipe );
}
+static int pipe_client_link_name( struct object *obj, struct object_name *name, struct object *parent )
+{
+ assert( parent->ops == &named_pipe_ops );
+ name->parent = grab_object( parent );
+ return 1;
+}
+
+static void pipe_client_unlink_name( struct object *obj, struct object_name *name )
+{
+}
+
static int pipe_client_close_handle( struct object *obj, struct process *process, obj_handle_t handle )
{
#ifdef __linux__
@@ -768,9 +794,10 @@ static struct pipe_server *get_pipe_server_obj( struct process *process,
static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options,
unsigned int pipe_flags )
{
+ static const struct unicode_str str = { NULL, 0 };
struct pipe_server *server;
- server = alloc_object( &pipe_server_ops );
+ server = create_object( &pipe->obj, &pipe_server_ops, &str );
if (!server)
return NULL;
@@ -792,11 +819,13 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned
return server;
}
-static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags )
+static struct pipe_client *create_pipe_client( struct named_pipe *pipe, unsigned int flags,
+ unsigned int pipe_flags )
{
+ static const struct unicode_str str = { NULL, 0 };
struct pipe_client *client;
- client = alloc_object( &pipe_client_ops );
+ client = create_object( &pipe->obj, &pipe_client_ops, &str );
if (!client)
return NULL;
@@ -896,7 +925,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc
return NULL;
}
- if ((client = create_pipe_client( options, pipe->flags )))
+ if ((client = create_pipe_client( pipe, options, pipe->flags )))
{
type = ((pipe->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && is_messagemode_supported()) ?
SOCK_SEQPACKET : SOCK_STREAM;
diff --git a/server/object.c b/server/object.c
index d4217c0..ef99334 100644
--- a/server/object.c
+++ b/server/object.c
@@ -162,7 +162,7 @@ WCHAR *get_object_full_name( struct object *obj, data_size_t *ret_len )
while (ptr && ptr->name)
{
struct object_name *name = ptr->name;
- len += name->len + sizeof(WCHAR);
+ if (name->len) len += name->len + sizeof(WCHAR);
ptr = name->parent;
}
if (!len) return NULL;
@@ -172,9 +172,12 @@ WCHAR *get_object_full_name( struct object *obj, data_size_t *ret_len )
while (obj && obj->name)
{
struct object_name *name = obj->name;
- memcpy( ret + len - name->len, name->name, name->len );
- len -= name->len + sizeof(WCHAR);
- memcpy( ret + len, &backslash, sizeof(WCHAR) );
+ if (name->len)
+ {
+ memcpy( ret + len - name->len, name->name, name->len );
+ len -= name->len + sizeof(WCHAR);
+ memcpy( ret + len, &backslash, sizeof(WCHAR) );
+ }
obj = name->parent;
}
return (WCHAR *)ret;
@@ -269,8 +272,11 @@ static void dump_name( struct object *obj )
if (!name) return;
if (name->parent) dump_name( name->parent );
- fputs( "\\\\", stderr );
- dump_strW( name->name, name->len / sizeof(WCHAR), stderr, "[]" );
+ if (name->len)
+ {
+ fputs( "\\\\", stderr );
+ dump_strW( name->name, name->len / sizeof(WCHAR), stderr, "[]" );
+ }
}
/* dump the name of an object to stderr */
--
2.7.0

144
patches/server-Pipe_ObjectName/0002-server-Store-a-reference-to-the-parent-object-for-pi.patch
View File

@@ -1,144 +0,0 @@
From a584e5646fb07dc21a2748ffa37b7c6461ff67f0 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 17 Aug 2015 01:11:47 +0200
Subject: server: Store a reference to the parent object for pipe servers. (v2)
---
dlls/ntdll/tests/om.c | 3 ---
server/named_pipe.c | 11 +++++++----
server/object.c | 31 ++++++++++++++++++++++---------
3 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index b957128..1b50d92 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -1084,14 +1084,11 @@ static void test_query_object(void)
status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len );
ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status );
str = (UNICODE_STRING *)buffer;
- todo_wine
ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len );
str = (UNICODE_STRING *)buffer;
expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR);
- todo_wine
ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */
"unexpected len %u\n", len );
- todo_wine
ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_pipe") * sizeof(WCHAR),
"name too short %s\n", wine_dbgstr_w(str->Buffer) );
trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len );
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 49b3f62..36a5c78 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -765,9 +765,10 @@ static struct pipe_server *get_pipe_server_obj( struct process *process,
static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options,
unsigned int pipe_flags )
{
+ static const struct unicode_str str = { NULL, 0 };
struct pipe_server *server;
- server = alloc_object( &pipe_server_ops );
+ server = create_object( NULL, &pipe_server_ops, &str, &pipe->obj );
if (!server)
return NULL;
@@ -789,11 +790,13 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned
return server;
}
-static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags )
+static struct pipe_client *create_pipe_client( struct named_pipe *pipe, unsigned int flags,
+ unsigned int pipe_flags )
{
+ static const struct unicode_str str = { NULL, 0 };
struct pipe_client *client;
- client = alloc_object( &pipe_client_ops );
+ client = create_object( NULL, &pipe_client_ops, &str, &pipe->obj );
if (!client)
return NULL;
@@ -879,7 +882,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc
return NULL;
}
- if ((client = create_pipe_client( options, pipe->flags )))
+ if ((client = create_pipe_client( pipe, options, pipe->flags )))
{
type = ((pipe->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && is_messagemode_supported()) ?
SOCK_SEQPACKET : SOCK_STREAM;
diff --git a/server/object.c b/server/object.c
index a1b1184..fd24722 100644
--- a/server/object.c
+++ b/server/object.c
@@ -55,6 +55,7 @@ struct namespace
struct list names[1]; /* array of hash entry lists */
};
+static struct list dummy_namespace = LIST_INIT(dummy_namespace);
#ifdef DEBUG_OBJECTS
static struct list object_list = LIST_INIT(object_list);
@@ -157,9 +158,15 @@ static void free_name( struct object *obj )
static void set_object_name( struct namespace *namespace,
struct object *obj, struct object_name *ptr )
{
- int hash = get_name_hash( namespace, ptr->name, ptr->len );
-
- list_add_head( &namespace->names[hash], &ptr->entry );
+ if (namespace)
+ {
+ int hash = get_name_hash( namespace, ptr->name, ptr->len );
+ list_add_head( &namespace->names[hash], &ptr->entry );
+ }
+ else
+ {
+ list_add_tail( &dummy_namespace, &ptr->entry );
+ }
ptr->obj = obj;
obj->name = ptr;
}
@@ -184,7 +191,7 @@ WCHAR *get_object_full_name( struct object *obj, data_size_t *ret_len )
while (ptr && ptr->name)
{
struct object_name *name = ptr->name;
- len += name->len + sizeof(WCHAR);
+ if (name->len) len += name->len + sizeof(WCHAR);
ptr = name->parent;
}
if (!len) return NULL;
@@ -194,9 +201,12 @@ WCHAR *get_object_full_name( struct object *obj, data_size_t *ret_len )
while (obj && obj->name)
{
struct object_name *name = obj->name;
- memcpy( ret + len - name->len, name->name, name->len );
- len -= name->len + sizeof(WCHAR);
- memcpy( ret + len, &backslash, sizeof(WCHAR) );
+ if (name->len)
+ {
+ memcpy( ret + len - name->len, name->name, name->len );
+ len -= name->len + sizeof(WCHAR);
+ memcpy( ret + len, &backslash, sizeof(WCHAR) );
+ }
obj = name->parent;
}
return (WCHAR *)ret;
@@ -276,8 +286,11 @@ static void dump_name( struct object *obj )
if (!name) return;
if (name->parent) dump_name( name->parent );
- fputs( "\\\\", stderr );
- dump_strW( name->name, name->len / sizeof(WCHAR), stderr, "[]" );
+ if (name->len)
+ {
+ fputs( "\\\\", stderr );
+ dump_strW( name->name, name->len / sizeof(WCHAR), stderr, "[]" );
+ }
}
/* dump the name of an object to stderr */
--
2.6.4