ntdll: In find_file_in_dir(), don't test directory entries' short names if the…

ntdll: In find_file_in_dir(), don't test directory entries' short names if the target name isn't a short name. hash_short_file_name() will always create a short name of at least 8 characters with the 5th being a tilde (~). If the target name isn't of that form, then it can never match any short name constructed from the directory entries.

ntdll: In find_file_in_dir(), don't test directory entries' short names if the…
a14ed527 · Ken Thomases · Alexandre Julliard · 1c23bf04 · a14ed527
Commit a14ed527 authored Jul 28, 2014 by Ken Thomases Committed by Alexandre Julliard Jul 30, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

directory.c dlls/ntdll/directory.c +3 -0

No files found.
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -2250,6 +2250,9 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i
    str.Length = length * sizeof(WCHAR);
    str.MaximumLength = str.Length;
    is_name_8_dot_3 = RtlIsNameLegalDOS8Dot3( &str, NULL, &spaces ) && !spaces;
+#ifndef VFAT_IOCTL_READDIR_BOTH
+    is_name_8_dot_3 = is_name_8_dot_3 && length >= 8 && name[4] == '~';
+#endif

    if (!is_name_8_dot_3 && !get_dir_case_sensitivity( unix_name )) goto not_found;