Reinhard Karcher : ntdll: Fix NtQueryDirectoryFile handling of short names on vfat filesystems.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a736ac3f3e00a2355e634de1418df4da485aa015
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a736ac3f3e00a2355e634de141...

Author: Reinhard Karcher 
Date:   Sat Dec 30 09:36:06 2006 +0100

ntdll: Fix NtQueryDirectoryFile handling of short names on vfat filesystems.

---

dlls/ntdll/directory.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 3786b91..c0933bc 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -1513,13 +1513,13 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HA

if ((cwd = open(".", O_RDONLY)) != -1 && fchdir( fd ) != -1)
     {
-        if (mask && !mempbrkW( mask->Buffer, wszWildcards, mask->Length / sizeof(WCHAR) ) &&
-            read_directory_stat( fd, io, buffer, length, single_entry, mask, restart_scan ) != -1)
-            goto done;
 #ifdef VFAT_IOCTL_READDIR_BOTH
         if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1)
             goto done;
 #endif
+        if (mask && !mempbrkW( mask->Buffer, wszWildcards, mask->Length / sizeof(WCHAR) ) &&
+            read_directory_stat( fd, io, buffer, length, single_entry, mask, restart_scan ) != -1)
+            goto done;
 #ifdef USE_GETDENTS
         if ((read_directory_getdents( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1)
             goto done;