[PATCH v7 05/10] ntdll: Pass file path into fd_get_file_info if available.

[Torge Matthies]

From: Torge Matthies

Signed-off-by: Torge Matthies 
---
 dlls/ntdll/unix/file.c | 57 ++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 42aa9c4811f..5306c862247 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -1556,7 +1556,7 @@ static int fd_get_file_stat( int fd, struct stat *st )

/* get the stat info and file attributes for a file (by file descriptor) */
-static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULONG *attr )
+static int fd_get_file_info( int fd, const char *unix_name, unsigned int options, struct stat *st, ULONG *attr )
 {
     char attr_data[65];
     int attr_len, ret;
@@ -4335,13 +4335,21 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
     switch (class)
     {
     case FileBasicInformation:
-        if (fd_get_file_info( fd, options, &st, &attr ) == -1)
-            status = errno_to_status( errno );
-        else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode))
-            status = STATUS_INVALID_INFO_CLASS;
-        else
-            fill_file_info( &st, attr, ptr, class );
-        break;
+        {
+            char *unix_name;
+
+            if (server_get_unix_name( handle, &unix_name ))
+                unix_name = NULL;
+
+            if (fd_get_file_info( fd, unix_name, options, &st, &attr ) == -1)
+                status = errno_to_status( errno );
+            else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode))
+                status = STATUS_INVALID_INFO_CLASS;
+            else
+                fill_file_info( &st, attr, ptr, class );
+            free( unix_name );
+            break;
+        }
     case FileStandardInformation:
         {
             FILE_STANDARD_INFORMATION *info = ptr;
@@ -4381,10 +4389,13 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
             FILE_ALL_INFORMATION *info = ptr;
             char *unix_name;

-            if (fd_get_file_info( fd, options, &st, &attr ) == -1) status = errno_to_status( errno );
+            status = server_get_unix_name( handle, &unix_name );
+            if (fd_get_file_info( fd, unix_name, options, &st, &attr ) == -1) status = errno_to_status( errno );
+            else if (status)
+                break;
             else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode))
                 status = STATUS_INVALID_INFO_CLASS;
-            else if (!(status = server_get_unix_name( handle, &unix_name )))
+            else
             {
                 LONG name_len = len - FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName);

@@ -4397,9 +4408,9 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
                 info->AlignmentInformation.AlignmentRequirement = 1;  /* FIXME */

status = fill_name_info( unix_name, &info->NameInformation, &name_len );
-                free( unix_name );
                 io->Information = FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + name_len;
             }
+            free( unix_name );
         }
         break;
     case FileMailslotQueryInformation:
@@ -4503,16 +4514,24 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
         }
         break;
     case FileAttributeTagInformation:
-        if (fd_get_file_info( fd, options, &st, &attr ) == -1) status = errno_to_status( errno );
-        else
         {
-            FILE_ATTRIBUTE_TAG_INFORMATION *info = ptr;
-            info->FileAttributes = attr;
-            info->ReparseTag = 0; /* FIXME */
-            if ((options & FILE_OPEN_REPARSE_POINT) && fd_is_mount_point( fd, &st ))
-                info->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT;
+            char *unix_name;
+
+            if (server_get_unix_name( handle, &unix_name ))
+                unix_name = NULL;
+
+            if (fd_get_file_info( fd, unix_name, options, &st, &attr ) == -1) status = errno_to_status( errno );
+            else
+            {
+                FILE_ATTRIBUTE_TAG_INFORMATION *info = ptr;
+                info->FileAttributes = attr;
+                info->ReparseTag = 0; /* FIXME */
+                if ((options & FILE_OPEN_REPARSE_POINT) && fd_is_mount_point( fd, &st ))
+                    info->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT;
+            }
+            free( unix_name );
+            break;
         }
-        break;
     default:
         FIXME("Unsupported class (%d)\n", class);
         status = STATUS_NOT_IMPLEMENTED;