August 2018 - Wine-commits - list.winehq.org

Jacek Caban : server: Use common implementation for pipe client and server get_sd and set_sd.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: c0905e08da9c20219424732bfe1ae2c1daf1a70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0905e08da9c20219424732b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:10:55 2018 +0200 server: Use common implementation for pipe client and server get_sd and set_sd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 44 ++++++++++++++------------------------------ 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index e28628b..80037cb 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1831,7 +1831,7 @@ static void test_security_info(void) CloseHandle(server); /* SD is preserved after closing server object */ - test_group(client, local_sid, TRUE); + test_group(client, local_sid, FALSE); CloseHandle(client); server = server2; diff --git a/server/named_pipe.c b/server/named_pipe.c index ab71f36..9ad1630 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -147,6 +147,9 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static struct fd *pipe_end_get_fd( struct object *obj ); +static struct security_descriptor *pipe_end_get_sd( struct object *obj ); +static int pipe_end_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ); static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); @@ -155,9 +158,6 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); -static struct security_descriptor *pipe_server_get_sd( struct object *obj ); -static int pipe_server_set_sd( struct object *obj, const struct security_descriptor *sd, - unsigned int set_info ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ); @@ -174,8 +174,8 @@ static const struct object_ops pipe_server_ops = no_signal, /* signal */ pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ - pipe_server_get_sd, /* get_sd */ - pipe_server_set_sd, /* set_sd */ + pipe_end_get_sd, /* get_sd */ + pipe_end_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -201,9 +201,6 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); -static struct security_descriptor *pipe_client_get_sd( struct object *obj ); -static int pipe_client_set_sd( struct object *obj, const struct security_descriptor *sd, - unsigned int set_info ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class ); @@ -220,8 +217,8 @@ static const struct object_ops pipe_client_ops = no_signal, /* signal */ pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ - pipe_client_get_sd, /* get_sd */ - pipe_client_set_sd, /* set_sd */ + pipe_end_get_sd, /* get_sd */ + pipe_end_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -601,32 +598,19 @@ static void pipe_end_get_file_info( struct fd *fd, struct named_pipe *pipe, unsi } } -static struct security_descriptor *pipe_server_get_sd( struct object *obj ) +static struct security_descriptor *pipe_end_get_sd( struct object *obj ) { - struct pipe_server *server = (struct pipe_server *) obj; - return default_get_sd( &server->pipe->obj ); -} - -static struct security_descriptor *pipe_client_get_sd( struct object *obj ) -{ - struct pipe_client *client = (struct pipe_client *) obj; - if (client->server) return default_get_sd( &client->server->pipe->obj ); + struct pipe_end *pipe_end = (struct pipe_end *) obj; + if (pipe_end->pipe) return default_get_sd( &pipe_end->pipe->obj ); set_error( STATUS_PIPE_DISCONNECTED ); return NULL; } -static int pipe_server_set_sd( struct object *obj, const struct security_descriptor *sd, - unsigned int set_info ) +static int pipe_end_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) { - struct pipe_server *server = (struct pipe_server *) obj; - return default_set_sd( &server->pipe->obj, sd, set_info ); -} - -static int pipe_client_set_sd( struct object *obj, const struct security_descriptor *sd, - unsigned int set_info ) -{ - struct pipe_client *client = (struct pipe_client *) obj; - if (client->server) return default_set_sd( &client->server->pipe->obj, sd, set_info ); + struct pipe_end *pipe_end = (struct pipe_end *) obj; + if (pipe_end->pipe) return default_set_sd( &pipe_end->pipe->obj, sd, set_info ); set_error( STATUS_PIPE_DISCONNECTED ); return 0; }

1 0

Jacek Caban : server: Use common implementation for client and server get_file_info.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 6f6f6e59243ab7e0a7e5f170b8f53d5b0ae4c96f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f6f6e59243ab7e0a7e5f170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:11:08 2018 +0200 server: Use common implementation for client and server get_file_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 9ad1630..95c2442 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -155,12 +155,12 @@ static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t p static int pipe_end_flush( struct fd *fd, struct async *async ); static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); +static void pipe_end_get_file_info( struct fd *fd, unsigned int info_class ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); -static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ); static const struct object_ops pipe_server_ops = { @@ -192,7 +192,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_end_flush, /* flush */ - pipe_server_get_file_info, /* get_file_info */ + pipe_end_get_file_info, /* get_file_info */ pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ no_fd_queue_async, /* queue_async */ @@ -203,7 +203,6 @@ static const struct fd_ops pipe_server_fd_ops = static void pipe_client_dump( struct object *obj, int verbose ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); -static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class ); static const struct object_ops pipe_client_ops = { @@ -235,7 +234,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_end_flush, /* flush */ - pipe_client_get_file_info, /* get_file_info */ + pipe_end_get_file_info, /* get_file_info */ pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ no_fd_queue_async, /* queue_async */ @@ -556,8 +555,17 @@ static int pipe_end_flush( struct fd *fd, struct async *async ) return 1; } -static void pipe_end_get_file_info( struct fd *fd, struct named_pipe *pipe, unsigned int info_class ) +static void pipe_end_get_file_info( struct fd *fd, unsigned int info_class ) { + struct pipe_end *pipe_end = get_fd_user( fd ); + struct named_pipe *pipe = pipe_end->pipe; + + if (!pipe) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } + switch (info_class) { case FileNameInformation: @@ -615,19 +623,6 @@ static int pipe_end_set_sd( struct object *obj, const struct security_descriptor return 0; } -static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ) -{ - struct pipe_server *server = get_fd_user( fd ); - pipe_end_get_file_info( fd, server->pipe, info_class ); -} - -static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class ) -{ - struct pipe_client *client = get_fd_user( fd ); - if (client->server) pipe_end_get_file_info( fd, client->server->pipe, info_class ); - else set_error( STATUS_PIPE_DISCONNECTED ); -} - static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ) { switch (info_class)

1 0

Jacek Caban : server: Use pipe stored in pipe_end in get_named_pipe_info.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 3375ccba2f76a29908c144dcca73787d4d9c569b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3375ccba2f76a29908c144dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:11:22 2018 +0200 server: Use pipe stored in pipe_end in get_named_pipe_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 11 ----------- server/named_pipe.c | 40 ++++++++++++++++++---------------------- 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 80037cb..94db1a2 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1355,7 +1355,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) memset(&io, 0xcc, sizeof(io)); status = pNtQueryInformationFile(pipe, &io, &local_info, sizeof(local_info), FilePipeLocalInformation); if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); @@ -1370,7 +1369,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) status = pNtQueryInformationFile(pipe, &io, &pipe_info, sizeof(pipe_info), FilePipeInformation); if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "NtQueryInformationFile(FilePipeInformation) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); @@ -1555,7 +1553,6 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state) memset(&local_info, 0xcc, sizeof(local_info)); status = pNtQueryInformationFile(pipe, &iosb, &local_info, sizeof(local_info), FilePipeLocalInformation); if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); @@ -1566,23 +1563,18 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state) if (!status) { ok(local_info.NamedPipeType == 1, "NamedPipeType = %u\n", local_info.NamedPipeType); - todo_wine_if(!is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_DISCONNECTED_STATE)) ok(local_info.NamedPipeConfiguration == 1, "NamedPipeConfiguration = %u\n", local_info.NamedPipeConfiguration); - todo_wine_if(!is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_DISCONNECTED_STATE)) ok(local_info.MaximumInstances == 1, "MaximumInstances = %u\n", local_info.MaximumInstances); if (!is_server && state == FILE_PIPE_CLOSING_STATE) ok(local_info.CurrentInstances == 0 || broken(local_info.CurrentInstances == 1 /* winxp */), "CurrentInstances = %u\n", local_info.CurrentInstances); else - todo_wine_if(!is_server && state == FILE_PIPE_DISCONNECTED_STATE) ok(local_info.CurrentInstances == 1, "CurrentInstances = %u\n", local_info.CurrentInstances); - todo_wine_if(!is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_DISCONNECTED_STATE)) ok(local_info.InboundQuota == 100, "InboundQuota = %u\n", local_info.InboundQuota); ok(local_info.ReadDataAvailable == 0, "ReadDataAvailable = %u\n", local_info.ReadDataAvailable); - todo_wine_if(!is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_DISCONNECTED_STATE)) ok(local_info.OutboundQuota == 200, "OutboundQuota = %u\n", local_info.OutboundQuota); todo_wine ok(local_info.WriteQuotaAvailable == (is_server ? 200 : 100), "WriteQuotaAvailable = %u\n", @@ -1608,7 +1600,6 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state) &attr, &iosb, FILE_SHARE_WRITE, FILE_CREATE, 0, 0, 0, 0, 1, 100, 200, &timeout); if (!local_info.CurrentInstances) - todo_wine_if(status) /* FIXME */ ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile failed: %x\n", status); else ok(status == STATUS_INSTANCE_NOT_AVAILABLE, "NtCreateNamedPipeFile failed: %x\n", status); @@ -1625,7 +1616,6 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state) ok(local_info.CurrentInstances == 0 || broken(local_info.CurrentInstances == 1 /* winxp */), "CurrentInstances = %u\n", local_info.CurrentInstances); else - todo_wine_if(!is_server && state == FILE_PIPE_DISCONNECTED_STATE) ok(local_info.CurrentInstances == 1, "CurrentInstances = %u\n", local_info.CurrentInstances); } @@ -1633,7 +1623,6 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state) memset(&iosb, 0xcc, sizeof(iosb)); status = pNtQueryInformationFile(pipe, &iosb, &pipe_info, sizeof(pipe_info), FilePipeInformation); if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); diff --git a/server/named_pipe.c b/server/named_pipe.c index 95c2442..e6e497b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1354,39 +1354,35 @@ DECL_HANDLER(create_named_pipe) DECL_HANDLER(get_named_pipe_info) { - struct pipe_server *server; - struct pipe_client *client = NULL; + struct pipe_end *pipe_end; - server = get_pipe_server_obj( current->process, req->handle, FILE_READ_ATTRIBUTES ); - if (!server) + pipe_end = (struct pipe_end *)get_handle_obj( current->process, req->handle, + FILE_READ_ATTRIBUTES, &pipe_server_ops ); + if (!pipe_end) { if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) return; clear_error(); - client = (struct pipe_client *)get_handle_obj( current->process, req->handle, - 0, &pipe_client_ops ); - if (!client) return; - server = client->server; + pipe_end = (struct pipe_end *)get_handle_obj( current->process, req->handle, + 0, &pipe_client_ops ); + if (!pipe_end) return; } - reply->flags = client ? client->pipe_end.flags : server->pipe_end.flags; - if (server) + if (pipe_end->pipe) { - reply->sharing = server->pipe->sharing; - reply->maxinstances = server->pipe->maxinstances; - reply->instances = server->pipe->instances; - reply->insize = server->pipe->insize; - reply->outsize = server->pipe->outsize; + reply->flags = pipe_end->flags; + reply->sharing = pipe_end->pipe->sharing; + reply->maxinstances = pipe_end->pipe->maxinstances; + reply->instances = pipe_end->pipe->instances; + reply->insize = pipe_end->pipe->insize; + reply->outsize = pipe_end->pipe->outsize; + + if (pipe_end->obj.ops == &pipe_server_ops) reply->flags |= NAMED_PIPE_SERVER_END; } + else set_error( STATUS_PIPE_DISCONNECTED ); - if (client) - release_object(client); - else - { - reply->flags |= NAMED_PIPE_SERVER_END; - release_object(server); - } + release_object( pipe_end ); } DECL_HANDLER(set_named_pipe_info)

1 0

Jacek Caban : server: Use pipe stored in pipe_end in set_named_pipe_info.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 6498ea18d36e806ed80542df3d0501470080d7c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6498ea18d36e806ed80542df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:11:32 2018 +0200 server: Use pipe stored in pipe_end in set_named_pipe_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index e6e497b..7883a1d 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1075,14 +1075,6 @@ static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *as } } -static struct pipe_server *get_pipe_server_obj( struct process *process, - obj_handle_t handle, unsigned int access ) -{ - struct object *obj; - obj = get_handle_obj( process, handle, access, &pipe_server_ops ); - return (struct pipe_server *) obj; -} - static void init_pipe_end( struct pipe_end *pipe_end, struct named_pipe *pipe, unsigned int pipe_flags, data_size_t buffer_size ) { @@ -1387,42 +1379,30 @@ DECL_HANDLER(get_named_pipe_info) DECL_HANDLER(set_named_pipe_info) { - struct pipe_server *server; - struct pipe_client *client = NULL; + struct pipe_end *pipe_end; - server = get_pipe_server_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES ); - if (!server) + pipe_end = (struct pipe_end *)get_handle_obj( current->process, req->handle, + FILE_WRITE_ATTRIBUTES, &pipe_server_ops ); + if (!pipe_end) { if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) return; clear_error(); - client = (struct pipe_client *)get_handle_obj( current->process, req->handle, - 0, &pipe_client_ops ); - if (!client) return; - if (!(server = client->server)) - { - release_object( client ); - return; - } + pipe_end = (struct pipe_end *)get_handle_obj( current->process, req->handle, + 0, &pipe_client_ops ); + if (!pipe_end) return; } if ((req->flags & ~(NAMED_PIPE_MESSAGE_STREAM_READ | NAMED_PIPE_NONBLOCKING_MODE)) || - ((req->flags & NAMED_PIPE_MESSAGE_STREAM_READ) && !(server->pipe->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE))) + ((req->flags & NAMED_PIPE_MESSAGE_STREAM_READ) && !(pipe_end->pipe->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE))) { set_error( STATUS_INVALID_PARAMETER ); } - else if (client) - { - client->pipe_end.flags = server->pipe->flags | req->flags; - } else { - server->pipe_end.flags = server->pipe->flags | req->flags; + pipe_end->flags = pipe_end->pipe->flags | req->flags; } - if (client) - release_object(client); - else - release_object(server); + release_object( pipe_end ); }

1 0

Jacek Caban : server: Remove no longer needed pipe reference from pipe server object.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 0ae95951333eb4db90fcd2c9fc70dfd5a3e7d4a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ae95951333eb4db90fcd2c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:11:48 2018 +0200 server: Remove no longer needed pipe reference from pipe server object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 7883a1d..7828c77 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -83,7 +83,6 @@ struct pipe_server struct list entry; /* entry in named pipe servers list */ enum pipe_state state; /* server state */ struct pipe_client *client; /* client that this server is connected to */ - struct named_pipe *pipe; unsigned int options; /* pipe options */ }; @@ -307,7 +306,7 @@ static void pipe_server_dump( struct object *obj, int verbose ) { struct pipe_server *server = (struct pipe_server *) obj; assert( obj->ops == &pipe_server_ops ); - fprintf( stderr, "Named pipe server pipe=%p state=%d\n", server->pipe, server->state ); + fprintf( stderr, "Named pipe server pipe=%p state=%d\n", server->pipe_end.pipe, server->state ); } static void pipe_client_dump( struct object *obj, int verbose ) @@ -435,8 +434,6 @@ static void pipe_server_destroy( struct object *obj) server->client->server = NULL; server->client = NULL; } - - release_object( pipe ); } static void pipe_client_destroy( struct object *obj) @@ -1010,7 +1007,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); server->pipe_end.state = FILE_PIPE_LISTENING_STATE; set_server_state( server, ps_wait_open ); - async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); + async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); return 1; case ps_connected_server: @@ -1097,7 +1094,6 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned if (!server) return NULL; - server->pipe = pipe; server->client = NULL; server->options = options; init_pipe_end( &server->pipe_end, pipe, pipe_flags, pipe->insize ); @@ -1105,7 +1101,6 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->pipe_end.server_pid = get_process_id( current->process ); list_add_head( &pipe->servers, &server->entry ); - grab_object( pipe ); if (!(server->pipe_end.fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) { release_object( server ); @@ -1193,7 +1188,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } - pipe_sharing = server->pipe->sharing; + pipe_sharing = pipe->sharing; if (((access & GENERIC_READ) && !(pipe_sharing & FILE_SHARE_READ)) || ((access & GENERIC_WRITE) && !(pipe_sharing & FILE_SHARE_WRITE))) { @@ -1337,7 +1332,7 @@ DECL_HANDLER(create_named_pipe) if (server) { reply->handle = alloc_handle( current->process, server, req->access, objattr->attributes ); - server->pipe->instances++; + pipe->instances++; release_object( server ); }

1 0

Jacek Caban : server: Remove no longer needed client and server pointers.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 6098af824ba800f24e88d54b15e41c9d79ab7e96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6098af824ba800f24e88d54b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:12:01 2018 +0200 server: Remove no longer needed client and server pointers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 7828c77..76e38a9 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -82,14 +82,12 @@ struct pipe_server struct pipe_end pipe_end; /* common header for pipe_client and pipe_server */ struct list entry; /* entry in named pipe servers list */ enum pipe_state state; /* server state */ - struct pipe_client *client; /* client that this server is connected to */ unsigned int options; /* pipe options */ }; struct pipe_client { struct pipe_end pipe_end; /* common header for pipe_client and pipe_server */ - struct pipe_server *server; /* server that this client is connected to */ unsigned int flags; /* file flags */ }; @@ -313,7 +311,7 @@ static void pipe_client_dump( struct object *obj, int verbose ) { struct pipe_client *client = (struct pipe_client *) obj; assert( obj->ops == &pipe_client_ops ); - fprintf( stderr, "Named pipe client server=%p\n", client->server ); + fprintf( stderr, "Named pipe client server=%p\n", client->pipe_end.connection ); } static void named_pipe_destroy( struct object *obj) @@ -429,17 +427,12 @@ static void pipe_server_destroy( struct object *obj) pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); pipe_end_destroy( &server->pipe_end ); - if (server->client) - { - server->client->server = NULL; - server->client = NULL; - } } static void pipe_client_destroy( struct object *obj) { struct pipe_client *client = (struct pipe_client *)obj; - struct pipe_server *server = client->server; + struct pipe_server *server = (struct pipe_server *)client->pipe_end.connection; assert( obj->ops == &pipe_client_ops ); @@ -460,9 +453,6 @@ static void pipe_client_destroy( struct object *obj) case ps_wait_connect: assert( 0 ); } - assert( server->client ); - server->client = NULL; - client->server = NULL; } pipe_end_destroy( &client->pipe_end ); @@ -1026,19 +1016,17 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as switch(server->state) { case ps_connected_server: - assert( server->client ); + assert( server->pipe_end.connection ); /* dump the client connection - all data is lost */ release_object( server->pipe_end.connection->pipe ); server->pipe_end.connection->pipe = NULL; pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - server->client->server = NULL; - server->client = NULL; set_server_state( server, ps_wait_connect ); break; case ps_wait_disconnect: - assert( !server->client ); + assert( !server->pipe_end.connection ); pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); set_server_state( server, ps_wait_connect ); break; @@ -1094,7 +1082,6 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned if (!server) return NULL; - server->client = NULL; server->options = options; init_pipe_end( &server->pipe_end, pipe, pipe_flags, pipe->insize ); server->pipe_end.state = FILE_PIPE_LISTENING_STATE; @@ -1121,7 +1108,6 @@ static struct pipe_client *create_pipe_client( unsigned int flags, struct named_ if (!client) return NULL; - client->server = NULL; client->flags = flags; init_pipe_end( &client->pipe_end, pipe, pipe->flags, buffer_size ); client->pipe_end.state = FILE_PIPE_CONNECTED_STATE; @@ -1203,8 +1189,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); server->pipe_end.state = FILE_PIPE_CONNECTED_STATE; set_server_state( server, ps_connected_server ); - server->client = client; - client->server = server; server->pipe_end.connection = &client->pipe_end; client->pipe_end.connection = &server->pipe_end; server->pipe_end.client_pid = client->pipe_end.client_pid;

1 0

Józef Kucia : dxgi: Prefer vkGet*ProcAddr() for loading Vulkan functions.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: df84cb38429f545e3fb32787b73a02b1f530e8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df84cb38429f545e3fb32787… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 12:03:25 2018 +0200 dxgi: Prefer vkGet*ProcAddr() for loading Vulkan functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 241db3b..83e0f25 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -846,7 +846,6 @@ struct dxgi_vk_funcs PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; PFN_vkEndCommandBuffer p_vkEndCommandBuffer; PFN_vkFreeMemory p_vkFreeMemory; - PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr; PFN_vkGetImageMemoryRequirements p_vkGetImageMemoryRequirements; PFN_vkGetInstanceProcAddr p_vkGetInstanceProcAddr; PFN_vkGetPhysicalDeviceMemoryProperties p_vkGetPhysicalDeviceMemoryProperties; @@ -1640,19 +1639,7 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return FALSE; } - dxgi->p_vkCreateSwapchainKHR = vk->p_vkCreateSwapchainKHR; - dxgi->p_vkCreateWin32SurfaceKHR = vk->p_vkCreateWin32SurfaceKHR; - dxgi->p_vkDestroySurfaceKHR = vk->p_vkDestroySurfaceKHR; - dxgi->p_vkDestroySwapchainKHR = vk->p_vkDestroySwapchainKHR; - dxgi->p_vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vk->p_vkGetDeviceProcAddr; dxgi->p_vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vk->p_vkGetInstanceProcAddr; - dxgi->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = vk->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; - dxgi->p_vkGetPhysicalDeviceSurfaceFormatsKHR = vk->p_vkGetPhysicalDeviceSurfaceFormatsKHR; - dxgi->p_vkGetPhysicalDeviceSurfacePresentModesKHR = vk->p_vkGetPhysicalDeviceSurfacePresentModesKHR; - dxgi->p_vkGetPhysicalDeviceSurfaceSupportKHR = vk->p_vkGetPhysicalDeviceSurfaceSupportKHR; - dxgi->p_vkGetPhysicalDeviceWin32PresentationSupportKHR = vk->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; - dxgi->p_vkGetSwapchainImagesKHR = vk->p_vkGetSwapchainImagesKHR; - dxgi->p_vkQueuePresentKHR = vk->p_vkQueuePresentKHR; #define LOAD_INSTANCE_PFN(name) \ if (!(dxgi->p_##name = vk->p_vkGetInstanceProcAddr(vk_instance, #name))) \ @@ -1660,7 +1647,14 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk ERR("Failed to get instance proc "#name".\n"); \ return FALSE; \ } + LOAD_INSTANCE_PFN(vkCreateWin32SurfaceKHR) + LOAD_INSTANCE_PFN(vkDestroySurfaceKHR) LOAD_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfacePresentModesKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceWin32PresentationSupportKHR) #undef LOAD_INSTANCE_PFN #define LOAD_DEVICE_PFN(name) \ @@ -1680,13 +1674,17 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk LOAD_DEVICE_PFN(vkCreateFence) LOAD_DEVICE_PFN(vkCreateImage) LOAD_DEVICE_PFN(vkCreateSemaphore) + LOAD_DEVICE_PFN(vkCreateSwapchainKHR) LOAD_DEVICE_PFN(vkDestroyCommandPool) LOAD_DEVICE_PFN(vkDestroyFence) LOAD_DEVICE_PFN(vkDestroyImage) LOAD_DEVICE_PFN(vkDestroySemaphore) + LOAD_DEVICE_PFN(vkDestroySwapchainKHR) LOAD_DEVICE_PFN(vkEndCommandBuffer) LOAD_DEVICE_PFN(vkFreeMemory) LOAD_DEVICE_PFN(vkGetImageMemoryRequirements) + LOAD_DEVICE_PFN(vkGetSwapchainImagesKHR) + LOAD_DEVICE_PFN(vkQueuePresentKHR) LOAD_DEVICE_PFN(vkQueueSubmit) LOAD_DEVICE_PFN(vkQueueWaitIdle) LOAD_DEVICE_PFN(vkResetFences)

1 0

Zebediah Figura : setupapi: Remove a pointless cast.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: a3cedc1f3a2ca66c9ed15fe054413fb9566326c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3cedc1f3a2ca66c9ed15fe0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:21 2018 -0500 setupapi: Remove a pointless cast. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 4a852da..ea69dea 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3092,7 +3092,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfo *devInfo; - TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData, + TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); @@ -3155,7 +3155,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfo *devInfo; - TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData, + TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize);

1 0

Zebediah Figura : setupapi: Use a handle table to allocate device nodes.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: f840bcc6f7dfdfda507e4fc89d9ed2fdc6ca3a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f840bcc6f7dfdfda507e4fc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:22 2018 -0500 setupapi: Use a handle table to allocate device nodes. The size of DEVINST is DWORD, so using the pointer directly won't work on 64-bit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 108 +++++++++++++++++++++++++-------------- dlls/setupapi/setupapi_private.h | 5 ++ dlls/setupapi/tests/devinst.c | 22 ++++++++ 3 files changed, 96 insertions(+), 39 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ea69dea..8c63298 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -33,6 +33,7 @@ #include "winnls.h" #include "setupapi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "cfgmgr32.h" @@ -140,6 +141,52 @@ struct DeviceInfo struct list interfaces; }; +static struct DeviceInfo **devnode_table; +static unsigned int devnode_table_size; + +static DEVINST alloc_devnode(struct DeviceInfo *device) +{ + unsigned int i; + + for (i = 0; i < devnode_table_size; ++i) + { + if (!devnode_table[i]) + break; + } + + if (i == devnode_table_size) + { + if (devnode_table) + { + devnode_table_size *= 2; + devnode_table = heap_realloc_zero(devnode_table, + devnode_table_size * sizeof(*devnode_table)); + } + else + { + devnode_table_size = 256; + devnode_table = heap_alloc_zero(devnode_table_size * sizeof(*devnode_table)); + } + } + + devnode_table[i] = device; + return i; +} + +static void free_devnode(DEVINST devnode) +{ + devnode_table[devnode] = NULL; +} + +static struct DeviceInfo *get_devnode_device(DEVINST devnode) +{ + if (devnode < devnode_table_size) + return devnode_table[devnode]; + + WARN("device node %u not found\n", devnode); + return NULL; +} + static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) { static const WCHAR fmt[] = {'{','%','0','8','X','-','%','0','4','X','-', @@ -460,15 +507,12 @@ static HKEY SETUPDI_CreateDrvKey(struct DeviceInfo *devInfo) static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, DWORD devId, LPCWSTR instanceId, BOOL phantom) { - struct DeviceInfo *devInfo = NULL; - HANDLE devInst = GlobalAlloc(GMEM_FIXED, sizeof(struct DeviceInfo)); - if (devInst) - devInfo = GlobalLock(devInst); + struct DeviceInfo *devInfo = heap_alloc(sizeof(*devInfo)); if (devInfo) { devInfo->set = set; - devInfo->devId = (DWORD)devInst; + devInfo->devId = alloc_devnode(devInfo); devInfo->instanceId = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(instanceId) + 1) * sizeof(WCHAR)); @@ -486,12 +530,10 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, (LPBYTE)&phantom, sizeof(phantom)); } list_init(&devInfo->interfaces); - GlobalUnlock(devInst); } else { - GlobalUnlock(devInst); - GlobalFree(devInst); + heap_free(devInfo); devInfo = NULL; } } @@ -525,7 +567,8 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) SETUPDI_FreeInterfaceInstances(iface); HeapFree(GetProcessHeap(), 0, iface); } - GlobalFree((HANDLE)devInfo->devId); + free_devnode(devInfo->devId); + heap_free(devInfo); } /* Adds a device with GUID guid and identifier devInst to set. Allocates a @@ -3979,63 +4022,50 @@ BOOL WINAPI SetupDiDeleteDevRegKey( /*********************************************************************** * CM_Get_Device_IDA (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST dnDevInst, PSTR Buffer, - ULONG BufferLen, ULONG ulFlags) +CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST devnode, char *buffer, ULONG len, ULONG flags) { - struct DeviceInfo *devInfo = GlobalLock((HANDLE)dnDevInst); + struct DeviceInfo *device = get_devnode_device(devnode); - TRACE("%x->%p, %p, %u %u\n", dnDevInst, devInfo, Buffer, BufferLen, ulFlags); + TRACE("%u, %p, %u, %#x\n", devnode, buffer, len, flags); - if (!devInfo) + if (!device) return CR_NO_SUCH_DEVINST; - WideCharToMultiByte(CP_ACP, 0, devInfo->instanceId, -1, Buffer, BufferLen, 0, 0); - TRACE("Returning %s\n", debugstr_a(Buffer)); + WideCharToMultiByte(CP_ACP, 0, device->instanceId, -1, buffer, len, 0, 0); + TRACE("Returning %s\n", debugstr_a(buffer)); return CR_SUCCESS; } /*********************************************************************** * CM_Get_Device_IDW (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Get_Device_IDW( DEVINST dnDevInst, LPWSTR Buffer, - ULONG BufferLen, ULONG ulFlags) +CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST devnode, WCHAR *buffer, ULONG len, ULONG flags) { - struct DeviceInfo *devInfo = GlobalLock((HANDLE)dnDevInst); + struct DeviceInfo *device = get_devnode_device(devnode); - TRACE("%x->%p, %p, %u %u\n", dnDevInst, devInfo, Buffer, BufferLen, ulFlags); + TRACE("%u, %p, %u, %#x\n", devnode, buffer, len, flags); - if (!devInfo) - { - WARN("dev instance %d not found!\n", dnDevInst); + if (!device) return CR_NO_SUCH_DEVINST; - } - lstrcpynW(Buffer, devInfo->instanceId, BufferLen); - TRACE("Returning %s\n", debugstr_w(Buffer)); - GlobalUnlock((HANDLE)dnDevInst); + lstrcpynW(buffer, device->instanceId, len); + TRACE("Returning %s\n", debugstr_w(buffer)); return CR_SUCCESS; } - - /*********************************************************************** * CM_Get_Device_ID_Size (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG pulLen, DEVINST dnDevInst, - ULONG ulFlags) +CONFIGRET WINAPI CM_Get_Device_ID_Size(ULONG *len, DEVINST devnode, ULONG flags) { - struct DeviceInfo *ppdevInfo = GlobalLock((HANDLE)dnDevInst); + struct DeviceInfo *device = get_devnode_device(devnode); - TRACE("%x->%p, %p, %u\n", dnDevInst, ppdevInfo, pulLen, ulFlags); + TRACE("%p, %u, %#x\n", len, devnode, flags); - if (!ppdevInfo) - { - WARN("dev instance %d not found!\n", dnDevInst); + if (!device) return CR_NO_SUCH_DEVINST; - } - *pulLen = lstrlenW(ppdevInfo->instanceId); - GlobalUnlock((HANDLE)dnDevInst); + *len = lstrlenW(device->instanceId); return CR_SUCCESS; } diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 5cdedb6..1df96b1 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -45,6 +45,11 @@ extern HINSTANCE SETUPAPI_hInstance DECLSPEC_HIDDEN; +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline WCHAR *strdupW( const WCHAR *str ) { WCHAR *ret = NULL; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 420c65a..2bb8027 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "guiddef.h" #include "setupapi.h" +#include "cfgmgr32.h" #include "wine/test.h" @@ -1355,6 +1356,26 @@ static void testSetupDiGetINFClassA(void) } } +static void test_devnode(void) +{ + HDEVINFO set; + SP_DEVINFO_DATA device = { sizeof(SP_DEVINFO_DATA) }; + char buffer[50]; + DWORD ret; + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed: %#x\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, + NULL, 0, &device); + ok(ret, "SetupDiCreateDeviceInfo failed: %#x\n", GetLastError()); + + ret = CM_Get_Device_IDA(device.DevInst, buffer, sizeof(buffer), 0); + ok(!ret, "got %#x\n", ret); + ok(!strcmp(buffer, "ROOT\\LEGACY_BOGUS\\0000"), "got %s\n", buffer); + + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { HKEY hkey; @@ -1392,4 +1413,5 @@ START_TEST(devinst) testDeviceRegistryPropertyA(); testDeviceRegistryPropertyW(); testSetupDiGetINFClassA(); + test_devnode(); }

1 0

Zebediah Figura : setupapi: Add an internal helper for SetupDiSetDeviceRegistryProperty().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: b5b09649e6be0154154174b2641bca23a7216f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b09649e6be0154154174b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:23 2018 -0500 setupapi: Add an internal helper for SetupDiSetDeviceRegistryProperty(). This essentially follows the model used in MSI. The next patch makes use of this helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 111 ++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8c63298..1a4d4dd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -504,6 +504,50 @@ static HKEY SETUPDI_CreateDrvKey(struct DeviceInfo *devInfo) return key; } +struct PropertyMapEntry +{ + DWORD regType; + LPCSTR nameA; + LPCWSTR nameW; +}; + +static const struct PropertyMapEntry PropertyMap[] = { + { REG_SZ, "DeviceDesc", DeviceDesc }, + { REG_MULTI_SZ, "HardwareId", HardwareId }, + { REG_MULTI_SZ, "CompatibleIDs", CompatibleIDs }, + { 0, NULL, NULL }, /* SPDRP_UNUSED0 */ + { REG_SZ, "Service", Service }, + { 0, NULL, NULL }, /* SPDRP_UNUSED1 */ + { 0, NULL, NULL }, /* SPDRP_UNUSED2 */ + { REG_SZ, "Class", Class }, + { REG_SZ, "ClassGUID", ClassGUID }, + { REG_SZ, "Driver", Driver }, + { REG_DWORD, "ConfigFlags", ConfigFlags }, + { REG_SZ, "Mfg", Mfg }, + { REG_SZ, "FriendlyName", FriendlyName }, + { REG_SZ, "LocationInformation", LocationInformation }, + { 0, NULL, NULL }, /* SPDRP_PHYSICAL_DEVICE_OBJECT_NAME */ + { REG_DWORD, "Capabilities", Capabilities }, + { REG_DWORD, "UINumber", UINumber }, + { REG_MULTI_SZ, "UpperFilters", UpperFilters }, + { REG_MULTI_SZ, "LowerFilters", LowerFilters }, +}; + +static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct DeviceInfo *device, + DWORD prop, const BYTE *buffer, DWORD size) +{ + if (prop < ARRAY_SIZE(PropertyMap) && PropertyMap[prop].nameW) + { + LONG ret = RegSetValueExW(device->key, PropertyMap[prop].nameW, 0, + PropertyMap[prop].regType, buffer, size); + if (!ret) + return TRUE; + + SetLastError(ret); + } + return FALSE; +} + static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, DWORD devId, LPCWSTR instanceId, BOOL phantom) { @@ -3090,35 +3134,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( return ret; } -struct PropertyMapEntry -{ - DWORD regType; - LPCSTR nameA; - LPCWSTR nameW; -}; - -static const struct PropertyMapEntry PropertyMap[] = { - { REG_SZ, "DeviceDesc", DeviceDesc }, - { REG_MULTI_SZ, "HardwareId", HardwareId }, - { REG_MULTI_SZ, "CompatibleIDs", CompatibleIDs }, - { 0, NULL, NULL }, /* SPDRP_UNUSED0 */ - { REG_SZ, "Service", Service }, - { 0, NULL, NULL }, /* SPDRP_UNUSED1 */ - { 0, NULL, NULL }, /* SPDRP_UNUSED2 */ - { REG_SZ, "Class", Class }, - { REG_SZ, "ClassGUID", ClassGUID }, - { REG_SZ, "Driver", Driver }, - { REG_DWORD, "ConfigFlags", ConfigFlags }, - { REG_SZ, "Mfg", Mfg }, - { REG_SZ, "FriendlyName", FriendlyName }, - { REG_SZ, "LocationInformation", LocationInformation }, - { 0, NULL, NULL }, /* SPDRP_PHYSICAL_DEVICE_OBJECT_NAME */ - { REG_DWORD, "Capabilities", Capabilities }, - { REG_DWORD, "UINumber", UINumber }, - { REG_MULTI_SZ, "UpperFilters", UpperFilters }, - { REG_MULTI_SZ, "LowerFilters", LowerFilters }, -}; - /*********************************************************************** * SetupDiGetDeviceRegistryPropertyA (SETUPAPI.@) */ @@ -3296,21 +3311,15 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( /*********************************************************************** * SetupDiSetDeviceRegistryPropertyW (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - const BYTE *PropertyBuffer, - DWORD PropertyBufferSize) +BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, DWORD prop, const BYTE *buffer, DWORD size) { - BOOL ret = FALSE; - struct DeviceInfoSet *set = DeviceInfoSet; - struct DeviceInfo *devInfo; + struct DeviceInfoSet *set = devinfo; + struct DeviceInfo *device; - TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, - PropertyBuffer, PropertyBufferSize); + TRACE("%p %p %d %p %d\n", devinfo, device_data, prop, buffer, size); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) + if (!devinfo || devinfo == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3320,25 +3329,15 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) + if (!device_data || device_data->cbSize != sizeof(SP_DEVINFO_DATA) + || !device_data->Reserved) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) - && PropertyMap[Property].nameW) - { - LONG l = RegSetValueExW(devInfo->key, PropertyMap[Property].nameW, 0, - PropertyMap[Property].regType, PropertyBuffer, - PropertyBufferSize); - if (!l) - ret = TRUE; - else - SetLastError(l); - } - return ret; + + device = (struct DeviceInfo *)device_data->Reserved; + return SETUPDI_SetDeviceRegistryPropertyW(device, prop, buffer, size); } /***********************************************************************

1 0