From b89c461211ac047eda45a15a48cf14a23c7d4273 Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sat, 17 Dec 2005 15:45:59 +0000 Subject: [PATCH] fixed the definition of RtlDosPathNameToNtPathName_U svn path=/trunk/; revision=20224 --- reactos/include/ndk/rtlfuncs.h | 8 +++---- reactos/lib/advapi32/reg/reg.c | 10 ++++---- reactos/lib/advapi32/sec/misc.c | 4 ++-- reactos/lib/kernel32/file/cnotify.c | 2 +- reactos/lib/kernel32/file/create.c | 6 ++--- reactos/lib/kernel32/file/delete.c | 2 +- reactos/lib/kernel32/file/dir.c | 8 +++---- reactos/lib/kernel32/file/file.c | 6 ++--- reactos/lib/kernel32/file/find.c | 2 +- reactos/lib/kernel32/file/hardlink.c | 4 ++-- reactos/lib/kernel32/file/mailslot.c | 2 +- reactos/lib/kernel32/file/move.c | 6 ++--- reactos/lib/kernel32/file/npipe.c | 4 ++-- reactos/lib/kernel32/file/volume.c | 2 +- reactos/lib/kernel32/misc/utils.c | 2 +- reactos/lib/rtl/path.c | 36 ++++++++++++++-------------- reactos/w32api/include/winternl.h | 2 +- 17 files changed, 53 insertions(+), 53 deletions(-) diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index 1736b5134ba..4d990bd878a 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -1639,10 +1639,10 @@ NTSYSAPI BOOLEAN NTAPI RtlDosPathNameToNtPathName_U( - PWSTR DosName, - PUNICODE_STRING NtName, - PWSTR *ShortName, - PCURDIR CurrentDirectory + IN PCWSTR DosPathName, + OUT PUNICODE_STRING NtPathName, + OUT PCWSTR *NtFileNamePart, + OUT CURDIR *DirectoryInfo ); NTSYSAPI diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c index 2458badd8ae..eb2d440a10a 100644 --- a/reactos/lib/advapi32/reg/reg.c +++ b/reactos/lib/advapi32/reg/reg.c @@ -2586,7 +2586,7 @@ RegLoadKeyW (HKEY hKey, return RtlNtStatusToDosError (Status); } - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFile, + if (!RtlDosPathNameToNtPathName_U (lpFile, &FileName, NULL, NULL)) @@ -3858,7 +3858,7 @@ RegReplaceKeyW (HKEY hKey, } /* Convert new file name */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewFile, + if (!RtlDosPathNameToNtPathName_U (lpNewFile, &NewFileName, NULL, NULL)) @@ -3878,7 +3878,7 @@ RegReplaceKeyW (HKEY hKey, NULL); /* Convert old file name */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpOldFile, + if (!RtlDosPathNameToNtPathName_U (lpOldFile, &OldFileName, NULL, NULL)) @@ -3977,7 +3977,7 @@ RegRestoreKeyW (HKEY hKey, return RtlNtStatusToDosError (Status); } - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFile, + if (!RtlDosPathNameToNtPathName_U (lpFile, &FileName, NULL, NULL)) @@ -4070,7 +4070,7 @@ RegSaveKeyW (HKEY hKey, return RtlNtStatusToDosError (Status); } - if (!RtlDosPathNameToNtPathName_U ((PWSTR)lpFile, + if (!RtlDosPathNameToNtPathName_U (lpFile, &FileName, NULL, NULL)) diff --git a/reactos/lib/advapi32/sec/misc.c b/reactos/lib/advapi32/sec/misc.c index 5fd35c83847..0e05ff54ff8 100644 --- a/reactos/lib/advapi32/sec/misc.c +++ b/reactos/lib/advapi32/sec/misc.c @@ -221,7 +221,7 @@ GetFileSecurityW(LPCWSTR lpFileName, AccessMask |= ACCESS_SYSTEM_SECURITY; } - if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileName, NULL, NULL)) @@ -365,7 +365,7 @@ SetFileSecurityW (LPCWSTR lpFileName, AccessMask |= ACCESS_SYSTEM_SECURITY; } - if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileName, NULL, NULL)) diff --git a/reactos/lib/kernel32/file/cnotify.c b/reactos/lib/kernel32/file/cnotify.c index e46bf48e866..f036545762d 100644 --- a/reactos/lib/kernel32/file/cnotify.c +++ b/reactos/lib/kernel32/file/cnotify.c @@ -70,7 +70,7 @@ FindFirstChangeNotificationW ( OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hDir; - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpPathName, + if (!RtlDosPathNameToNtPathName_U (lpPathName, &NtPathU, NULL, NULL)) diff --git a/reactos/lib/kernel32/file/create.c b/reactos/lib/kernel32/file/create.c index 004a1a25ec4..4a26154368c 100644 --- a/reactos/lib/kernel32/file/create.c +++ b/reactos/lib/kernel32/file/create.c @@ -105,7 +105,7 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, } /* validate & translate the filename */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U (lpFileName, &NtPathU, NULL, NULL)) @@ -437,7 +437,7 @@ CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, case DEVICE_PATH: case UNC_DOT_PATH: default: - if(!RtlDosPathNameToNtPathName_U((LPWSTR)lpTargetFileName, &TargetFileName, NULL, NULL)) + if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) { dwErr = ERROR_INVALID_PARAMETER; goto Cleanup; @@ -475,7 +475,7 @@ CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, if(bRelativePath) pReparseData->SymbolicLinkReparseBuffer.Flags |= 1; // TODO! give this lone flag a name - if(!RtlDosPathNameToNtPathName_U((LPWSTR)lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) + if(!RtlDosPathNameToNtPathName_U(lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) { dwErr = ERROR_PATH_NOT_FOUND; goto Cleanup; diff --git a/reactos/lib/kernel32/file/delete.c b/reactos/lib/kernel32/file/delete.c index b7d182bf82f..5ba55ba06ff 100644 --- a/reactos/lib/kernel32/file/delete.c +++ b/reactos/lib/kernel32/file/delete.c @@ -55,7 +55,7 @@ DeleteFileW ( DPRINT("DeleteFileW (lpFileName %S)\n",lpFileName); - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U (lpFileName, &NtPathU, NULL, NULL)) diff --git a/reactos/lib/kernel32/file/dir.c b/reactos/lib/kernel32/file/dir.c index c16df6e61f9..8e842ee8a56 100644 --- a/reactos/lib/kernel32/file/dir.c +++ b/reactos/lib/kernel32/file/dir.c @@ -100,7 +100,7 @@ CreateDirectoryW ( DPRINT ("lpPathName %S lpSecurityAttributes %p\n", lpPathName, lpSecurityAttributes); - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpPathName, + if (!RtlDosPathNameToNtPathName_U (lpPathName, &NtPathU, NULL, NULL)) @@ -182,7 +182,7 @@ CreateDirectoryExW ( * Translate the template directory path */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpTemplateDirectory, + if (!RtlDosPathNameToNtPathName_U (lpTemplateDirectory, &NtTemplatePathU, NULL, NULL)) @@ -239,7 +239,7 @@ OpenTemplateDir: * Translate the new directory path and check if they're the same */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewDirectory, + if (!RtlDosPathNameToNtPathName_U (lpNewDirectory, &NtPathU, NULL, NULL)) @@ -526,7 +526,7 @@ RemoveDirectoryW ( DPRINT("lpPathName %S\n", lpPathName); - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpPathName, + if (!RtlDosPathNameToNtPathName_U (lpPathName, &NtPathU, NULL, NULL)) diff --git a/reactos/lib/kernel32/file/file.c b/reactos/lib/kernel32/file/file.c index 2d2f8906f38..dd0ddd1858b 100644 --- a/reactos/lib/kernel32/file/file.c +++ b/reactos/lib/kernel32/file/file.c @@ -296,7 +296,7 @@ OpenFile(LPCSTR lpFileName, else RtlUnicodeStringToOemString (&FileName, &FileNameU, FALSE); - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)PathNameW, + if (!RtlDosPathNameToNtPathName_U (PathNameW, &FileNameString, NULL, NULL)) @@ -849,7 +849,7 @@ GetFileAttributesExW(LPCWSTR lpFileName, } /* Validate and translate the filename */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U (lpFileName, &FileName, NULL, NULL)) @@ -1061,7 +1061,7 @@ SetFileAttributesW(LPCWSTR lpFileName, DPRINT ("SetFileAttributeW(%S, 0x%lx) called\n", lpFileName, dwFileAttributes); /* Validate and translate the filename */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U (lpFileName, &FileName, NULL, NULL)) diff --git a/reactos/lib/kernel32/file/find.c b/reactos/lib/kernel32/file/find.c index dfceecbb2bc..eb82078015e 100644 --- a/reactos/lib/kernel32/file/find.c +++ b/reactos/lib/kernel32/file/find.c @@ -279,7 +279,7 @@ InternalFindFirstFile ( SearchPath[Length] = 0; } - bResult = RtlDosPathNameToNtPathName_U ((LPWSTR)SearchPath, + bResult = RtlDosPathNameToNtPathName_U (SearchPath, &NtPathU, NULL, NULL); diff --git a/reactos/lib/kernel32/file/hardlink.c b/reactos/lib/kernel32/file/hardlink.c index 445ee4e699b..d894ce63b94 100644 --- a/reactos/lib/kernel32/file/hardlink.c +++ b/reactos/lib/kernel32/file/hardlink.c @@ -51,7 +51,7 @@ CreateHardLinkW(LPCWSTR lpFileName, return FALSE; } - if(RtlDosPathNameToNtPathName_U((LPWSTR)lpExistingFileName, &LinkTarget, NULL, NULL)) + if(RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, NULL, NULL)) { ULONG NeededSize = RtlGetFullPathName_U((LPWSTR)lpExistingFileName, 0, NULL, NULL); if(NeededSize > 0) @@ -108,7 +108,7 @@ CreateHardLinkW(LPCWSTR lpFileName, FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT); if(NT_SUCCESS(Status)) { - if(RtlDosPathNameToNtPathName_U((LPWSTR)lpFileName, &LinkName, NULL, NULL)) + if(RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, NULL, NULL)) { NeededSize = sizeof(FILE_LINK_INFORMATION) + LinkName.Length + sizeof(WCHAR); LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NeededSize); diff --git a/reactos/lib/kernel32/file/mailslot.c b/reactos/lib/kernel32/file/mailslot.c index 257689a7d2f..1c72a30a797 100644 --- a/reactos/lib/kernel32/file/mailslot.c +++ b/reactos/lib/kernel32/file/mailslot.c @@ -63,7 +63,7 @@ CreateMailslotW(LPCWSTR lpName, ULONG Attributes = OBJ_CASE_INSENSITIVE; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; - Result = RtlDosPathNameToNtPathName_U((LPWSTR)lpName, + Result = RtlDosPathNameToNtPathName_U(lpName, &MailslotName, NULL, NULL); diff --git a/reactos/lib/kernel32/file/move.c b/reactos/lib/kernel32/file/move.c index daeb2adaaba..67cc5656bc9 100644 --- a/reactos/lib/kernel32/file/move.c +++ b/reactos/lib/kernel32/file/move.c @@ -91,13 +91,13 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) DPRINT("Add support to smss for keys created by MOVEFILE_DELAY_UNTIL_REBOOT\n"); - if (!RtlDosPathNameToNtPathName_U( (LPWSTR)source, &source_name, NULL, NULL )) + if (!RtlDosPathNameToNtPathName_U( source, &source_name, NULL, NULL )) { SetLastError( ERROR_PATH_NOT_FOUND ); return FALSE; } dest_name.Buffer = NULL; - if (dest && !RtlDosPathNameToNtPathName_U( (LPWSTR)dest, &dest_name, NULL, NULL )) + if (dest && !RtlDosPathNameToNtPathName_U( dest, &dest_name, NULL, NULL )) { RtlFreeUnicodeString( &source_name ); SetLastError( ERROR_PATH_NOT_FOUND ); @@ -224,7 +224,7 @@ MoveFileWithProgressW ( /* validate & translate the filename */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewFileName, + if (!RtlDosPathNameToNtPathName_U (lpNewFileName, &DstPathU, NULL, NULL)) diff --git a/reactos/lib/kernel32/file/npipe.c b/reactos/lib/kernel32/file/npipe.c index a9fcd278e88..8d46e1a64d0 100644 --- a/reactos/lib/kernel32/file/npipe.c +++ b/reactos/lib/kernel32/file/npipe.c @@ -90,7 +90,7 @@ CreateNamedPipeW(LPCWSTR lpName, if (nMaxInstances == PIPE_UNLIMITED_INSTANCES) nMaxInstances = -1; /* Convert the name */ - Result = RtlDosPathNameToNtPathName_U((LPWSTR)lpName, + Result = RtlDosPathNameToNtPathName_U(lpName, &NamedPipeName, NULL, NULL); @@ -464,7 +464,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, HANDLE FileHandle; IO_STATUS_BLOCK Iosb; - r = RtlDosPathNameToNtPathName_U((LPWSTR)lpNamedPipeName, + r = RtlDosPathNameToNtPathName_U(lpNamedPipeName, &NamedPipeName, NULL, NULL); diff --git a/reactos/lib/kernel32/file/volume.c b/reactos/lib/kernel32/file/volume.c index 48e106209ad..44e7ab5495a 100644 --- a/reactos/lib/kernel32/file/volume.c +++ b/reactos/lib/kernel32/file/volume.c @@ -38,7 +38,7 @@ InternalOpenDirW(LPCWSTR DirName, IO_STATUS_BLOCK IoStatusBlock; HANDLE hFile; - if (!RtlDosPathNameToNtPathName_U((LPWSTR)DirName, + if (!RtlDosPathNameToNtPathName_U(DirName, &NtPathU, NULL, NULL)) diff --git a/reactos/lib/kernel32/misc/utils.c b/reactos/lib/kernel32/misc/utils.c index 0ab45ded0e7..086b6304092 100644 --- a/reactos/lib/kernel32/misc/utils.c +++ b/reactos/lib/kernel32/misc/utils.c @@ -412,7 +412,7 @@ BasepMapFile(IN LPCWSTR lpApplicationName, RelativeName.Handle = NULL; /* Find the application name */ - RtlDosPathNameToNtPathName_U((LPWSTR)lpApplicationName, + RtlDosPathNameToNtPathName_U(lpApplicationName, ApplicationName, NULL, &RelativeName); diff --git a/reactos/lib/rtl/path.c b/reactos/lib/rtl/path.c index d342b410ce0..665953ef008 100644 --- a/reactos/lib/rtl/path.c +++ b/reactos/lib/rtl/path.c @@ -675,10 +675,10 @@ DWORD NTAPI RtlGetFullPathName_U( * @implemented */ BOOLEAN NTAPI -RtlDosPathNameToNtPathName_U(PWSTR dosname, - PUNICODE_STRING ntname, - PWSTR *FilePart, - PCURDIR nah) +RtlDosPathNameToNtPathName_U(IN PCWSTR DosPathName, + OUT PUNICODE_STRING NtPathName, + OUT PCWSTR *NtFileNamePart, + OUT CURDIR *DirectoryInfo) { UNICODE_STRING us; PCURDIR cd; @@ -693,7 +693,7 @@ RtlDosPathNameToNtPathName_U(PWSTR dosname, RtlAcquirePebLock (); - RtlInitUnicodeString (&us, dosname); + RtlInitUnicodeString (&us, DosPathName); if (us.Length > 8) { Buffer = us.Buffer; @@ -721,10 +721,10 @@ RtlDosPathNameToNtPathName_U(PWSTR dosname, return FALSE; } - Size = RtlGetFullPathName_U (dosname, + Size = RtlGetFullPathName_U (DosPathName, sizeof(fullname), fullname, - FilePart); + (PWSTR*)NtFileNamePart); if (Size == 0 || Size > MAX_PATH * sizeof(WCHAR)) { RtlFreeHeap (RtlGetProcessHeap (), @@ -763,18 +763,18 @@ RtlDosPathNameToNtPathName_U(PWSTR dosname, } /* set NT filename */ - ntname->Length = Length * sizeof(WCHAR); - ntname->MaximumLength = sizeof(fullname) + MAX_PFX_SIZE; - ntname->Buffer = Buffer; + NtPathName->Length = Length * sizeof(WCHAR); + NtPathName->MaximumLength = sizeof(fullname) + MAX_PFX_SIZE; + NtPathName->Buffer = Buffer; /* set pointer to file part if possible */ - if (FilePart && *FilePart) - *FilePart = Buffer + Length - wcslen (*FilePart); + if (NtFileNamePart && *NtFileNamePart) + *NtFileNamePart = Buffer + Length - wcslen (*NtFileNamePart); /* Set name and handle structure if possible */ - if (nah) + if (DirectoryInfo) { - memset (nah, 0, sizeof(CURDIR)); + memset (DirectoryInfo, 0, sizeof(CURDIR)); cd = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath); if (Type == 5 && cd->Handle) { @@ -782,10 +782,10 @@ RtlDosPathNameToNtPathName_U(PWSTR dosname, if (RtlEqualUnicodeString(&us, &cd->DosPath, TRUE)) { Length = ((cd->DosPath.Length / sizeof(WCHAR)) - Offset) + ((Type == 1) ? 8 : 4); - nah->DosPath.Buffer = Buffer + Length; - nah->DosPath.Length = ntname->Length - (Length * sizeof(WCHAR)); - nah->DosPath.MaximumLength = nah->DosPath.Length; - nah->Handle = cd->Handle; + DirectoryInfo->DosPath.Buffer = Buffer + Length; + DirectoryInfo->DosPath.Length = NtPathName->Length - (Length * sizeof(WCHAR)); + DirectoryInfo->DosPath.MaximumLength = DirectoryInfo->DosPath.Length; + DirectoryInfo->Handle = cd->Handle; } } } diff --git a/reactos/w32api/include/winternl.h b/reactos/w32api/include/winternl.h index 08612308643..91651b7f5e2 100644 --- a/reactos/w32api/include/winternl.h +++ b/reactos/w32api/include/winternl.h @@ -1965,7 +1965,7 @@ void WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*); NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER); DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR); -BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); +BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PCWSTR*,CURDIR*); ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*); WCHAR WINAPI RtlDowncaseUnicodeChar(WCHAR); NTSTATUS WINAPI RtlDowncaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);