Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 06:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL]

Browse source 
Complete RtlpDosPathNameToRelativeNtPathName_Ustr() rewrite by properly handling relative names.
This fixes several regressions brought by r54804 (see winetests).
This also fixes file system corruption when using directory functions.
This may also fix general file system corruption, so, please retest bug #6720.

svn path=/trunk/; revision=54820
This commit is contained in:
Pierre Schweitzer 2012-01-03 19:08:46 +00:00
parent 362af7d9dc
commit f6bc586f58
1 changed files with 50 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

64
reactos/lib/rtl/path.c
View file

@ -39,6 +39,8 @@ const UNICODE_STRING RtlpDosAUXDevice = RTL_CONSTANT_STRING(L"AUX");
const UNICODE_STRING RtlpDosCONDevice = RTL_CONSTANT_STRING(L"CON"); const UNICODE_STRING RtlpDosCONDevice = RTL_CONSTANT_STRING(L"CON");
const UNICODE_STRING RtlpDosNULDevice = RTL_CONSTANT_STRING(L"NUL"); const UNICODE_STRING RtlpDosNULDevice = RTL_CONSTANT_STRING(L"NUL");
PRTLP_CURDIR_REF RtlpCurDirRef;
/* PRIVATE FUNCTIONS **********************************************************/ /* PRIVATE FUNCTIONS **********************************************************/
ULONG ULONG
@ -455,11 +457,12 @@ RtlpDosPathNameToRelativeNtPathName_Ustr(IN BOOLEAN HaveRelative,
WCHAR BigBuffer[MAX_PATH + 1]; WCHAR BigBuffer[MAX_PATH + 1];
PWCHAR PrefixBuffer, NewBuffer, Buffer; PWCHAR PrefixBuffer, NewBuffer, Buffer;
ULONG MaxLength, PathLength, PrefixLength, PrefixCut, LengthChars, Length; ULONG MaxLength, PathLength, PrefixLength, PrefixCut, LengthChars, Length;
UNICODE_STRING CapturedDosName, PartNameString; UNICODE_STRING CapturedDosName, PartNameString, FullPath;
BOOLEAN QuickPath; BOOLEAN QuickPath;
RTL_PATH_TYPE InputPathType, BufferPathType; RTL_PATH_TYPE InputPathType, BufferPathType;
NTSTATUS Status; NTSTATUS Status;
BOOLEAN NameInvalid; BOOLEAN NameInvalid;
PCURDIR CurrentDirectory;
/* Assume MAX_PATH for now */ /* Assume MAX_PATH for now */
DPRINT("Relative: %lx DosName: %wZ NtName: %wZ, PartName: %p, RelativeName: %p\n", DPRINT("Relative: %lx DosName: %wZ NtName: %wZ, PartName: %p, RelativeName: %p\n",
@ -608,26 +611,59 @@ RtlpDosPathNameToRelativeNtPathName_Ustr(IN BOOLEAN HaveRelative,
/* Setup the structure */ /* Setup the structure */
RtlInitEmptyUnicodeString(&RelativeName->RelativeName, NULL, 0); RtlInitEmptyUnicodeString(&RelativeName->RelativeName, NULL, 0);
RelativeName->ContainingDirectory = NULL; RelativeName->ContainingDirectory = NULL;
RelativeName->CurDirRef = 0; RelativeName->CurDirRef = NULL;
/* Check if the input path itself was relative */ /* Check if the input path itself was relative */
if (InputPathType == RtlPathTypeRelative) if (InputPathType == RtlPathTypeRelative)
{ {
/* FIXME: HACK: Old code */ /* Get current directory */
PCURDIR cd; CurrentDirectory = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath);
UNICODE_STRING us; if (CurrentDirectory->Handle)
cd = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath);
if (cd->Handle)
{ {
RtlInitUnicodeString(&us, Buffer); Status = RtlInitUnicodeStringEx(&FullPath, Buffer);
us.Length = (cd->DosPath.Length < us.Length) ? cd->DosPath.Length : us.Length; if (!NT_SUCCESS(Status))
if (RtlEqualUnicodeString(&us, &cd->DosPath, TRUE))
{ {
Length = ((cd->DosPath.Length / sizeof(WCHAR)) - PrefixCut) + ((InputPathType == 1) ? 8 : 4); RtlFreeHeap(RtlGetProcessHeap(), 0, NewBuffer);
RelativeName->RelativeName.Buffer = NewBuffer + Length; RtlReleasePebLock();
RelativeName->RelativeName.Length = NtName->Length - (USHORT)(Length * sizeof(WCHAR)); return Status;
}
/* If current directory is bigger than full path, there's no way */
if (CurrentDirectory->DosPath.Length > FullPath.Length)
{
RtlReleasePebLock();
return Status;
}
/* File is in current directory */
if (RtlEqualUnicodeString(&FullPath, &CurrentDirectory->DosPath, TRUE))
{
/* Make relative name string */
RelativeName->RelativeName.Buffer = (PWSTR)((ULONG_PTR)NewBuffer + FullPath.Length - PrefixCut);
RelativeName->RelativeName.Length = PathLength - FullPath.Length;
/* If relative name starts with \, skip it */
if (RelativeName->RelativeName.Buffer[0] == L'\\')
{
RelativeName->RelativeName.Buffer = (PWSTR)((ULONG_PTR)RelativeName->RelativeName.Buffer + sizeof(WCHAR));
RelativeName->RelativeName.Length -= sizeof(WCHAR);
}
RelativeName->RelativeName.MaximumLength = RelativeName->RelativeName.Length; RelativeName->RelativeName.MaximumLength = RelativeName->RelativeName.Length;
RelativeName->ContainingDirectory = cd->Handle; DPRINT("RelativeName: %wZ\n", &(RelativeName->RelativeName));
if (!HaveRelative)
{
RelativeName->ContainingDirectory = CurrentDirectory->Handle;
return Status;
}
/* Give back current directory data & reference counter */
RelativeName->CurDirRef = RtlpCurDirRef;
if (RelativeName->CurDirRef)
{
/* FIXME: Increment reference count */
}
RelativeName->ContainingDirectory = CurrentDirectory->Handle;
} }
} }
} }