Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-23 23:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]: Fix multiple, multiple, bugs in the last commits. Path is now down to 12 failures (way lower than before the streak), most unrelated to actual path APIs.

Browse source 
svn path=/trunk/; revision=54332
This commit is contained in:
Alex Ionescu 2011-11-07 05:07:58 +00:00
parent c13946eae2
commit a458290ab1
1 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

39
reactos/dll/win32/kernel32/client/path.c
View file

@ -144,10 +144,13 @@ IsLongName_U(IN PWCHAR FileName,
for (i = 0, Dots = Length - 1; i < Length; i++, Dots--) for (i = 0, Dots = Length - 1; i < Length; i++, Dots--)
{ {
/* Check if this could be an extension */ /* Check if this could be an extension */
if (*FileName == '.') if (FileName[i] == '.')
{ {
/* Unlike the short case, we WANT more than one extension, or a long one */ /* Unlike the short case, we WANT more than one extension, or a long one */
if ((HasExtension) || (Dots > 3)) return TRUE; if ((HasExtension) || (Dots > 3))
{
return TRUE;
}
HasExtension = TRUE; HasExtension = TRUE;
} }
@ -219,7 +222,7 @@ FindLFNorSFN_U(IN PWCHAR Path,
PWCHAR PWCHAR
WINAPI WINAPI
SkipPathTypeIndicator_U(IN PWCHAR Path) SkipPathTypeIndicator_U(IN LPWSTR Path)
{ {
PWCHAR ReturnPath; PWCHAR ReturnPath;
ULONG i; ULONG i;
@ -543,7 +546,7 @@ GetFullPathNameA(IN LPCSTR lpFileName,
if (!PathSize) goto Quickie; if (!PathSize) goto Quickie;
/* If the *caller's* buffer was too small, fail, but add in space for NULL */ /* If the *caller's* buffer was too small, fail, but add in space for NULL */
if (PathSize < nBufferLength) if (PathSize >= nBufferLength)
{ {
PathSize++; PathSize++;
goto Quickie; goto Quickie;
@ -890,7 +893,7 @@ GetLongPathNameW(IN LPCWSTR lpszShortPath,
HANDLE FindHandle; HANDLE FindHandle;
DWORD ReturnLength; DWORD ReturnLength;
ULONG ErrorMode; ULONG ErrorMode;
BOOLEAN Found; BOOLEAN Found = FALSE;
WIN32_FIND_DATAW FindFileData; WIN32_FIND_DATAW FindFileData;
/* Initialize so Quickie knows there's nothing to do */ /* Initialize so Quickie knows there's nothing to do */
@ -917,13 +920,12 @@ GetLongPathNameW(IN LPCWSTR lpszShortPath,
} }
/* Now get a pointer to the actual path, skipping indicators */ /* Now get a pointer to the actual path, skipping indicators */
Path = SkipPathTypeIndicator_U((PWCHAR)lpszShortPath); Path = SkipPathTypeIndicator_U((LPWSTR)lpszShortPath);
/* Try to find a file name in there */
if (Path) Found = FindLFNorSFN_U(Path, &First, &Last, FALSE);
/* Is there any path or filename in there? */ /* Is there any path or filename in there? */
if (!(Path) || (*Path == UNICODE_NULL) || !(Found)) if (!(Path) ||
(*Path == UNICODE_NULL) ||
!(FindLFNorSFN_U(Path, &First, &Last, FALSE)))
{ {
/* There isn't, so the long path is simply the short path */ /* There isn't, so the long path is simply the short path */
ReturnLength = wcslen(lpszShortPath); ReturnLength = wcslen(lpszShortPath);
@ -953,7 +955,7 @@ GetLongPathNameW(IN LPCWSTR lpszShortPath,
Original = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); Original = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR));
if (!Original) goto ErrorQuickie; if (!Original) goto ErrorQuickie;
/* Make a copy ofi t */ /* Make a copy of it */
RtlMoveMemory(Original, lpszShortPath, Length * sizeof(WCHAR)); RtlMoveMemory(Original, lpszShortPath, Length * sizeof(WCHAR));
/* Compute the new first and last markers */ /* Compute the new first and last markers */
@ -1269,7 +1271,7 @@ GetShortPathNameW(IN LPCWSTR lpszLongPath,
HANDLE FindHandle; HANDLE FindHandle;
DWORD ReturnLength; DWORD ReturnLength;
ULONG ErrorMode; ULONG ErrorMode;
BOOLEAN Found; BOOLEAN Found = FALSE;
WIN32_FIND_DATAW FindFileData; WIN32_FIND_DATAW FindFileData;
/* Initialize so Quickie knows there's nothing to do */ /* Initialize so Quickie knows there's nothing to do */
@ -1288,7 +1290,7 @@ GetShortPathNameW(IN LPCWSTR lpszLongPath,
ErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); ErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
/* Do a simple check to see if the path exists */ /* Do a simple check to see if the path exists */
if (GetFileAttributesW(lpszShortPath) == INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(lpszLongPath) == INVALID_FILE_ATTRIBUTES)
{ {
/* Windows checks for an application compatibility flag to allow this */ /* Windows checks for an application compatibility flag to allow this */
if (!(NtCurrentPeb()) || !(NtCurrentPeb()->AppCompatFlags.LowPart & 1)) if (!(NtCurrentPeb()) || !(NtCurrentPeb()->AppCompatFlags.LowPart & 1))
@ -1300,19 +1302,18 @@ GetShortPathNameW(IN LPCWSTR lpszLongPath,
} }
/* Now get a pointer to the actual path, skipping indicators */ /* Now get a pointer to the actual path, skipping indicators */
Path = SkipPathTypeIndicator_U((PWCHAR)lpszShortPath); Path = SkipPathTypeIndicator_U((LPWSTR)lpszLongPath);
/* Try to find a file name in there */
if (Path) Found = FindLFNorSFN_U(Path, &First, &Last, TRUE);
/* Is there any path or filename in there? */ /* Is there any path or filename in there? */
if (!(Path) || (*Path == UNICODE_NULL) || !(Found)) if (!(Path) ||
(*Path == UNICODE_NULL) ||
!(FindLFNorSFN_U(Path, &First, &Last, TRUE)))
{ {
/* There isn't, so the long path is simply the short path */ /* There isn't, so the long path is simply the short path */
ReturnLength = wcslen(lpszLongPath); ReturnLength = wcslen(lpszLongPath);
/* Is there space for it? */ /* Is there space for it? */
if ((cchBuffer > ReturnLength) && (lpszLongPath)) if ((cchBuffer > ReturnLength) && (lpszShortPath))
{ {
/* Make sure the pointers aren't already the same */ /* Make sure the pointers aren't already the same */
if (lpszLongPath != lpszShortPath) if (lpszLongPath != lpszShortPath)