diff options
| author | Niels Weber <niels.weber@digia.com> | 2013-05-02 16:09:59 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2013-05-07 16:02:53 +0200 |
| commit | 7b062bd6af86452ed231009b0c48d663ce93976a (patch) | |
| tree | 7c2613e073335dc757a3cad6cfacd91264e95952 /src/libs/7zip/unix/CPP/Windows/PropVariantConversions.cpp | |
| parent | e3bd8afc6bda58e482771e09adf8294e75b89eff (diff) | |
Remove local filetime.
This leads to time being wrong by a couple of hours depending
on usage of local time vs UTC.
This has been deemed acceptable for now.
Also skip the test failing because of that difference. Needs
to be re-enabled when all time functionality has been rewritten.
Change-Id: I23d78371df65878d16e0e428c9fca9387e29a908
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/7zip/unix/CPP/Windows/PropVariantConversions.cpp')
| -rw-r--r-- | src/libs/7zip/unix/CPP/Windows/PropVariantConversions.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libs/7zip/unix/CPP/Windows/PropVariantConversions.cpp b/src/libs/7zip/unix/CPP/Windows/PropVariantConversions.cpp index 61d524d07..abd5b46c4 100644 --- a/src/libs/7zip/unix/CPP/Windows/PropVariantConversions.cpp +++ b/src/libs/7zip/unix/CPP/Windows/PropVariantConversions.cpp @@ -76,13 +76,10 @@ bool ConvertFileTimeToString(const FILETIME &ft, char *s, bool includeTime, bool #else BOOLEAN WINAPI RtlTimeToSecondsSince1970( const LARGE_INTEGER *Time, DWORD *Seconds ); - FILETIME filetime; - LocalFileTimeToFileTime(&ft, &filetime); - LARGE_INTEGER ltime; - ltime.QuadPart = filetime.dwHighDateTime; - ltime.QuadPart = (ltime.QuadPart << 32) | filetime.dwLowDateTime; + ltime.QuadPart = ft.dwHighDateTime; + ltime.QuadPart = (ltime.QuadPart << 32) | ft.dwLowDateTime; DWORD dw; RtlTimeToSecondsSince1970(<ime, &dw ); |