From 56d8d51fce6f73fa7059eb850a62693899d27135 Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Thu, 2 May 2013 14:29:12 +0200 Subject: Remove DosTime support from 7zip lib. We don't support that anyway and it complicates the DateAndTime implementation a lot. Change-Id: Ibb4f3bdf00beeb74446865376cdb67bd8337d5fd Reviewed-by: Tim Jenssen --- src/libs/7zip/unix/CPP/7zip/UI/Common/UpdatePair.cpp | 7 ------- src/libs/7zip/unix/CPP/Windows/Time.cpp | 20 -------------------- src/libs/7zip/unix/CPP/include_windows/windows.h | 2 -- 3 files changed, 29 deletions(-) (limited to 'src/libs/7zip/unix') diff --git a/src/libs/7zip/unix/CPP/7zip/UI/Common/UpdatePair.cpp b/src/libs/7zip/unix/CPP/7zip/UI/Common/UpdatePair.cpp index a43a9e770..d9396a583 100644 --- a/src/libs/7zip/unix/CPP/7zip/UI/Common/UpdatePair.cpp +++ b/src/libs/7zip/unix/CPP/7zip/UI/Common/UpdatePair.cpp @@ -28,13 +28,6 @@ static int MyCompareTime(NFileTimeType::EEnum fileTimeType, const FILETIME &time FileTimeToUnixTime(time2, unixTime2); return MyCompare(unixTime1, unixTime2); } - case NFileTimeType::kDOS: - { - UInt32 dosTime1, dosTime2; - FileTimeToDosTime(time1, dosTime1); - FileTimeToDosTime(time2, dosTime2); - return MyCompare(dosTime1, dosTime2); - } } throw 4191618; } diff --git a/src/libs/7zip/unix/CPP/Windows/Time.cpp b/src/libs/7zip/unix/CPP/Windows/Time.cpp index dfa0938b5..b58de6fe1 100644 --- a/src/libs/7zip/unix/CPP/Windows/Time.cpp +++ b/src/libs/7zip/unix/CPP/Windows/Time.cpp @@ -10,26 +10,6 @@ namespace NTime { static const UInt32 kFileTimeStartYear = 1601; -bool DosTimeToFileTime(UInt32 dosTime, FILETIME &fileTime) -{ - return BOOLToBool(::DosDateTimeToFileTime((UInt16)(dosTime >> 16), (UInt16)(dosTime & 0xFFFF), &fileTime)); -} - -static const UInt32 kHighDosTime = 0xFF9FBF7D; -static const UInt32 kLowDosTime = 0x210000; - -bool FileTimeToDosTime(const FILETIME &fileTime, UInt32 &dosTime) -{ - WORD datePart, timePart; - if (!::FileTimeToDosDateTime(&fileTime, &datePart, &timePart)) - { - dosTime = (fileTime.dwHighDateTime >= 0x01C00000) ? kHighDosTime : kLowDosTime; - return false; - } - dosTime = (((UInt32)datePart) << 16) + timePart; - return true; -} - static const UInt32 kNumTimeQuantumsInSecond = 10000000; static const UInt64 kUnixTimeStartValue = ((UInt64)kNumTimeQuantumsInSecond) * 60 * 60 * 24 * 134774; diff --git a/src/libs/7zip/unix/CPP/include_windows/windows.h b/src/libs/7zip/unix/CPP/include_windows/windows.h index ef0ca3d19..7591903fc 100644 --- a/src/libs/7zip/unix/CPP/include_windows/windows.h +++ b/src/libs/7zip/unix/CPP/include_windows/windows.h @@ -142,8 +142,6 @@ typedef struct _SYSTEMTIME { extern "C" { #endif -BOOL WINAPI DosDateTimeToFileTime(WORD,WORD,FILETIME *); -BOOL WINAPI FileTimeToDosDateTime(CONST FILETIME *,WORD *, WORD *); BOOL WINAPI FileTimeToLocalFileTime(CONST FILETIME *,FILETIME *); BOOL WINAPI FileTimeToSystemTime(CONST FILETIME *,SYSTEMTIME *); BOOL WINAPI LocalFileTimeToFileTime(CONST FILETIME *,FILETIME *); -- cgit v1.2.3