[PATCH v3 0/6] MR1148: ntdll: Mark created files beginning with a dot as not hidden.

[Torge Matthies (＠tmatthies)]

Also unifies hidden file handling.

Fixes bug [53826](https://bugs.winehq.org/show_bug.cgi?id=53826).

--
  v3: ntdll: Ensure that attributes are kept the same when renaming a file.
      ntdll: Set xattr in NtCreateFile if inferred and requested attributes don't match.
      ntdll: Only infer hidden attribute from file name if xattr is not present.
      ntdll: Consistently handle dot files in file functions.
      ntdll: Do not open-code hidden file handling in get_dir_data_entry.
      ntdll/tests: Add test for file attributes of files with names beginning with a dot.

https://gitlab.winehq.org/wine/wine/-/merge_requests/1148

[PATCH v3 1/6] ntdll/tests: Add test for file attributes of files with names beginning with a dot.

[Torge Matthies]

From: Torge Matthies

---
 dlls/ntdll/tests/file.c | 79 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 98d9e6b3b0a..67847ed0273 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -3971,6 +3971,84 @@ static void test_file_attribute_tag_information(void)
     CloseHandle( h );
 }

+#define lok ok_(__FILE__, line)
+#define rename_file(h,f) rename_file_(__LINE__,(h),(f))
+static BOOL rename_file_( int line, HANDLE h, const WCHAR *filename )
+{
+    FILE_RENAME_INFORMATION *fri;
+    UNICODE_STRING ntpath;
+    IO_STATUS_BLOCK io;
+    NTSTATUS status;
+    BOOLEAN ret;
+
+    ret = pRtlDosPathNameToNtPathName_U( filename, &ntpath, NULL, NULL );
+    lok( ret, "RtlDosPathNameToNtPathName_U failed\n" );
+    if (!ret) return FALSE;
+
+    fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + ntpath.Length );
+    lok( fri != NULL, "HeapAlloc failed\n" );
+    if (!fri) return FALSE;
+    fri->ReplaceIfExists = TRUE;
+    fri->RootDirectory = NULL;
+    fri->FileNameLength = ntpath.Length;
+    memcpy( fri->FileName, ntpath.Buffer, ntpath.Length );
+    pRtlFreeUnicodeString( &ntpath );
+
+    status = pNtSetInformationFile( h, &io, fri, sizeof(*fri), FileRenameInformation );
+    lok( status == STATUS_SUCCESS, "got %#lx\n", status );
+    return status == STATUS_SUCCESS;
+}
+#undef lok
+
+static void test_dotfile_file_attributes(void)
+{
+    char temppath[MAX_PATH], filename[MAX_PATH];
+    WCHAR temppathW[MAX_PATH], filenameW[MAX_PATH];
+    FILE_BASIC_INFORMATION info = {};
+    IO_STATUS_BLOCK io;
+    NTSTATUS status;
+    DWORD attrs;
+    HANDLE h;
+
+    GetTempPathA( MAX_PATH, temppath );
+    GetTempFileNameA( temppath, ".foo", 0, filename );
+    h = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0 );
+    ok( h != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
+    if (h == INVALID_HANDLE_VALUE) return;
+
+    status = nt_get_file_attrs(filename, &attrs);
+    ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+    todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+
+    status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation );
+    ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+    ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+
+    CloseHandle( h );
+
+    GetTempPathW( MAX_PATH, temppathW );
+    GetTempFileNameW( temppathW, L"foo", 0, filenameW );
+    h = CreateFileW( filenameW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0 );
+    ok( h != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
+    if (h == INVALID_HANDLE_VALUE) return;
+
+    GetTempFileNameW( temppathW, L".foo", 0, filenameW );
+    if (!rename_file( h, filenameW )) return;
+
+    status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation );
+    ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+    ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+
+    GetTempFileNameW( temppathW, L"foo", 0, filenameW );
+    if (!rename_file( h, filenameW )) return;
+
+    status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation );
+    ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+    ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+
+    CloseHandle( h );
+}
+
 static void test_file_mode(void)
 {
     UNICODE_STRING file_name, pipe_dev_name, mountmgr_dev_name, mailslot_dev_name;
@@ -5419,6 +5497,7 @@ START_TEST(file)
     test_file_id_information();
     test_file_access_information();
     test_file_attribute_tag_information();
+    test_dotfile_file_attributes();
     test_file_mode();
     test_file_readonly_access();
     test_query_volume_information_file();

[PATCH v3 2/6] ntdll: Do not open-code hidden file handling in get_dir_data_entry.

[Torge Matthies]

From: Torge Matthies

Signed-off-by: Torge Matthies 
---
 dlls/ntdll/unix/file.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 6b73d9dc7e8..09667b47f66 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -1281,7 +1281,7 @@ static BOOL is_hidden_file( const UNICODE_STRING *name )
     end = p = name->Buffer + name->Length/sizeof(WCHAR);
     while (p > name->Buffer && p[-1] == '\') p--;
     while (p > name->Buffer && p[-1] != '\') p--;
-    return (p < end && *p == '.');
+    return (p < end && p + 1 != end && p[0] == '.' && p[1] != '\' && (p[1] != '.' || (p + 2 != end && p[2] != '\')));
 }

@@ -2202,6 +2202,7 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I
     union file_directory_info *info;
     struct stat st;
     ULONG name_len, start, dir_size, attributes;
+    UNICODE_STRING name;

if (get_file_info( names->unix_name, &st, &attributes ) == -1)
     {
@@ -2231,8 +2232,8 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I
     {
         if (st.st_dev != dir_data->id.dev) st.st_ino = 0;  /* ignore inode if on a different device */

-        if (!show_dot_files && names->long_name[0] == '.' && names->long_name[1] &&
-            (names->long_name[1] != '.' || names->long_name[2]))
+        RtlInitUnicodeString( &name, names->long_name );
+        if (is_hidden_file( &name ))
             attributes |= FILE_ATTRIBUTE_HIDDEN;

fill_file_info( &st, attributes, info, class );

[PATCH v3 3/6] ntdll: Consistently handle dot files in file functions.

[Torge Matthies]

From: Torge Matthies

Signed-off-by: Torge Matthies 
---
 dlls/ntdll/tests/file.c |  4 +-
 dlls/ntdll/unix/file.c  | 97 ++++++++++++++++++++++++-----------------
 2 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 67847ed0273..778cd92dcb7 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -4022,7 +4022,7 @@ static void test_dotfile_file_attributes(void)

status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation );
     ok( status == STATUS_SUCCESS, "got %#lx\n", status );
-    ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+    todo_wine ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );

CloseHandle( h );

@@ -4037,7 +4037,7 @@ static void test_dotfile_file_attributes(void)

status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation );
     ok( status == STATUS_SUCCESS, "got %#lx\n", status );
-    ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+    todo_wine ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );

GetTempFileNameW( temppathW, L"foo", 0, filenameW );
     if (!rename_file( h, filenameW )) return;
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 09667b47f66..aa9623a9e71 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -1268,20 +1268,20 @@ static BOOLEAN get_dir_case_sensitivity( const char *dir )

/***********************************************************************
- *           is_hidden_file
+ *           is_hidden_file_unix
  *
- * Check if the specified file should be hidden based on its name and the show dot files option.
+ * Check if the specified file should be hidden based on its unix path and the show dot files option.
  */
-static BOOL is_hidden_file( const UNICODE_STRING *name )
+static BOOL is_hidden_file_unix( const char *name )
 {
-    WCHAR *p, *end;
+    const char *p, *end;

if (show_dot_files) return FALSE;

-    end = p = name->Buffer + name->Length/sizeof(WCHAR);
-    while (p > name->Buffer && p[-1] == '\') p--;
-    while (p > name->Buffer && p[-1] != '\') p--;
-    return (p < end && p + 1 != end && p[0] == '.' && p[1] != '\' && (p[1] != '.' || (p + 2 != end && p[2] != '\')));
+    end = p = name + strlen(name);
+    while (p > name && p[-1] == '/') p--;
+    while (p > name && p[-1] != '/') p--;
+    return (p < end && p + 1 != end && p[0] == '.' && p[1] != '/' && (p[1] != '.' || (p + 2 != end && p[2] != '/')));
 }

@@ -1549,7 +1549,7 @@ static BOOL fd_is_mount_point( int fd, const 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;
@@ -1562,6 +1562,9 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON
     if ((options & FILE_OPEN_REPARSE_POINT) && fd_is_mount_point( fd, st ))
         *attr |= FILE_ATTRIBUTE_REPARSE_POINT;

+    if (unix_name && is_hidden_file_unix( unix_name ))
+        *attr |= FILE_ATTRIBUTE_HIDDEN;
+
     attr_len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 );
     if (attr_len != -1)
         *attr |= parse_samba_dos_attrib_data( attr_data, attr_len );
@@ -1655,6 +1658,9 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
     }
     *attr |= get_file_attributes( st );

+    if (is_hidden_file_unix( path ))
+        *attr |= FILE_ATTRIBUTE_HIDDEN;
+
     attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 );
     if (attr_len != -1)
         *attr |= parse_samba_dos_attrib_data( attr_data, attr_len );
@@ -2202,7 +2208,6 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I
     union file_directory_info *info;
     struct stat st;
     ULONG name_len, start, dir_size, attributes;
-    UNICODE_STRING name;

if (get_file_info( names->unix_name, &st, &attributes ) == -1)
     {
@@ -2231,11 +2236,6 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I
     if (class != FileNamesInformation)
     {
         if (st.st_dev != dir_data->id.dev) st.st_ino = 0;  /* ignore inode if on a different device */
-
-        RtlInitUnicodeString( &name, names->long_name );
-        if (is_hidden_file( &name ))
-            attributes |= FILE_ATTRIBUTE_HIDDEN;
-
         fill_file_info( &st, attributes, info, class );
     }

@@ -4192,7 +4192,6 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
             info->AllocationSize = std.AllocationSize;
             info->EndOfFile      = std.EndOfFile;
             info->FileAttributes = basic.FileAttributes;
-            if (is_hidden_file( attr->ObjectName )) info->FileAttributes |= FILE_ATTRIBUTE_HIDDEN;
         }
         free( unix_name );
     }
@@ -4223,10 +4222,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC
         else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode))
             status = STATUS_INVALID_INFO_CLASS;
         else
-        {
             status = fill_file_info( &st, attributes, info, FileBasicInformation );
-            if (is_hidden_file( attr->ObjectName )) info->FileAttributes |= FILE_ATTRIBUTE_HIDDEN;
-        }
         free( unix_name );
     }
     else WARN( "%s not found (%x)\n", debugstr_us(attr->ObjectName), status );
@@ -4335,18 +4331,26 @@ 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;

-            if (fd_get_file_info( fd, options, &st, &attr ) == -1) status = errno_to_status( errno );
+            if (fd_get_file_info( fd, NULL, options, &st, &attr ) == -1) status = errno_to_status( errno );
             else
             {
                 fill_file_info( &st, attr, info, class );
@@ -4363,7 +4367,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
         }
         break;
     case FileInternalInformation:
-        if (fd_get_file_info( fd, options, &st, &attr ) == -1) status = errno_to_status( errno );
+        if (fd_get_file_info( fd, NULL, options, &st, &attr ) == -1) status = errno_to_status( errno );
         else fill_file_info( &st, attr, ptr, class );
         break;
     case FileEaInformation:
@@ -4373,7 +4377,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
         }
         break;
     case FileEndOfFileInformation:
-        if (fd_get_file_info( fd, options, &st, &attr ) == -1) status = errno_to_status( errno );
+        if (fd_get_file_info( fd, NULL, options, &st, &attr ) == -1) status = errno_to_status( errno );
         else fill_file_info( &st, attr, ptr, class );
         break;
     case FileAllInformation:
@@ -4381,10 +4385,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 +4404,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:
@@ -4489,7 +4496,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
         }
         break;
     case FileIdInformation:
-        if (fd_get_file_info( fd, options, &st, &attr ) == -1) status = errno_to_status( errno );
+        if (fd_get_file_info( fd, NULL, options, &st, &attr ) == -1) status = errno_to_status( errno );
         else
         {
             struct mountmgr_unix_drive drive;
@@ -4503,16 +4510,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;

[PATCH v3 4/6] ntdll: Only infer hidden attribute from file name if xattr is not present.

[Torge Matthies]

From: Torge Matthies

Signed-off-by: Torge Matthies 
---
 dlls/ntdll/unix/file.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index aa9623a9e71..821604253da 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -1562,14 +1562,13 @@ static int fd_get_file_info( int fd, const char *unix_name, unsigned int options
     if ((options & FILE_OPEN_REPARSE_POINT) && fd_is_mount_point( fd, st ))
         *attr |= FILE_ATTRIBUTE_REPARSE_POINT;

-    if (unix_name && is_hidden_file_unix( unix_name ))
-        *attr |= FILE_ATTRIBUTE_HIDDEN;
-
     attr_len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 );
     if (attr_len != -1)
         *attr |= parse_samba_dos_attrib_data( attr_data, attr_len );
     else
     {
+        if (unix_name && is_hidden_file_unix( unix_name ))
+            *attr |= FILE_ATTRIBUTE_HIDDEN;
         if (errno == ENOTSUP) return ret;
 #ifdef ENODATA
         if (errno == ENODATA) return ret;
@@ -1658,14 +1657,13 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
     }
     *attr |= get_file_attributes( st );

-    if (is_hidden_file_unix( path ))
-        *attr |= FILE_ATTRIBUTE_HIDDEN;
-
     attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 );
     if (attr_len != -1)
         *attr |= parse_samba_dos_attrib_data( attr_data, attr_len );
     else
     {
+        if (is_hidden_file_unix( path ))
+            *attr |= FILE_ATTRIBUTE_HIDDEN;
         if (errno == ENOTSUP) return ret;
 #ifdef ENODATA
         if (errno == ENODATA) return ret;

[PATCH v3 5/6] ntdll: Set xattr in NtCreateFile if inferred and requested attributes don't match.

[Torge Matthies]

From: Torge Matthies

And make sure it doesn't get deleted.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53826
Signed-off-by: Torge Matthies 
---
 dlls/ntdll/tests/file.c |  4 ++--
 dlls/ntdll/unix/file.c  | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 778cd92dcb7..baea510b79b 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -4018,11 +4018,11 @@ static void test_dotfile_file_attributes(void)

status = nt_get_file_attrs(filename, &attrs);
     ok( status == STATUS_SUCCESS, "got %#lx\n", status );
-    todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+    ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );

status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation );
     ok( status == STATUS_SUCCESS, "got %#lx\n", status );
-    todo_wine ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+    ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );

CloseHandle( h );

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 821604253da..9c792ef885a 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -1580,11 +1580,11 @@ static int fd_get_file_info( int fd, const char *unix_name, unsigned int options
 }

-static int fd_set_dos_attrib( int fd, ULONG attr )
+static int fd_set_dos_attrib( int fd, ULONG attr, BOOL force_set )
 {
     /* we only store the HIDDEN and SYSTEM attributes */
     attr &= XATTR_ATTRIBS_MASK;
-    if (attr != 0)
+    if (force_set || attr != 0)
     {
         /* encode the attributes in Samba 3 ASCII format. Samba 4 has extended
          * this format with more features, but retains compatibility with the
@@ -1598,7 +1598,7 @@ static int fd_set_dos_attrib( int fd, ULONG attr )

/* set the stat info and file attributes for a file (by file descriptor) */
-NTSTATUS fd_set_file_info( int fd, ULONG attr )
+NTSTATUS fd_set_file_info( int fd, ULONG attr, BOOL force_set_xattr )
 {
     struct stat st;

@@ -1617,7 +1617,7 @@ NTSTATUS fd_set_file_info( int fd, ULONG attr )
     }
     if (fchmod( fd, st.st_mode ) == -1) return errno_to_status( errno );

-    if (fd_set_dos_attrib( fd, attr ) == -1 && errno != ENOTSUP)
+    if (fd_set_dos_attrib( fd, attr, force_set_xattr || st.st_nlink > 1 ) == -1 && errno != ENOTSUP)
         WARN( "Failed to set extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n",
               errno, strerror( errno ) );

@@ -3943,6 +3943,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU
     OBJECT_ATTRIBUTES new_attr;
     UNICODE_STRING nt_name;
     char *unix_name;
+    BOOL name_hidden = FALSE;
     BOOL created = FALSE;
     NTSTATUS status;

@@ -3985,6 +3986,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU

if (status == STATUS_SUCCESS)
     {
+        name_hidden = is_hidden_file_unix(unix_name);
         status = open_unix_file( handle, unix_name, access, &new_attr, attributes,
                                  sharing, disposition, options, ea_buffer, ea_length );
         free( unix_name );
@@ -4012,14 +4014,15 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU
             break;
         }

-        if (io->Information == FILE_CREATED && (attributes & XATTR_ATTRIBS_MASK))
+        if (io->Information == FILE_CREATED &&
+            ((attributes & XATTR_ATTRIBS_MASK) || name_hidden))
         {
             int fd, needs_close;

/* set any DOS extended attributes */
             if (!server_get_unix_fd( *handle, 0, &fd, &needs_close, NULL, NULL ))
             {
-                if (fd_set_dos_attrib( fd, attributes ) == -1 && errno != ENOTSUP)
+                if (fd_set_dos_attrib( fd, attributes, TRUE ) == -1 && errno != ENOTSUP)
                     WARN( "Failed to set extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)",
                           errno, strerror( errno ) );
                 if (needs_close) close( fd );
@@ -4555,10 +4558,14 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
         {
             const FILE_BASIC_INFORMATION *info = ptr;
             LARGE_INTEGER mtime, atime;
+            char *unix_name;

if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
                 return io->u.Status = status;

+            if ((status = server_get_unix_name( handle, &unix_name )))
+                unix_name = NULL;
+
             mtime.QuadPart = info->LastWriteTime.QuadPart == -1 ? 0 : info->LastWriteTime.QuadPart;
             atime.QuadPart = info->LastAccessTime.QuadPart == -1 ? 0 : info->LastAccessTime.QuadPart;

@@ -4566,9 +4573,13 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
                 status = set_file_times( fd, &mtime, &atime );

if (status == STATUS_SUCCESS && info->FileAttributes)
-                status = fd_set_file_info( fd, info->FileAttributes );
+            {
+                BOOL force_xattr = unix_name && is_hidden_file_unix( unix_name );
+                status = fd_set_file_info( fd, info->FileAttributes, force_xattr );
+            }

if (needs_close) close( fd );
+            free( unix_name );
         }
         else status = STATUS_INVALID_PARAMETER_3;
         break;

[PATCH v3 6/6] ntdll: Ensure that attributes are kept the same when renaming a file.

[Torge Matthies]

From: Torge Matthies

Signed-off-by: Torge Matthies 
---
 dlls/ntdll/tests/file.c |  2 +-
 dlls/ntdll/unix/file.c  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index baea510b79b..f85a74acae4 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -4037,7 +4037,7 @@ static void test_dotfile_file_attributes(void)

status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation );
     ok( status == STATUS_SUCCESS, "got %#lx\n", status );
-    todo_wine ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );
+    ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes );

GetTempFileNameW( temppathW, L"foo", 0, filenameW );
     if (!rename_file( h, filenameW )) return;
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 9c792ef885a..3da06f6ad6c 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -4540,6 +4540,33 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
 }

+static NTSTATUS refresh_file_attrs( HANDLE handle, BOOL force_set_xattr )
+{
+    unsigned int options;
+    BOOL needs_close;
+    NTSTATUS status;
+    char *unix_name;
+    struct stat st;
+    ULONG attrib;
+    int fd;
+
+    if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, &options )))
+        return status;
+    if (server_get_unix_name( handle, &unix_name ))
+        unix_name = NULL;
+
+    if (fd_get_file_info( fd, unix_name, options, &st, &attrib ) == -1)
+        status = errno_to_status( errno );
+    else
+        status = fd_set_file_info( fd, attrib, force_set_xattr );
+
+    free( unix_name );
+    if (needs_close)
+        close( fd );
+    return status;
+}
+
+
 /******************************************************************************
  *              NtSetInformationFile   (NTDLL.@)
  */
@@ -4769,6 +4796,9 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
             status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF );
             if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE)
             {
+                if (is_hidden_file_unix( unix_name ) && (status = refresh_file_attrs( handle, TRUE )))
+                    goto free_unix_name;
+
                 SERVER_START_REQ( set_fd_name_info )
                 {
                     req->handle   = wine_server_obj_handle( handle );
@@ -4782,6 +4812,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
                 }
                 SERVER_END_REQ;

+            free_unix_name:
                 free( unix_name );
             }
             free( redir.Buffer );

[PATCH v3 6/6] ntdll: Ensure that attributes are kept the same when renaming a file.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=125391

Your paranoid android.

=== w7u_2qxl (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w7u_adm (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w7u_el (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w8 (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w8adm (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w864 (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064v1507 (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064v1809 (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064 (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064_tsign (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w10pro64 (32 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w864 (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064v1507 (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064v1809 (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064 (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064_2qxl (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064_adm (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w1064_tsign (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w10pro64 (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w10pro64_en_AE_u8 (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w10pro64_ar (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w10pro64_ja (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== w10pro64_zh_CN (64 bit report) ===

ntdll:
file.c:4036: Test failed: got 0xc000000d

=== debian11 (32 bit report) ===

d3d9:
device.c:6067: Test failed: Failed to create a D3D object.

[Torge Matthies (＠tmatthies)]

On Tue Oct 25 08:17:12 2022 +0000, Jinoh Kang wrote:
> I have yet to look thorougly through the patchset, so ignore me if I'm
> suggesting something that does not apply.
> Suppose there is a file that 1) has no DOSATTRIB xattr and 2) the name
> of which does not start with a dot. If the Win32 app prepends a dot to
> its name, the file shall not still be hidden. Same goes for the
> opposite. Is this correct?

Thanks, you are correct, that was missing in my code. The version that I just pushed should handle that case.