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

yet another one revertion

Browse Source
This commit is contained in:
Dmitry Ilyin 2019-05-17 11:38:48 +03:00
parent 8eea99ae04
commit 912bff27f0
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,11 +481,12 @@ static BOOL FileUnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfByte
return TRUE;
}
static UINT64 FileTimeTo100ns(const FILETIME* ft)
static UINT64 FileTimeToUS(const FILETIME* ft)
{
const UINT64 EPOCH_DIFF = 11644473600ULL * 10000000;
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;
}
@ -533,13 +534,13 @@ static BOOL FileSetFileTime(HANDLE hFile, const FILETIME* lpCreationTime,
}
else
{
UINT64 tmp = FileTimeTo100ns(lpLastAccessTime);
UINT64 tmp = FileTimeToUS(lpLastAccessTime);
#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) || defined(KFREEBSD)
timevals[0].tv_sec = tmp / 10000000;
timevals[0].tv_usec = tmp % 10000000 / 10;
timevals[0].tv_sec = tmp / 1000000ULL;
timevals[0].tv_usec = tmp % 1000000ULL;
#else
times[0].tv_sec = tmp / 10000000;
times[0].tv_nsec = tmp % 10000000 * 100;
times[0].tv_sec = tmp / 1000000ULL;
times[0].tv_nsec = (tmp % 1000000ULL) * 1000ULL;
#endif
}
@ -562,13 +563,13 @@ static BOOL FileSetFileTime(HANDLE hFile, const FILETIME* lpCreationTime,
}
else
{
UINT64 tmp = FileTimeTo100ns(lpLastWriteTime);
UINT64 tmp = FileTimeToUS(lpLastWriteTime);
#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) || defined(KFREEBSD)
timevals[1].tv_sec = tmp / 10000000;
timevals[1].tv_usec = tmp % 10000000 / 10;
timevals[1].tv_sec = tmp / 1000000ULL;
timevals[1].tv_usec = tmp % 1000000ULL;
#else
times[1].tv_sec = tmp / 10000000;
times[1].tv_nsec = tmp % 10000000 * 100;
times[1].tv_sec = tmp / 1000000ULL;
times[1].tv_nsec = (tmp % 1000000ULL) * 1000ULL;
#endif
}