Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTDLL] Add implementation for RtlNtPathNameToDosPathName. CORE-12847 #resolve

Browse source 
svn path=/trunk/; revision=74031
This commit is contained in:
Mark Jansen 2017-03-02 21:29:38 +00:00
parent fc32eb9533
commit 5a98df6476
4 changed files with 101 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/ntdll/def/ntdll.spec
View file

@ -784,7 +784,7 @@
779 stdcall RtlNewSecurityObjectEx(ptr ptr ptr ptr long long ptr ptr)
780 stdcall RtlNewSecurityObjectWithMultipleInheritance(ptr ptr ptr ptr long long long ptr ptr)
781 stdcall RtlNormalizeProcessParams(ptr)
782 stdcall RtlNtPathNameToDosPathName(ptr ptr ptr ptr) ; CHECKME
782 stdcall RtlNtPathNameToDosPathName(long ptr ptr ptr) ; CHECKME (last arg)
783 stdcall RtlNtStatusToDosError(long)
784 stdcall RtlNtStatusToDosErrorNoTeb(long)
785 stdcall RtlNumberGenericTableElements(ptr)

17
reactos/sdk/include/ndk/rtlfuncs.h
View file

@ -2817,6 +2817,23 @@ RtlDosPathNameToNtPathName_U(
_Out_opt_ PRTL_RELATIVE_NAME_U DirectoryInfo
);
#define RTL_UNCHANGED_UNK_PATH 1
#define RTL_CONVERTED_UNC_PATH 2
#define RTL_CONVERTED_NT_PATH 3
#define RTL_UNCHANGED_DOS_PATH 4
NTSYSAPI
NTSTATUS
NTAPI
RtlNtPathNameToDosPathName(
_In_ ULONG Flags,
_Inout_ RTL_UNICODE_STRING_BUFFER* Path,
_Out_opt_ ULONG* PathType,
_Out_opt_ ULONG* Unknown
);
NTSYSAPI
BOOLEAN
NTAPI

88
reactos/sdk/lib/rtl/path.c
View file

@ -45,6 +45,8 @@ const UNICODE_STRING RtlpDosAUXDevice = RTL_CONSTANT_STRING(L"AUX");
const UNICODE_STRING RtlpDosCONDevice = RTL_CONSTANT_STRING(L"CON");
const UNICODE_STRING RtlpDosNULDevice = RTL_CONSTANT_STRING(L"NUL");
const UNICODE_STRING RtlpDoubleSlashPrefix = RTL_CONSTANT_STRING(L"\\\\");
PRTLP_CURDIR_REF RtlpCurDirRef;
/* PRIVATE FUNCTIONS **********************************************************/
@ -1787,13 +1789,89 @@ RtlDosPathNameToRelativeNtPathName_U_WithStatus(IN PCWSTR DosName,
}
/*
* @unimplemented
* @implemented
*/
NTSTATUS NTAPI
RtlNtPathNameToDosPathName(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, ULONG Unknown4)
NTSTATUS NTAPI RtlNtPathNameToDosPathName(IN ULONG Flags,
IN OUT RTL_UNICODE_STRING_BUFFER* Path,
OUT ULONG* PathType,
ULONG* Unknown)
{
DPRINT1("RtlNtPathNameToDosPathName: stub\n");
return STATUS_NOT_IMPLEMENTED;
PCUNICODE_STRING UsePrefix = NULL, AlternatePrefix = NULL;
if (PathType)
*PathType = 0;
if (!Path || Flags)
return STATUS_INVALID_PARAMETER;
/* The initial check is done on Path->String */
if (RtlPrefixUnicodeString(&RtlpDosDevicesUncPrefix, &Path->String, TRUE))
{
UsePrefix = &RtlpDosDevicesUncPrefix;
AlternatePrefix = &RtlpDoubleSlashPrefix;
if (PathType)
*PathType = RTL_CONVERTED_UNC_PATH;
}
else if (RtlPrefixUnicodeString(&RtlpDosDevicesPrefix, &Path->String, TRUE))
{
UsePrefix = &RtlpDosDevicesPrefix;
if (PathType)
*PathType = RTL_CONVERTED_NT_PATH;
}
if (UsePrefix)
{
NTSTATUS Status;
USHORT Len = Path->String.Length - UsePrefix->Length;
if (AlternatePrefix)
Len += AlternatePrefix->Length;
Status = RtlEnsureBufferSize(0, &Path->ByteBuffer, Len);
if (!NT_SUCCESS(Status))
return Status;
if (Len + sizeof(UNICODE_NULL) <= Path->ByteBuffer.Size)
{
/* Then, the contents of Path->ByteBuffer are always used... */
if (AlternatePrefix)
{
memcpy(Path->ByteBuffer.Buffer, AlternatePrefix->Buffer, AlternatePrefix->Length);
memmove(Path->ByteBuffer.Buffer + AlternatePrefix->Length, Path->ByteBuffer.Buffer + UsePrefix->Length,
Len - AlternatePrefix->Length);
}
else
{
memmove(Path->ByteBuffer.Buffer, Path->ByteBuffer.Buffer + UsePrefix->Length, Len);
}
Path->String.Buffer = (PWSTR)Path->ByteBuffer.Buffer;
Path->String.Length = Len;
Path->String.MaximumLength = Path->ByteBuffer.Size;
Path->String.Buffer[Len / sizeof(WCHAR)] = UNICODE_NULL;
}
return STATUS_SUCCESS;
}
if (PathType)
{
switch (RtlDetermineDosPathNameType_Ustr(&Path->String))
{
case RtlPathTypeUncAbsolute:
case RtlPathTypeDriveAbsolute:
case RtlPathTypeLocalDevice:
case RtlPathTypeRootLocalDevice:
*PathType = RTL_UNCHANGED_DOS_PATH;
break;
case RtlPathTypeUnknown:
case RtlPathTypeDriveRelative:
case RtlPathTypeRooted:
case RtlPathTypeRelative:
*PathType = RTL_UNCHANGED_UNK_PATH;
break;
}
}
return STATUS_SUCCESS;
}
/*

5
rostests/apitests/ntdll/RtlNtPathNameToDosPathName.c
View file

@ -43,11 +43,6 @@ struct test_entry
};
#define RTL_UNCHANGED_UNK_PATH 1
#define RTL_CONVERTED_UNC_PATH 2
#define RTL_CONVERTED_NT_PATH 3
#define RTL_UNCHANGED_DOS_PATH 4
static struct test_entry test_data[] =
{
/* Originally from RtlGetFullPathName_*.c (edited) */