mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3760 from akallabeth/filetime_conversion

Browse Source 
Fixed time conversion in FileSetFileTime. #3508
This commit is contained in:
Norbert Federa 2017-02-13 15:31:05 +01:00 committed by GitHub
commit 5897d833c8
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
winpr/libwinpr/file/file.c
View File

@ -353,8 +353,18 @@ static BOOL FileUnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfByte
return TRUE; return TRUE;
} }
static BOOL FileSetFileTime(HANDLE hFile, const FILETIME *lpCreationTime, static UINT64 FileTimeToUS(const FILETIME* ft)
const FILETIME *lpLastAccessTime, const FILETIME *lpLastWriteTime) {
const UINT64 EPOCH_DIFF = 11644473600ULL * 1000000ULL;
UINT64 tmp = ((UINT64)ft->dwHighDateTime) << 32
| ft->dwLowDateTime;
tmp /= 10; /* 100ns steps to 1us step */
tmp -= EPOCH_DIFF;
return tmp;
}
static BOOL FileSetFileTime(HANDLE hFile, const FILETIME* lpCreationTime,
const FILETIME* lpLastAccessTime, const FILETIME* lpLastWriteTime)
{ {
int rc; int rc;
#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__) #if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__)
@ -365,16 +375,18 @@ static BOOL FileSetFileTime(HANDLE hFile, const FILETIME *lpCreationTime,
struct timespec times[2]; /* last access, last modification */ struct timespec times[2]; /* last access, last modification */
#endif #endif
WINPR_FILE* pFile = (WINPR_FILE*)hFile; WINPR_FILE* pFile = (WINPR_FILE*)hFile;
const UINT64 EPOCH_DIFF = 11644473600ULL;
if (!hFile) if (!hFile)
return FALSE; return FALSE;
#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__) #if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__)
rc = fstat(fileno(pFile->fp), &buf); rc = fstat(fileno(pFile->fp), &buf);
if (rc < 0) if (rc < 0)
return FALSE; return FALSE;
#endif #endif
if (!lpLastAccessTime) if (!lpLastAccessTime)
{ {
#if defined(__FreeBSD__) || defined(__APPLE__) #if defined(__FreeBSD__) || defined(__APPLE__)
@ -394,21 +406,16 @@ static BOOL FileSetFileTime(HANDLE hFile, const FILETIME *lpCreationTime,
} }
else else
{ {
UINT64 tmp = ((UINT64)lpLastAccessTime->dwHighDateTime) << 32 UINT64 tmp = FileTimeToUS(lpLastAccessTime);
| lpLastAccessTime->dwLowDateTime;
tmp -= EPOCH_DIFF;
tmp /= 10ULL;
#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) #if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__)
tmp /= 10000ULL; timevals[0].tv_sec = tmp / 1000000ULL;
timevals[0].tv_usec = tmp % 1000000ULL;
timevals[0].tv_sec = tmp / 10000ULL;
timevals[0].tv_usec = tmp % 10000ULL;
#else #else
times[0].tv_sec = tmp / 10000000ULL; times[0].tv_sec = tmp / 1000000ULL;
times[0].tv_nsec = tmp % 10000000ULL; times[0].tv_nsec = (tmp % 1000000ULL) * 1000ULL;
#endif #endif
} }
if (!lpLastWriteTime) if (!lpLastWriteTime)
{ {
#if defined(__FreeBSD__) || defined(__APPLE__) #if defined(__FreeBSD__) || defined(__APPLE__)
@ -428,19 +435,13 @@ static BOOL FileSetFileTime(HANDLE hFile, const FILETIME *lpCreationTime,
} }
else else
{ {
UINT64 tmp = ((UINT64)lpLastWriteTime->dwHighDateTime) << 32 UINT64 tmp = FileTimeToUS(lpLastWriteTime);
| lpLastWriteTime->dwLowDateTime;
tmp -= EPOCH_DIFF;
tmp /= 10ULL;
#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) #if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__)
tmp /= 10000ULL; timevals[1].tv_sec = tmp / 1000000ULL;
timevals[1].tv_usec = tmp % 1000000ULL;
timevals[1].tv_sec = tmp / 10000ULL;
timevals[1].tv_usec = tmp % 10000ULL;
#else #else
times[1].tv_sec = tmp / 10000000ULL; times[1].tv_sec = tmp / 1000000ULL;
times[1].tv_nsec = tmp % 10000000ULL; times[1].tv_nsec = (tmp % 1000000ULL) * 1000ULL;
#endif #endif
} }
@ -450,11 +451,11 @@ static BOOL FileSetFileTime(HANDLE hFile, const FILETIME *lpCreationTime,
#else #else
rc = futimens(fileno(pFile->fp), times); rc = futimens(fileno(pFile->fp), times);
#endif #endif
if (rc != 0) if (rc != 0)
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
static HANDLE_OPS fileOps = { static HANDLE_OPS fileOps = {
@ -759,6 +760,8 @@ HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
{ {
HANDLE hFile; HANDLE hFile;
WCHAR* lpFileNameW = NULL; WCHAR* lpFileNameW = NULL;
ConvertToUnicode(CP_UTF8, 0, lpFileName, -1, &lpFileNameW, 0); ConvertToUnicode(CP_UTF8, 0, lpFileName, -1, &lpFileNameW, 0);