September 2020 - Wine-commits

Zebediah Figura : server: Remove the no longer used create_socket request.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 1c84ac61e6674e2951691d97f27d75f667b00c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c84ac61e6674e2951691d97… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 19 17:13:38 2020 -0500 server: Remove the no longer used create_socket request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 25 +------------------------ server/protocol.def | 13 ------------- server/request.h | 11 ----------- server/sock.c | 14 -------------- server/trace.c | 18 ------------------ 5 files changed, 1 insertion(+), 80 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2d4e016478..8e2ea08500 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1692,26 +1692,6 @@ struct unlock_file_reply -struct create_socket_request -{ - struct request_header __header; - unsigned int access; - unsigned int attributes; - int family; - int type; - int protocol; - unsigned int flags; - char __pad_36[4]; -}; -struct create_socket_reply -{ - struct reply_header __header; - obj_handle_t handle; - char __pad_12[4]; -}; - - - struct accept_socket_request { struct request_header __header; @@ -5500,7 +5480,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_create_socket, REQ_accept_socket, REQ_accept_into_socket, REQ_set_socket_event, @@ -5788,7 +5767,6 @@ union generic_request struct get_volume_info_request get_volume_info_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct create_socket_request create_socket_request; struct accept_socket_request accept_socket_request; struct accept_into_socket_request accept_into_socket_request; struct set_socket_event_request set_socket_event_request; @@ -6074,7 +6052,6 @@ union generic_reply struct get_volume_info_reply get_volume_info_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct create_socket_reply create_socket_reply; struct accept_socket_reply accept_socket_reply; struct accept_into_socket_reply accept_into_socket_reply; struct set_socket_event_reply set_socket_event_reply; @@ -6305,7 +6282,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 642 +#define SERVER_PROTOCOL_VERSION 643 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index fd9b721d69..94ae63fec5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1380,19 +1380,6 @@ enum server_fd_type @END -/* Create a socket */ -(a)REQ(create_socket) - unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ - int family; /* family, see socket manpage */ - int type; /* type, see socket manpage */ - int protocol; /* protocol, see socket manpage */ - unsigned int flags; /* socket flags */ -(a)REPLY - obj_handle_t handle; /* handle to the new socket */ -(a)END - - /* Accept a socket */ @REQ(accept_socket) obj_handle_t lhandle; /* handle to the listening socket */ diff --git a/server/request.h b/server/request.h index 39f3ce7b2e..de82151698 100644 --- a/server/request.h +++ b/server/request.h @@ -173,7 +173,6 @@ DECL_HANDLER(get_file_info); DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(create_socket); DECL_HANDLER(accept_socket); DECL_HANDLER(accept_into_socket); DECL_HANDLER(set_socket_event); @@ -460,7 +459,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_volume_info, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_create_socket, (req_handler)req_accept_socket, (req_handler)req_accept_into_socket, (req_handler)req_set_socket_event, @@ -1052,15 +1050,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 ); C_ASSERT( sizeof(struct unlock_file_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct create_socket_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_socket_request, attributes) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_socket_request, family) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_socket_request, type) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_socket_request, protocol) == 28 ); -C_ASSERT( FIELD_OFFSET(struct create_socket_request, flags) == 32 ); -C_ASSERT( sizeof(struct create_socket_request) == 40 ); -C_ASSERT( FIELD_OFFSET(struct create_socket_reply, handle) == 8 ); -C_ASSERT( sizeof(struct create_socket_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct accept_socket_request, lhandle) == 12 ); C_ASSERT( FIELD_OFFSET(struct accept_socket_request, access) == 16 ); C_ASSERT( FIELD_OFFSET(struct accept_socket_request, attributes) == 20 ); diff --git a/server/sock.c b/server/sock.c index 7148702165..346d3758f3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1249,20 +1249,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, 0, NULL ); } -/* create a socket */ -DECL_HANDLER(create_socket) -{ - struct sock *sock; - - reply->handle = 0; - if ((sock = create_socket()) != NULL) - { - if (!init_socket( sock, req->family, req->type, req->protocol, req->flags )) - reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes ); - release_object( sock ); - } -} - /* accept a socket */ DECL_HANDLER(accept_socket) { diff --git a/server/trace.c b/server/trace.c index 707a952357..3aa6ecc1b7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1945,21 +1945,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_create_socket_request( const struct create_socket_request *req ) -{ - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", family=%d", req->family ); - fprintf( stderr, ", type=%d", req->type ); - fprintf( stderr, ", protocol=%d", req->protocol ); - fprintf( stderr, ", flags=%08x", req->flags ); -} - -static void dump_create_socket_reply( const struct create_socket_reply *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - static void dump_accept_socket_request( const struct accept_socket_request *req ) { fprintf( stderr, " lhandle=%04x", req->lhandle ); @@ -4479,7 +4464,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_create_socket_request, (dump_func)dump_accept_socket_request, (dump_func)dump_accept_into_socket_request, (dump_func)dump_set_socket_event_request, @@ -4763,7 +4747,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_reply, (dump_func)dump_lock_file_reply, NULL, - (dump_func)dump_create_socket_reply, (dump_func)dump_accept_socket_reply, NULL, NULL, @@ -5047,7 +5030,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "create_socket", "accept_socket", "accept_into_socket", "set_socket_event",

1 0

Nikolay Sivov : include: Add an entry for ProcessIoPriority.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 7e564c43043d6a68eb7a631b80219d59951ba2d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e564c43043d6a68eb7a631b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 22 13:24:18 2020 +0300 include: Add an entry for ProcessIoPriority. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- include/winternl.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b0371c615e..8996dd9144 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3685,7 +3685,7 @@ static void test_process_info(HANDLE hproc) case ProcessPriorityClass: case ProcessPriorityBoost: case ProcessLUIDDeviceMapsEnabled: - case 33 /* ProcessIoPriority */: + case ProcessIoPriority: case ProcessIoCounters: case ProcessVmCounters: case ProcessWow64Information: diff --git a/include/winternl.h b/include/winternl.h index e23a02b9b2..20b2a44ba2 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1153,6 +1153,7 @@ typedef enum _PROCESSINFOCLASS { ProcessDebugObjectHandle = 30, ProcessDebugFlags = 31, ProcessHandleTracing = 32, + ProcessIoPriority = 33, ProcessExecuteFlags = 34, ProcessTlsInformation = 35, ProcessCookie = 36,

1 0

Nikolay Sivov : kernel32/tests: Link to more functions directly.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: bce9cdcc9812a1a22bd744c64309ba83b4eb4e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bce9cdcc9812a1a22bd744c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 22 13:24:19 2020 +0300 kernel32/tests: Link to more functions directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 4 +- dlls/kernel32/tests/environ.c | 7 +-- dlls/kernel32/tests/file.c | 38 +++++---------- dlls/kernel32/tests/pipe.c | 12 ++--- dlls/kernel32/tests/process.c | 28 ++--------- dlls/kernel32/tests/timer.c | 25 ++-------- dlls/kernel32/tests/virtual.c | 28 ++++------- dlls/kernel32/tests/volume.c | 107 +++++++++++++----------------------------- 8 files changed, 71 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bce9cdcc9812a1a22bd7…

1 0

Nikolay Sivov : kernel32/tests: Add a test for PROC_THREAD_ATTRIBUTE_HANDLE_LIST.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 16832064254bb4a72f6895ee159d68c36f5a972c URL: https://source.winehq.org/git/wine.git/?a=commit;h=16832064254bb4a72f6895ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 22 13:24:20 2020 +0300 kernel32/tests: Add a test for PROC_THREAD_ATTRIBUTE_HANDLE_LIST. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 74 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 486363956b..a666434035 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3900,7 +3900,7 @@ static void test_ProcThreadAttributeList(void) * level 2: Process created by level 1 process with handle inheritance and level 0 * process parent substitute. * level 255: Process created by level 1 process during invalid parent handles testing. */ -void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) +static void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) { PROCESS_BASIC_INFORMATION pbi; char buffer[MAX_PATH + 64]; @@ -4081,10 +4081,68 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) } } +static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle2) +{ + char buffer[MAX_PATH + 64]; + HANDLE pipe[2]; + PROCESS_INFORMATION info; + STARTUPINFOEXA si; + SIZE_T size; + BOOL ret; + SECURITY_ATTRIBUTES sa; + + if (child) + { + DWORD flags; + + flags = 0; + ret = GetHandleInformation(handle1, &flags); + ok(ret, "Failed to get handle info, error %d.\n", GetLastError()); + ok(flags == HANDLE_FLAG_INHERIT, "Unexpected flags %#x.\n", flags); + CloseHandle(handle1); + + ret = GetHandleInformation(handle2, &flags); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Unexpected return value, error %d.\n", GetLastError()); + + return; + } + + ret = pInitializeProcThreadAttributeList(NULL, 1, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + memset(&si, 0, sizeof(si)); + si.StartupInfo.cb = sizeof(si.StartupInfo); + si.lpAttributeList = heap_alloc(size); + ret = pInitializeProcThreadAttributeList(si.lpAttributeList, 1, 0, &size); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + memset(&sa, 0, sizeof(sa)); + sa.nLength = sizeof(sa); + sa.bInheritHandle = TRUE; + + ret = CreatePipe(&pipe[0], &pipe[1], &sa, 1024); + ok(ret, "Failed to create a pipe.\n"); + + ret = pUpdateProcThreadAttribute(si.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_HANDLE_LIST, &pipe[0], + sizeof(pipe[0]), NULL, NULL); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + sprintf(buffer, "\"%s\" process handlelist %p %p", selfname, pipe[0], pipe[1]); + ret = CreateProcessA(NULL, buffer, NULL, NULL, TRUE, EXTENDED_STARTUPINFO_PRESENT, NULL, NULL, + (STARTUPINFOA *)&si, &info); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + wait_and_close_child_process(&info); + + CloseHandle(pipe[0]); + CloseHandle(pipe[1]); +} + START_TEST(process) { - HANDLE job; - HANDLE hproc; + HANDLE job, hproc, h, h2; BOOL b = init(); ok(b, "Basic init of CreateProcess test\n"); if (!b) return; @@ -4146,12 +4204,17 @@ START_TEST(process) } else if (!strcmp(myARGV[2], "parent") && myARGC >= 5) { - HANDLE h; - sscanf(myARGV[4], "%p", &h); test_parent_process_attribute(atoi(myARGV[3]), h); return; } + else if (!strcmp(myARGV[2], "handlelist") && myARGC >= 5) + { + sscanf(myARGV[3], "%p", &h); + sscanf(myARGV[4], "%p", &h2); + test_handle_list_attribute(TRUE, h, h2); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -4220,4 +4283,5 @@ START_TEST(process) test_BreakawayOk(job); CloseHandle(job); test_parent_process_attribute(0, NULL); + test_handle_list_attribute(FALSE, NULL, NULL); }

1 0

Nikolay Sivov : server: Implement inherited handles list.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: c58a10c16395c30e7793cde1f748febe0432a6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c58a10c16395c30e7793cde1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 22 13:24:21 2020 +0300 server: Implement inherited handles list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 - dlls/ntdll/unix/process.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 5 +++-- server/handle.c | 38 ++++++++++++++++++++++++++++++-------- server/handle.h | 3 ++- server/process.c | 24 ++++++++++++++++++++---- server/process.h | 3 ++- server/protocol.def | 2 ++ server/request.c | 2 +- server/request.h | 1 + server/trace.c | 2 ++ 11 files changed, 102 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c58a10c16395c30e7793…

1 0

Alexandre Julliard : server: Add an object operation to retrieve an object name.
by Alexandre Julliard 22 Sep '20

22 Sep '20

1 0

Alexandre Julliard : server: Return the device name for device files.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 5e9b1a3c6752e953baeaa10c13f1ef887ddfb471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e9b1a3c6752e953baeaa10c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 16:56:42 2020 +0200 server: Return the device name for device files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- server/device.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 61b1e401c5..c2285aef6f 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -511,7 +511,7 @@ static void test_object_info(void) status = NtQueryObject(device, ObjectNameInformation, buffer, sizeof(buffer), NULL); ok(!status, "got %#x\n", status); - todo_wine ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); status = NtQueryObject(device, ObjectTypeInformation, buffer, sizeof(buffer), NULL); diff --git a/server/device.c b/server/device.c index 4241f37e89..371943acee 100644 --- a/server/device.c +++ b/server/device.c @@ -184,6 +184,7 @@ struct device_file static void device_file_dump( struct object *obj, int verbose ); static struct fd *device_file_get_fd( struct object *obj ); +static WCHAR *device_file_get_full_name( struct object *obj, data_size_t *len ); static struct list *device_file_get_kernel_obj_list( struct object *obj ); static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void device_file_destroy( struct object *obj ); @@ -208,7 +209,7 @@ static const struct object_ops device_file_ops = default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_get_full_name, /* get_full_name */ + device_file_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -506,6 +507,12 @@ static struct fd *device_file_get_fd( struct object *obj ) return (struct fd *)grab_object( file->fd ); } +static WCHAR *device_file_get_full_name( struct object *obj, data_size_t *len ) +{ + struct device_file *file = (struct device_file *)obj; + return file->device->obj.ops->get_full_name( &file->device->obj, len ); +} + static struct list *device_file_get_kernel_obj_list( struct object *obj ) { struct device_file *file = (struct device_file *)obj;

1 0

Alexandre Julliard : server: Return the device name for mailslot files.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 7b79c8059dc61686fa3a9dfecdd9ebb34791b233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b79c8059dc61686fa3a9dfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 16:56:52 2020 +0200 server: Return the device name for mailslot files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- server/mailslot.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 916ac8cbe7..788fa0bca1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1433,7 +1433,7 @@ static void test_query_object(void) handle = CreateFileA( "\\\\.\\mailslot", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); - test_object_name( handle, L"\\Device\\Mailslot", TRUE ); + test_object_name( handle, L"\\Device\\Mailslot", FALSE ); test_object_type( handle, L"File" ); test_file_info( handle ); diff --git a/server/mailslot.c b/server/mailslot.c index fa1a0c2c15..9c58ed77a5 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -217,6 +217,7 @@ static const struct object_ops mailslot_device_ops = static void mailslot_device_file_dump( struct object *obj, int verbose ); static struct fd *mailslot_device_file_get_fd( struct object *obj ); +static WCHAR *mailslot_device_file_get_full_name( struct object *obj, data_size_t *len ); static void mailslot_device_file_destroy( struct object *obj ); static enum server_fd_type mailslot_device_file_get_fd_type( struct fd *fd ); @@ -234,7 +235,7 @@ static const struct object_ops mailslot_device_file_ops = default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_get_full_name, /* get_full_name */ + mailslot_device_file_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -462,6 +463,12 @@ static struct fd *mailslot_device_file_get_fd( struct object *obj ) return (struct fd *)grab_object( file->fd ); } +static WCHAR *mailslot_device_file_get_full_name( struct object *obj, data_size_t *len ) +{ + struct mailslot_device_file *file = (struct mailslot_device_file *)obj; + return file->device->obj.ops->get_full_name( &file->device->obj, len ); +} + static void mailslot_device_file_destroy( struct object *obj ) { struct mailslot_device_file *file = (struct mailslot_device_file*)obj;

1 0

Alexandre Julliard : server: Return the device name for named pipe files.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: bdb2fe0cad3b34bb6c5b70926cc848f0b9e9e60f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdb2fe0cad3b34bb6c5b7092… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 16:56:58 2020 +0200 server: Return the device name for named pipe files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 4 ++-- server/named_pipe.c | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 788fa0bca1..15f905330e 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1443,7 +1443,7 @@ static void test_query_object(void) 1, 1000, 1000, 1000, NULL ); ok( handle != INVALID_HANDLE_VALUE, "CreateNamedPipe failed err %u\n", GetLastError() ); - test_object_name( handle, L"\\Device\\NamedPipe\\test_pipe", TRUE ); + test_object_name( handle, L"\\Device\\NamedPipe\\test_pipe", FALSE ); test_object_type( handle, L"File" ); test_file_info( handle ); @@ -1460,7 +1460,7 @@ static void test_query_object(void) handle = CreateFileA( "\\\\.\\pipe", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); - test_object_name( handle, L"\\Device\\NamedPipe", TRUE ); + test_object_name( handle, L"\\Device\\NamedPipe", FALSE ); test_object_type( handle, L"File" ); test_file_info( handle ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 4f9890258b..1ac35cf118 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -141,6 +141,7 @@ 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 WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ); 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 ); @@ -167,7 +168,7 @@ static const struct object_ops pipe_server_ops = default_fd_map_access, /* map_access */ pipe_end_get_sd, /* get_sd */ pipe_end_set_sd, /* set_sd */ - no_get_full_name, /* get_full_name */ + pipe_end_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -210,7 +211,7 @@ static const struct object_ops pipe_client_ops = default_fd_map_access, /* map_access */ pipe_end_get_sd, /* get_sd */ pipe_end_set_sd, /* set_sd */ - no_get_full_name, /* get_full_name */ + pipe_end_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -269,6 +270,7 @@ static const struct object_ops named_pipe_device_ops = static void named_pipe_device_file_dump( struct object *obj, int verbose ); static struct fd *named_pipe_device_file_get_fd( struct object *obj ); +static WCHAR *named_pipe_device_file_get_full_name( struct object *obj, data_size_t *len ); static int named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static enum server_fd_type named_pipe_device_file_get_fd_type( struct fd *fd ); static void named_pipe_device_file_destroy( struct object *obj ); @@ -287,7 +289,7 @@ static const struct object_ops named_pipe_device_file_ops = default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_get_full_name, /* get_full_name */ + named_pipe_device_file_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -535,6 +537,12 @@ static struct fd *named_pipe_device_file_get_fd( struct object *obj ) return (struct fd *)grab_object( file->fd ); } +static WCHAR *named_pipe_device_file_get_full_name( struct object *obj, data_size_t *len ) +{ + struct named_pipe_device_file *file = (struct named_pipe_device_file *)obj; + return file->device->obj.ops->get_full_name( &file->device->obj, len ); +} + static enum server_fd_type named_pipe_device_file_get_fd_type( struct fd *fd ) { return FD_TYPE_DEVICE; @@ -704,6 +712,12 @@ static int pipe_end_set_sd( struct object *obj, const struct security_descriptor return 0; } +static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ) +{ + struct pipe_end *pipe_end = (struct pipe_end *) obj; + return pipe_end->pipe->obj.ops->get_full_name( &pipe_end->pipe->obj, len ); +} + static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ) { switch (info_class)

1 0

Alexandre Julliard : server: Implement object name information for registry keys.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 96dcee64307b63ed3c07d13832fee15c3dc21ff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96dcee64307b63ed3c07d138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 16:57:04 2020 +0200 server: Implement object name information for registry keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- server/registry.c | 51 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 15f905330e..d3b932bec1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1470,7 +1470,7 @@ static void test_query_object(void) status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status ); - test_object_name( handle, L"\\REGISTRY\\MACHINE", TRUE ); + test_object_name( handle, L"\\REGISTRY\\MACHINE", FALSE ); test_object_type( handle, L"Key" ); pNtClose( handle ); diff --git a/server/registry.c b/server/registry.c index f4386d9bfb..438ec6c6fc 100644 --- a/server/registry.c +++ b/server/registry.c @@ -148,6 +148,7 @@ static void key_dump( struct object *obj, int verbose ); static struct object_type *key_get_type( struct object *obj ); static unsigned int key_map_access( struct object *obj, unsigned int access ); static struct security_descriptor *key_get_sd( struct object *obj ); +static WCHAR *key_get_full_name( struct object *obj, data_size_t *len ); static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void key_destroy( struct object *obj ); @@ -165,7 +166,7 @@ static const struct object_ops key_ops = key_map_access, /* map_access */ key_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_get_full_name, /* get_full_name */ + key_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -394,6 +395,29 @@ static struct security_descriptor *key_get_sd( struct object *obj ) return key_default_sd; } +static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) +{ + static const WCHAR backslash = '\\'; + struct key *key = (struct key *) obj; + data_size_t len = sizeof(root_name) - sizeof(WCHAR); + char *ret; + + for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->namelen + sizeof(WCHAR); + if (!(ret = malloc( len ))) return NULL; + + *ret_len = len; + key = (struct key *)obj; + for (key = (struct key *)obj; key != root_key; key = key->parent) + { + memcpy( ret + len - key->namelen, key->name, key->namelen ); + dump_strW( (WCHAR *)(ret + len - key->namelen), key->namelen, stderr, "" ); + len -= key->namelen + sizeof(WCHAR); + memcpy( ret + len, &backslash, sizeof(WCHAR) ); + } + memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); + return (WCHAR *)ret; +} + /* close the notification associated with a handle */ static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { @@ -876,15 +900,13 @@ static struct key *create_key_recursive( struct key *key, const struct unicode_s } /* query information about a key or a subkey */ -static void enum_key( const struct key *key, int index, int info_class, - struct enum_key_reply *reply ) +static void enum_key( struct key *key, int index, int info_class, struct enum_key_reply *reply ) { - static const WCHAR backslash[] = { '\\' }; int i; data_size_t len, namelen, classlen; data_size_t max_subkey = 0, max_class = 0; data_size_t max_value = 0, max_data = 0; - const struct key *k; + WCHAR *fullname = NULL; char *data; if (index != -1) /* -1 means use the specified key directly */ @@ -903,11 +925,7 @@ static void enum_key( const struct key *key, int index, int info_class, switch(info_class) { case KeyNameInformation: - namelen = 0; - for (k = key; k != root_key; k = k->parent) - namelen += k->namelen + sizeof(backslash); - if (!namelen) return; - namelen += sizeof(root_name) - sizeof(backslash); + if (!(fullname = key->obj.ops->get_full_name( &key->obj, &namelen ))) return; /* fall through */ case KeyBasicInformation: classlen = 0; /* only return the name */ @@ -959,18 +977,8 @@ static void enum_key( const struct key *key, int index, int info_class, } else if (info_class == KeyNameInformation) { - data_size_t pos = namelen; reply->namelen = namelen; - for (k = key; k != root_key; k = k->parent) - { - pos -= k->namelen; - if (pos < len) memcpy( data + pos, k->name, - min( k->namelen, len - pos ) ); - pos -= sizeof(backslash); - if (pos < len) memcpy( data + pos, backslash, - min( sizeof(backslash), len - pos ) ); - } - memcpy( data, root_name, min( sizeof(root_name) - sizeof(backslash), len ) ); + memcpy( data, fullname, namelen ); } else { @@ -978,6 +986,7 @@ static void enum_key( const struct key *key, int index, int info_class, memcpy( data, key->name, len ); } } + free( fullname ); if (debug_level > 1) dump_operation( key, NULL, "Enum" ); }

1 0