Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL]

Browse source 
Fix warnings from VS /analyze

svn path=/trunk/; revision=58322
This commit is contained in:
Timo Kreuzer 2013-02-16 17:58:16 +00:00
parent 856c07815b
commit 50f0e9b20a
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,12 +286,13 @@ RtlpCheckDeviceName(IN PUNICODE_STRING FileName,
ULONG ULONG
NTAPI NTAPI
RtlGetFullPathName_Ustr(IN PUNICODE_STRING FileName, RtlGetFullPathName_Ustr(
IN ULONG Size, _In_ PUNICODE_STRING FileName,
IN PWSTR Buffer, _In_ ULONG Size,
OUT PCWSTR *ShortName, _Out_z_bytecap_(Size) PWSTR Buffer,
OUT PBOOLEAN InvalidName, _Out_opt_ PCWSTR *ShortName,
OUT RTL_PATH_TYPE *PathType) _Out_opt_ PBOOLEAN InvalidName,
_Out_ RTL_PATH_TYPE *PathType)
{ {
PWCHAR FileNameBuffer; PWCHAR FileNameBuffer;
ULONG FileNameLength, FileNameChars, DosLength, DosLengthOffset, FullLength; ULONG FileNameLength, FileNameChars, DosLength, DosLengthOffset, FullLength;
@ -300,7 +301,7 @@ RtlGetFullPathName_Ustr(IN PUNICODE_STRING FileName,
/* For now, assume the name is valid */ /* For now, assume the name is valid */
DPRINT("Filename: %wZ\n", FileName); DPRINT("Filename: %wZ\n", FileName);
DPRINT("Size and buffer: %lx %S\n", Size, Buffer); DPRINT("Size and buffer: %lx %p\n", Size, Buffer);
if (InvalidName) *InvalidName = FALSE; if (InvalidName) *InvalidName = FALSE;
/* Handle initial path type and failure case */ /* Handle initial path type and failure case */
@ -374,7 +375,7 @@ RtlGetFullPathName_Ustr(IN PUNICODE_STRING FileName,
DPRINT("Path type: %lx\n", *PathType); DPRINT("Path type: %lx\n", *PathType);
/* This is disgusting... but avoids re-writing everything */ /* This is disgusting... but avoids re-writing everything */
DPRINT("Calling old API with %s and %lx and %S\n", FileNameBuffer, Size, Buffer); DPRINT("Calling old API with '%S' and %lu and %S\n", FileNameBuffer, Size, Buffer);
return RtlGetFullPathName_U(FileNameBuffer, Size, Buffer, (PWSTR*)ShortName); return RtlGetFullPathName_U(FileNameBuffer, Size, Buffer, (PWSTR*)ShortName);
} }
@ -911,8 +912,9 @@ RtlIsDosDeviceName_U(IN PCWSTR Path)
*/ */
ULONG ULONG
NTAPI NTAPI
RtlGetCurrentDirectory_U(IN ULONG MaximumLength, RtlGetCurrentDirectory_U(
IN PWSTR Buffer) _In_ ULONG MaximumLength,
_Out_bytecap_(MaximumLength) PWSTR Buffer)
{ {
ULONG Length, Bytes; ULONG Length, Bytes;
PCURDIR CurDir; PCURDIR CurDir;
@ -983,6 +985,8 @@ RtlGetCurrentDirectory_U(IN ULONG MaximumLength,
return Length * sizeof(WCHAR); return Length * sizeof(WCHAR);
} }
/* /*
* @implemented * @implemented
*/ */
@ -1453,7 +1457,7 @@ static ULONG get_full_path_helper(
if (reqsize) memcpy(buffer, ins_str, reqsize); if (reqsize) memcpy(buffer, ins_str, reqsize);
reqsize += deplen; reqsize += deplen;
if (ins_str != tmp && ins_str != cd->Buffer) if (ins_str && ins_str != tmp && ins_str != cd->Buffer)
RtlFreeHeap(RtlGetProcessHeap(), 0, ins_str); RtlFreeHeap(RtlGetProcessHeap(), 0, ins_str);
collapse_path( buffer, (ULONG)mark ); collapse_path( buffer, (ULONG)mark );
@ -1824,7 +1828,7 @@ RtlGetFullPathName_UstrEx(IN PUNICODE_STRING FileName,
&ShortName, &ShortName,
NameInvalid, NameInvalid,
PathType); PathType);
DPRINT("Length: %d StaticBuffer: %S\n", Length, StaticBuffer); DPRINT("Length: %u StaticBuffer: %S\n", Length, StaticBuffer);
if (!Length) if (!Length)
{ {
/* Fail if it failed */ /* Fail if it failed */
@ -2310,6 +2314,7 @@ RtlDosSearchPath_Ustr(IN ULONG Flags,
"the search path, but RtlGetfullPathNameUStrEx() " "the search path, but RtlGetfullPathNameUStrEx() "
"returned %08lx\n", "returned %08lx\n",
__FUNCTION__, __FUNCTION__,
&StaticCandidateString,
Status); Status);
} }
DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer);