commit e70848ed01496dc16ca92b51f15346b8423b64f0
author Rob Shearman <rob@codeweavers.com> Mon Feb 04 20:18:27 2008 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Feb 05 12:19:37 2008 +0100
tree 8113bde394c2f057bb73aa89ee54416d2409b87d
parent ffc251f5dd370113e7ac86f56ebea43976aa1741

ntdll: The FileMailslotSetInformation and FileCompletionInformation cases of NtSetInformationFile don't need the fd.

So don't do an extra server call to get the fd to avoid a performance
penalty and to make these cases work when an fd isn't available.

dlls/ntdll/file.c

diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 5a99616..843f3f0 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1578,9 +1578,6 @@
 
     TRACE("(%p,%p,%p,0x%08x,0x%08x)\n", handle, io, ptr, len, class);
 
-    if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
-        return io->u.Status;
-
     io->u.Status = STATUS_SUCCESS;
     switch (class)
     {
@@ -1590,6 +1587,9 @@
             struct stat st;
             const FILE_BASIC_INFORMATION *info = ptr;
 
+            if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
+                return io->u.Status;
+
             if (info->LastAccessTime.QuadPart || info->LastWriteTime.QuadPart)
             {
                 ULONGLONG sec, nsec;
@@ -1641,6 +1641,8 @@
                     if (fchmod( fd, st.st_mode ) == -1) io->u.Status = FILE_GetNtStatus();
                 }
             }
+
+            if (needs_close) close( fd );
         }
         else io->u.Status = STATUS_INVALID_PARAMETER_3;
         break;
@@ -1650,8 +1652,13 @@
         {
             const FILE_POSITION_INFORMATION *info = ptr;
 
+            if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
+                return io->u.Status;
+
             if (lseek( fd, info->CurrentByteOffset.QuadPart, SEEK_SET ) == (off_t)-1)
                 io->u.Status = FILE_GetNtStatus();
+
+            if (needs_close) close( fd );
         }
         else io->u.Status = STATUS_INVALID_PARAMETER_3;
         break;
@@ -1662,6 +1669,9 @@
             struct stat st;
             const FILE_END_OF_FILE_INFORMATION *info = ptr;
 
+            if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
+                return io->u.Status;
+
             /* first try normal truncate */
             if (ftruncate( fd, (off_t)info->EndOfFile.QuadPart ) != -1) break;
 
@@ -1676,6 +1686,8 @@
                     ftruncate( fd, (off_t)info->EndOfFile.QuadPart ) != -1) break;
             }
             io->u.Status = FILE_GetNtStatus();
+
+            if (needs_close) close( fd );
         }
         else io->u.Status = STATUS_INVALID_PARAMETER_3;
         break;
@@ -1717,7 +1729,6 @@
         io->u.Status = STATUS_NOT_IMPLEMENTED;
         break;
     }
-    if (needs_close) close( fd );
     io->Information = 0;
     return io->u.Status;
 }