Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 17:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finally get the fake (and broken by design) DOS device check to work

Browse source 
svn path=/trunk/; revision=27673
This commit is contained in:
Thomas Bluemel 2007-07-15 08:33:49 +00:00
parent 5a95124349
commit 544cdbf9dd
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/dll/win32/kernel32/file/find.c
View file

@ -350,7 +350,7 @@ InternalFindFirstFile (
UNICODE_STRING NtPathU, FileName, PathFileName; UNICODE_STRING NtPathU, FileName, PathFileName;
NTSTATUS Status; NTSTATUS Status;
PWSTR NtPathBuffer; PWSTR NtPathBuffer;
BOOLEAN RemovedSlash = FALSE; BOOLEAN RemovedLastChar = FALSE;
BOOL bResult; BOOL bResult;
CURDIR DirInfo; CURDIR DirInfo;
ULONG DeviceNameInfo; ULONG DeviceNameInfo;
@ -406,13 +406,20 @@ InternalFindFirstFile (
} }
} }
/* Remove a trailing backslash from the path, unless it's a DOS drive directly */ /* Remove the last character of the path (Unless the path is a drive and
if (NtPathU.Length > 3 * sizeof(WCHAR) && ends with ":\"). If the caller however supplies a path to a device, such
NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 1] == L'\\' && as "C:\NUL" then the last character gets cut off, which later results in
NtOpenFile to return STATUS_OBJECT_NAME_NOT_FOUND, which in turn triggers
a fake DOS device check with RtlIsDosDeviceName_U. However, if there is a
real device with a name eg. "NU" in the system, FindFirstFile will succeed,
rendering the fake DOS device check useless... Why would they invent such a
stupid and broken behavior?! */
if (NtPathU.Length >= 2 * sizeof(WCHAR) &&
NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 1] != L'\\' &&
NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 2] != L':') NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 2] != L':')
{ {
NtPathU.Length -= sizeof(WCHAR); NtPathU.Length -= sizeof(WCHAR);
RemovedSlash = TRUE; RemovedLastChar = TRUE;
} }
DPRINT("lpFileName: \"%ws\"\n", lpFileName); DPRINT("lpFileName: \"%ws\"\n", lpFileName);
@ -433,10 +440,10 @@ InternalFindFirstFile (
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT);
if (!NT_SUCCESS(Status) && RemovedSlash) if (Status == STATUS_NOT_A_DIRECTORY && RemovedLastChar)
{ {
/* Try again, this time with the trailing slash... */ /* Try again, this time with the last character ... */
NtPathU.Length -= sizeof(WCHAR); NtPathU.Length += sizeof(WCHAR);
Status = NtOpenFile (&hDirectory, Status = NtOpenFile (&hDirectory,
FILE_LIST_DIRECTORY | SYNCHRONIZE, FILE_LIST_DIRECTORY | SYNCHRONIZE,
@ -444,6 +451,8 @@ InternalFindFirstFile (
&IoStatusBlock, &IoStatusBlock,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT);
NtPathU.Length += sizeof(WCHAR);
} }
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))