mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix FindFirstFile return values

This commit is contained in:
David PHAM-VAN 2017-03-31 15:33:28 -07:00
parent b46aaeb973
commit 30d0bde4ba
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winpr/libwinpr/file/generic.c
View File

@ -475,7 +475,7 @@ BOOL WINAPI GetFileAttributesExA(LPCSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfo
WIN32_FIND_DATAA findFileData;
HANDLE hFind;
if (!(hFind = FindFirstFileA(lpFileName, &findFileData) == INVALID_HANDLE_VALUE))
if ((hFind = FindFirstFileA(lpFileName, &findFileData) != INVALID_HANDLE_VALUE))
FindClose(hFind);
fd->dwFileAttributes = findFileData.dwFileAttributes;
@ -925,7 +925,8 @@ BOOL FindNextFileA(HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData)
fullpath = (char*)malloc(pathlen + namelen + 2);
if (fullpath == NULL)
{
return INVALID_HANDLE_VALUE;
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
memcpy(fullpath, pFileSearch->lpPath, pathlen);
fullpath[pathlen] = '/';
@ -935,7 +936,8 @@ BOOL FindNextFileA(HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData)
if (lstat(fullpath, &fileStat) != 0)
{
free(fullpath);
return INVALID_HANDLE_VALUE;
SetLastError(map_posix_err(errno));
return FALSE;
}
free(fullpath);
@ -991,7 +993,7 @@ BOOL FindNextFileW(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData)
if (!fd)
{
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return INVALID_HANDLE_VALUE;
return FALSE;
}
if (FindNextFileA(hFindFile, fd))