Alexandre Julliard : server: Return the device name for mailslot files.
Alexandre Julliard
julliard at winehq.org
Tue Sep 22 15:46:41 CDT 2020
Module: wine
Branch: master
Commit: 7b79c8059dc61686fa3a9dfecdd9ebb34791b233
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b79c8059dc61686fa3a9dfecdd9ebb34791b233
Author: Alexandre Julliard <julliard at 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 at 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;
More information about the wine-cvs
mailing list