[CRYPTNET] don't try to prepend a drive letter when there is one already

svn path=/trunk/; revision=72793
This commit is contained in:
Christoph von Wittich 2016-09-24 12:19:35 +00:00
parent 940cde001f
commit 6476277b5c

View file

@ -1025,8 +1025,11 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL,
components.dwUrlPathLength + 1); components.dwUrlPathLength + 1);
hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
#ifndef __REACTOS__ #ifdef __REACTOS__
if (hFile == INVALID_HANDLE_VALUE) if ((hFile == INVALID_HANDLE_VALUE) && (lstrlenW(components.lpszUrlPath) > 1) && (components.lpszUrlPath[1] != ':'))
#else
if ((hFile == INVALID_HANDLE_VALUE)
#endif
{ {
/* Try again on the current drive */ /* Try again on the current drive */
GetCurrentDirectoryW(components.dwUrlPathLength, path); GetCurrentDirectoryW(components.dwUrlPathLength, path);
@ -1050,7 +1053,6 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL,
} }
} }
} }
#endif
if (hFile != INVALID_HANDLE_VALUE) if (hFile != INVALID_HANDLE_VALUE)
{ {
if ((ret = CRYPT_GetObjectFromFile(hFile, pObject))) if ((ret = CRYPT_GetObjectFromFile(hFile, pObject)))