diff --git a/patches/ntdll-DOS_Attributes/0008-ntdll-Always-store-SAMBA_XATTR_DOS_ATTRIB-when-path-.patch b/patches/ntdll-DOS_Attributes/0008-ntdll-Always-store-SAMBA_XATTR_DOS_ATTRIB-when-path-.patch deleted file mode 100644 index f87c79e8..00000000 --- a/patches/ntdll-DOS_Attributes/0008-ntdll-Always-store-SAMBA_XATTR_DOS_ATTRIB-when-path-.patch +++ /dev/null @@ -1,46 +0,0 @@ -From dd02380fff84cbef2a6df7b6f82b271e0e9d732f Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Thu, 14 Jan 2016 23:09:19 +0100 -Subject: [PATCH] ntdll: Always store SAMBA_XATTR_DOS_ATTRIB when path could be - interpreted as hidden. - ---- - dlls/ntdll/unix/file.c | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c -index c6b4928bd53..3bf82b1d45d 100644 ---- a/dlls/ntdll/unix/file.c -+++ b/dlls/ntdll/unix/file.c -@@ -1567,12 +1567,15 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) - free( parent_path ); - } - *attr |= get_file_attributes( st ); -- /* convert Unix-style hidden files to a DOS hidden file attribute */ -- if (is_hidden_file( path )) -- *attr |= FILE_ATTRIBUTE_HIDDEN; - /* retrieve any stored DOS attributes */ - len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, hexattr, sizeof(hexattr)-1 ); -- if (len == -1) return ret; -+ if (len == -1) -+ { -+ /* convert Unix-style hidden files to a DOS hidden file attribute */ -+ if (is_hidden_file( path )) -+ *attr |= FILE_ATTRIBUTE_HIDDEN; -+ return ret; -+ } - *attr |= get_file_xattr( hexattr, len ); - return ret; - } -@@ -3556,7 +3559,7 @@ NTSTATUS set_file_info( const char *path, ULONG attr ) - /* Note: unix mode already set when called this way */ - attr &= ~FILE_ATTRIBUTE_NORMAL; /* do not store everything, but keep everything Samba can use */ - len = sprintf( hexattr, "0x%x", attr ); -- if (attr != 0) -+ if (attr != 0 || is_hidden_file( path )) - xattr_set( path, SAMBA_XATTR_DOS_ATTRIB, hexattr, len ); - else - xattr_remove( path, SAMBA_XATTR_DOS_ATTRIB ); --- -2.27.0 - diff --git a/patches/ntdll-DOS_Attributes/definition b/patches/ntdll-DOS_Attributes/definition deleted file mode 100644 index 47cebc0a..00000000 --- a/patches/ntdll-DOS_Attributes/definition +++ /dev/null @@ -1,4 +0,0 @@ -Fixes: [9158] Support for DOS hidden/system file attributes -Fixes: [15679] cygwin symlinks not working in wine -# Hopefully in the process of upstreaming. -Disabled: true \ No newline at end of file