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

- Currently, SearchPathW fails with path such as subdir\binary.exe. This patch is there to address it. It permits VBoxService to launch, and probably others.

Browse source 
Patch by zefklop (jerome.gardou@laposte.net)
See issue #4697 for more details.

svn path=/trunk/; revision=41971
This commit is contained in:
Dmitry Chapyshev 2009-07-15 15:27:59 +00:00
parent 179d9487dd
commit bfb7dae4a2
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/kernel32/file/dir.c
View file

@ -1006,23 +1006,26 @@ SearchPathW (
PWCHAR EnvironmentBufferW = NULL; PWCHAR EnvironmentBufferW = NULL;
PWCHAR AppPathW = NULL; PWCHAR AppPathW = NULL;
WCHAR Buffer; WCHAR Buffer;
BOOL HasExtension; BOOL HasExtension = FALSE, IsAbsolute = FALSE;
LPCWSTR p; LPCWSTR p;
PWCHAR Name; PWCHAR Name;
TRACE("SearchPath\n"); TRACE("SearchPath\n");
HasExtension = FALSE;
p = lpFileName + wcslen(lpFileName); p = lpFileName + wcslen(lpFileName);
while (lpFileName < p && while (lpFileName < p &&
L'\\' != *(p - 1) && L'\\' != *(p - 1) &&
L'/' != *(p - 1) && L'/' != *(p - 1))
L':' != *(p - 1))
{ {
HasExtension = HasExtension || L'.' == *(p - 1); HasExtension = HasExtension || L'.' == *(p - 1);
if (p >= lpFileName && L'\\' == *(p-1))
{
if (':' == *p)
IsAbsolute = TRUE;
}
p--; p--;
} }
if (lpFileName < p) if (IsAbsolute)
{ {
if (HasExtension || NULL == lpExtension) if (HasExtension || NULL == lpExtension)
{ {
@ -1041,7 +1044,7 @@ SearchPathW (
} }
wcscat(wcscpy(Name, lpFileName), lpExtension); wcscat(wcscpy(Name, lpFileName), lpExtension);
} }
if (RtlDoesFileExists_U(Name)) if (RtlDoesFileExists_U(Name))
{ {
retCode = RtlGetFullPathName_U (Name, retCode = RtlGetFullPathName_U (Name,
nBufferLength * sizeof(WCHAR), nBufferLength * sizeof(WCHAR),