commit 220312e993bb7000569ca6df7fdd32cc21b2ba00
author Andreas Mohr <amohr@codeweavers.com> Thu Oct 19 20:38:38 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 19 20:38:38 2000 +0000
tree 8b1f64cbfca93ab3c6a3f389838490eb27aff666
parent 044f028f0ed5996d7a7c55e4826b5ac3dfaeaa55

Skip directory symlinks in DOSFS_FindNextEx.

files/dos_fs.c

diff --git a/files/dos_fs.c b/files/dos_fs.c
index d4dd2c3..5c1da9a 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -1362,7 +1362,7 @@
  */
 static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATAA *entry )
 {
-    BYTE attr = info->attr | FA_UNUSED | FA_ARCHIVE | FA_RDONLY;
+    DWORD attr = info->attr | FA_UNUSED | FA_ARCHIVE | FA_RDONLY | FILE_ATTRIBUTE_SYMLINK;
     UINT flags = DRIVE_GetFlags( info->drive );
     char *p, buffer[MAX_PATHNAME_LEN];
     const char *drive_path;
@@ -1436,6 +1436,15 @@
             WARN("can't stat %s\n", buffer);
             continue;
         }
+        if ((fileinfo.dwFileAttributes & FILE_ATTRIBUTE_SYMLINK) &&
+            (fileinfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+        {
+            static int show_dir_symlinks = -1;
+            if (show_dir_symlinks == -1)
+                show_dir_symlinks = PROFILE_GetWineIniBool("wine", "ShowDirSymlinks", 0);
+            if (!show_dir_symlinks) continue;
+        }
+
         if (fileinfo.dwFileAttributes & ~attr) continue;
 
         /* We now have a matching entry; fill the result and return */