Merge pull request #1008 from Azaezel/alpha41/timeTrouble

fileModifiedTime cleanups
This commit is contained in:
Brian Roberts 2023-04-11 18:29:28 -05:00 committed by GitHub
commit 26adb11e49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions

View file

@ -93,7 +93,7 @@ String Platform::localTimeToString( const LocalTime &lt )
outStr += "\t"; outStr += "\t";
result = GetTimeFormat( LOCALE_USER_DEFAULT, result = GetTimeFormat( LOCALE_USER_DEFAULT,
0, TIME_FORCE24HOURFORMAT,
&st, &st,
NULL, NULL,
(LPTSTR)buffer, (LPTSTR)buffer,

View file

@ -138,21 +138,28 @@ static void _CopyStatAttributes(const WIN32_FIND_DATAW& info, FileNode::Attribut
if (info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) if (info.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
attr->flags |= FileNode::ReadOnly; attr->flags |= FileNode::ReadOnly;
SYSTEMTIME st, stLocal;
FILETIME ftLocal;
attr->size = info.nFileSizeLow; attr->size = info.nFileSizeLow;
attr->mtime = Win32FileTimeToTime(
info.ftLastWriteTime.dwLowDateTime,
info.ftLastWriteTime.dwHighDateTime);
attr->atime = Win32FileTimeToTime( FileTimeToSystemTime(&(info.ftLastWriteTime), &st);
info.ftLastAccessTime.dwLowDateTime, SystemTimeToTzSpecificLocalTime(NULL, &st, &stLocal);
info.ftLastAccessTime.dwHighDateTime); SystemTimeToFileTime(&stLocal, &ftLocal);
attr->mtime = Win32FileTimeToTime(ftLocal.dwLowDateTime, ftLocal.dwHighDateTime);
attr->ctime = Win32FileTimeToTime( FileTimeToSystemTime(&(info.ftLastAccessTime), &st);
info.ftCreationTime.dwLowDateTime, SystemTimeToTzSpecificLocalTime(NULL, &st, &stLocal);
info.ftCreationTime.dwHighDateTime); SystemTimeToFileTime(&stLocal, &ftLocal);
attr->atime = Win32FileTimeToTime(ftLocal.dwLowDateTime, ftLocal.dwHighDateTime);
FileTimeToSystemTime(&(info.ftCreationTime), &st);
SystemTimeToTzSpecificLocalTime(NULL, &st, &stLocal);
SystemTimeToFileTime(&stLocal, &ftLocal);
attr->ctime = Win32FileTimeToTime(ftLocal.dwLowDateTime, ftLocal.dwHighDateTime);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool Win32FileSystemChangeNotifier::internalAddNotification( const Path &dir ) bool Win32FileSystemChangeNotifier::internalAddNotification( const Path &dir )