Jacek Caban : server: Use requested options for device pseudo fd.

Alexandre Julliard julliard at winehq.org
Mon Oct 29 18:26:30 CDT 2018


Module: wine
Branch: master
Commit: f003ac5e62d984db0507506d5c0dc059505c328b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f003ac5e62d984db0507506d5c0dc059505c328b

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Oct 29 15:48:44 2018 +0100

server: Use requested options for device pseudo fd.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/tests/file.c | 2 +-
 server/device.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 076d6bf..e84324c 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -3578,7 +3578,7 @@ static void test_file_mode(void)
         { &mailslot_dev_name, 0, 0 },
         { &mailslot_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT, TRUE },
         { &mountmgr_dev_name, 0, 0 },
-        { &mountmgr_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT, TRUE }
+        { &mountmgr_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT }
     };
 
     static WCHAR pipe_devW[] = {'\\','?','?','\\','P','I','P','E','\\'};
diff --git a/server/device.c b/server/device.c
index 081fd2d..ac7d88f 100644
--- a/server/device.c
+++ b/server/device.c
@@ -358,7 +358,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access,
                             &mode, access, sharing, options );
         if (file->fd) set_fd_user( file->fd, &device_file_fd_ops, &file->obj );
     }
-    else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, 0 );
+    else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, options );
 
     if (!file->fd)
     {




More information about the wine-cvs mailing list