seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/Windows/System.cpp

@@ -20,7 +20,7 @@
 #endif
 
 
-#include "Common/Types.h"
+#include "Common/MyTypes.h"
 
 namespace NWindows
 {
@@ -95,8 +95,9 @@ namespace NWindows
 		#endif
 
 		/************************ GetRamSize ************************/
-	UInt64 GetRamSize() {
-			UInt64 ullTotalPhys = 128 * 1024 * 1024; // default : 128MB
+	    bool GetRamSize(UInt64 &size) {
+			size = (UInt64)(sizeof(size_t)) << 29;
+			bool isDefined = true;
 
 #ifdef linux
 	 		FILE * f = fopen( "/proc/meminfo", "r" );
@@ -105,26 +106,29 @@ namespace NWindows
 				char buffer[256];
 				unsigned long total;
 
-				ullTotalPhys = 0;
+				size = 0;
 
 		  		while (fgets( buffer, sizeof(buffer), f ))
 		  		{
 		 		/* old style /proc/meminfo ... */
 					if (sscanf( buffer, "Mem: %lu", &total))
 					{
-					 	ullTotalPhys += total;
+					 	size += total;
 					}
 
 					/* new style /proc/meminfo ... */
 					if (sscanf(buffer, "MemTotal: %lu", &total))
-					 	ullTotalPhys = ((UInt64)total)*1024;
+					 	size = ((UInt64)total)*1024;
 		  		}
 		  		fclose( f );
 			}
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__OpenBSD__)
 #ifdef HW_MEMSIZE
 			uint64_t val = 0; // support 2Gb+ RAM
 			int mib[2] = { CTL_HW, HW_MEMSIZE };
+#elif defined(HW_PHYSMEM64)
+			uint64_t val = 0; // support 2Gb+ RAM
+			int mib[2] = { CTL_HW, HW_PHYSMEM64 };
 #else // HW_MEMSIZE
 			unsigned int val = 0; // For old system
 			int mib[2] = { CTL_HW, HW_PHYSMEM };
@@ -132,33 +136,34 @@ namespace NWindows
 			size_t size_sys = sizeof(val);
 
 			sysctl(mib, 2, &val, &size_sys, NULL, 0);
-			if (val) ullTotalPhys = val;
+			if (val) size = val;
 #elif defined(__CYGWIN__)
-			unsigned long pagesize=4096; // FIXME - sysconf(_SC_PAGESIZE) returns 65536 !?
+			unsigned long pagesize=sysconf(_SC_PAGESIZE); // returns 65536 => OK
 					// see http://readlist.com/lists/cygwin.com/cygwin/0/3313.html
 			unsigned long maxpages=sysconf(_SC_PHYS_PAGES);
-			ullTotalPhys = ((UInt64)pagesize)*maxpages;
+			size = ((UInt64)pagesize)*maxpages;
 #elif defined ( sun ) || defined(__NETWARE__)
 			unsigned long pagesize=sysconf(_SC_PAGESIZE);
 			unsigned long maxpages=sysconf(_SC_PHYS_PAGES);
-			ullTotalPhys = ((UInt64)pagesize)*maxpages;
+			size = ((UInt64)pagesize)*maxpages;
 #elif defined(hpux) || defined(__hpux)
 			struct pst_static pst;
 			union pstun pu;
 						
 			pu.pst_static = &pst;
 			if ( pstat( PSTAT_STATIC, pu, (size_t)sizeof(pst), (size_t)0, 0 ) != -1 ) {
-				ullTotalPhys = ((UInt64)pst.physical_memory)*pst.page_size;
+				size = ((UInt64)pst.physical_memory)*pst.page_size;
 			}
 #elif defined(ENV_BEOS)
 			system_info info;
 			get_system_info(&info);
-			ullTotalPhys = info.max_pages;
-			ullTotalPhys *= 4096;
+			size = info.max_pages;
+			size *= 4096;
 #else
 #warning Generic GetRamSize
+			isDefined = false;
 #endif
-			return ullTotalPhys;
+			return isDefined;
 		}
 
 	}

data/ext/p7zip/CPP/Windows/System.h

@@ -3,13 +3,14 @@
 #ifndef __WINDOWS_SYSTEM_H
 #define __WINDOWS_SYSTEM_H
 
-#include "../Common/Types.h"
+#include "../Common/MyTypes.h"
 
 namespace NWindows {
 namespace NSystem {
 
 UInt32 GetNumberOfProcessors();
-UInt64 GetRamSize();
+
+bool GetRamSize(UInt64 &size); // returns false, if unknown ram size
 
 }}
 

data/ext/p7zip/CPP/Windows/TimeUtils.cpp

@@ -0,0 +1,203 @@
+// Windows/TimeUtils.cpp
+
+#include "StdAfx.h"
+
+#include "Defs.h"
+#include "TimeUtils.h"
+
+namespace NWindows {
+namespace NTime {
+
+static const UInt32 kNumTimeQuantumsInSecond = 10000000;
+static const UInt32 kFileTimeStartYear = 1601;
+static const UInt32 kDosTimeStartYear = 1980;
+static const UInt32 kUnixTimeStartYear = 1970;
+static const UInt64 kUnixTimeOffset =
+    (UInt64)60 * 60 * 24 * (89 + 365 * (kUnixTimeStartYear - kFileTimeStartYear));
+static const UInt64 kNumSecondsInFileTime = (UInt64)(Int64)-1 / kNumTimeQuantumsInSecond;
+
+bool DosTimeToFileTime(UInt32 dosTime, FILETIME &ft) throw()
+{
+  #if defined(_WIN32) && !defined(UNDER_CE)
+  return BOOLToBool(::DosDateTimeToFileTime((UInt16)(dosTime >> 16), (UInt16)(dosTime & 0xFFFF), &ft));
+  #else
+  ft.dwLowDateTime = 0;
+  ft.dwHighDateTime = 0;
+  UInt64 res;
+  if (!GetSecondsSince1601(kDosTimeStartYear + (dosTime >> 25), (dosTime >> 21) & 0xF, (dosTime >> 16) & 0x1F,
+      (dosTime >> 11) & 0x1F, (dosTime >> 5) & 0x3F, (dosTime & 0x1F) * 2, res))
+    return false;
+  res *= kNumTimeQuantumsInSecond;
+  ft.dwLowDateTime = (UInt32)res;
+  ft.dwHighDateTime = (UInt32)(res >> 32);
+  return true;
+  #endif
+}
+
+static const UInt32 kHighDosTime = 0xFF9FBF7D;
+static const UInt32 kLowDosTime = 0x210000;
+
+#define PERIOD_4 (4 * 365 + 1)
+#define PERIOD_100 (PERIOD_4 * 25 - 1)
+#define PERIOD_400 (PERIOD_100 * 4 + 1)
+
+bool FileTimeToDosTime(const FILETIME &ft, UInt32 &dosTime) throw()
+{
+  #if defined(_WIN32) && !defined(UNDER_CE)
+
+  WORD datePart, timePart;
+  if (!::FileTimeToDosDateTime(&ft, &datePart, &timePart))
+  {
+    dosTime = (ft.dwHighDateTime >= 0x01C00000) ? kHighDosTime : kLowDosTime;
+    return false;
+  }
+  dosTime = (((UInt32)datePart) << 16) + timePart;
+
+  #else
+
+  unsigned year, mon, day, hour, min, sec;
+  UInt64 v64 = ft.dwLowDateTime | ((UInt64)ft.dwHighDateTime << 32);
+  Byte ms[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+  unsigned temp;
+  UInt32 v;
+  v64 += (kNumTimeQuantumsInSecond * 2 - 1);
+  v64 /= kNumTimeQuantumsInSecond;
+  sec = (unsigned)(v64 % 60);
+  v64 /= 60;
+  min = (unsigned)(v64 % 60);
+  v64 /= 60;
+  hour = (unsigned)(v64 % 24);
+  v64 /= 24;
+
+  v = (UInt32)v64;
+
+  year = (unsigned)(kFileTimeStartYear + v / PERIOD_400 * 400);
+  v %= PERIOD_400;
+
+  temp = (unsigned)(v / PERIOD_100);
+  if (temp == 4)
+    temp = 3;
+  year += temp * 100;
+  v -= temp * PERIOD_100;
+
+  temp = v / PERIOD_4;
+  if (temp == 25)
+    temp = 24;
+  year += temp * 4;
+  v -= temp * PERIOD_4;
+
+  temp = v / 365;
+  if (temp == 4)
+    temp = 3;
+  year += temp;
+  v -= temp * 365;
+
+  if (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0))
+    ms[1] = 29;
+  for (mon = 1; mon <= 12; mon++)
+  {
+    unsigned s = ms[mon - 1];
+    if (v < s)
+      break;
+    v -= s;
+  }
+  day = (unsigned)v + 1;
+
+  dosTime = kLowDosTime;
+  if (year < kDosTimeStartYear)
+    return false;
+  year -= kDosTimeStartYear;
+  dosTime = kHighDosTime;
+  if (year >= 128)
+    return false;
+  dosTime = (year << 25) | (mon << 21) | (day << 16) | (hour << 11) | (min << 5) | (sec >> 1);
+  #endif
+  return true;
+}
+
+void UnixTimeToFileTime(UInt32 unixTime, FILETIME &ft) throw()
+{
+  UInt64 v = (kUnixTimeOffset + (UInt64)unixTime) * kNumTimeQuantumsInSecond;
+  ft.dwLowDateTime = (DWORD)v;
+  ft.dwHighDateTime = (DWORD)(v >> 32);
+}
+
+bool UnixTime64ToFileTime(Int64 unixTime, FILETIME &ft) throw()
+{
+  if (unixTime > kNumSecondsInFileTime - kUnixTimeOffset)
+  {
+    ft.dwLowDateTime = ft.dwHighDateTime = (UInt32)(Int32)-1;
+    return false;
+  }
+  Int64 v = (Int64)kUnixTimeOffset + unixTime;
+  if (v < 0)
+  {
+    ft.dwLowDateTime = ft.dwHighDateTime = 0;
+    return false;
+  }
+  UInt64 v2 = (UInt64)v * kNumTimeQuantumsInSecond;
+  ft.dwLowDateTime = (DWORD)v2;
+  ft.dwHighDateTime = (DWORD)(v2 >> 32);
+  return true;
+}
+
+Int64 FileTimeToUnixTime64(const FILETIME &ft) throw()
+{
+  UInt64 winTime = (((UInt64)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
+  return (Int64)(winTime / kNumTimeQuantumsInSecond) - kUnixTimeOffset;
+}
+
+bool FileTimeToUnixTime(const FILETIME &ft, UInt32 &unixTime) throw()
+{
+  UInt64 winTime = (((UInt64)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
+  winTime /= kNumTimeQuantumsInSecond;
+  if (winTime < kUnixTimeOffset)
+  {
+    unixTime = 0;
+    return false;
+  }
+  winTime -= kUnixTimeOffset;
+  if (winTime > 0xFFFFFFFF)
+  {
+    unixTime = 0xFFFFFFFF;
+    return false;
+  }
+  unixTime = (UInt32)winTime;
+  return true;
+}
+
+bool GetSecondsSince1601(unsigned year, unsigned month, unsigned day,
+  unsigned hour, unsigned min, unsigned sec, UInt64 &resSeconds) throw()
+{
+  resSeconds = 0;
+  if (year < kFileTimeStartYear || year >= 10000 || month < 1 || month > 12 ||
+      day < 1 || day > 31 || hour > 23 || min > 59 || sec > 59)
+    return false;
+  UInt32 numYears = year - kFileTimeStartYear;
+  UInt32 numDays = numYears * 365 + numYears / 4 - numYears / 100 + numYears / 400;
+  Byte ms[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+  if (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0))
+    ms[1] = 29;
+  month--;
+  for (unsigned i = 0; i < month; i++)
+    numDays += ms[i];
+  numDays += day - 1;
+  resSeconds = ((UInt64)(numDays * 24 + hour) * 60 + min) * 60 + sec;
+  return true;
+}
+
+void GetCurUtcFileTime(FILETIME &ft) throw()
+{
+  // Both variants provide same low resolution on WinXP: about 15 ms.
+  // But GetSystemTimeAsFileTime is much faster.
+
+  #ifdef UNDER_CE
+  SYSTEMTIME st;
+  GetSystemTime(&st);
+  SystemTimeToFileTime(&st, &ft);
+  #else
+  GetSystemTimeAsFileTime(&ft);
+  #endif
+}
+
+}}

data/ext/p7zip/CPP/Windows/TimeUtils.h

@@ -0,0 +1,24 @@
+// Windows/TimeUtils.h
+
+#ifndef __WINDOWS_TIME_UTILS_H
+#define __WINDOWS_TIME_UTILS_H
+
+#include "../Common/MyTypes.h"
+#include "../Common/MyWindows.h"
+
+namespace NWindows {
+namespace NTime {
+
+bool DosTimeToFileTime(UInt32 dosTime, FILETIME &fileTime) throw();
+bool FileTimeToDosTime(const FILETIME &fileTime, UInt32 &dosTime) throw();
+void UnixTimeToFileTime(UInt32 unixTime, FILETIME &fileTime) throw();
+bool UnixTime64ToFileTime(Int64 unixTime, FILETIME &fileTime) throw();
+bool FileTimeToUnixTime(const FILETIME &fileTime, UInt32 &unixTime) throw();
+Int64 FileTimeToUnixTime64(const FILETIME &ft) throw();
+bool GetSecondsSince1601(unsigned year, unsigned month, unsigned day,
+  unsigned hour, unsigned min, unsigned sec, UInt64 &resSeconds) throw();
+void GetCurUtcFileTime(FILETIME &ft) throw();
+
+}}
+
+#endif

data/ext/p7zip/CPP/include_windows/basetyps.h

@@ -2,10 +2,10 @@
 #define _BASETYPS_H
 
 #ifdef ENV_HAVE_GCCVISIBILITYPATCH
-    #define DLLEXPORT __attribute__ ((visibility("default")))
-  #else
-    #define DLLEXPORT
-  #endif
+  #define DLLEXPORT __attribute__ ((visibility("default")))
+#else
+  #define DLLEXPORT
+#endif
 
 #ifdef __cplusplus
 #define STDAPI extern "C" DLLEXPORT HRESULT

data/ext/p7zip/CPP/include_windows/windows.h

@@ -33,11 +33,20 @@
 #define TRUE 1
 #endif
 
-#define WINAPI 
+#define WINAPI
 
 #undef BOOL
 typedef int BOOL;
 
+
+#define CREATE_NEW	  1
+#define CREATE_ALWAYS	  2
+#define OPEN_EXISTING	  3
+#define OPEN_ALWAYS	  4
+/* #define TRUNCATE_EXISTING 5 */
+
+
+
 /* BEGIN #include <winnt.h> */
 /* BEGIN <winerror.h> */
 #define NO_ERROR                    0L
@@ -46,7 +55,11 @@ typedef int BOOL;
 #define ERROR_INVALID_HANDLE        EBADF
 #define ERROR_PATH_NOT_FOUND        ENOENT
 #define ERROR_DISK_FULL             ENOSPC
-#define ERROR_NO_MORE_FILES         0x100123 // FIXME
+#define ERROR_NO_MORE_FILES         0x100018 // FIXME
+#define ERROR_DIRECTORY             267 // FIXME
+
+// #define ERROR_NEGATIVE_SEEK         0x100131 // FIXME
+
 
 /* see Common/WyWindows.h
 #define S_OK ((HRESULT)0x00000000L)
@@ -86,7 +99,7 @@ typedef TCHAR *LPTSTR;
  * The corresponding macros  _TEXT() and _T() for mapping _UNICODE strings
  * passed to C runtime functions are defined in mingw/tchar.h
  */
-#define TEXT(q) P7ZIP_TEXT(q)    
+#define TEXT(q) P7ZIP_TEXT(q)
 
 typedef BYTE BOOLEAN;
 
@@ -149,6 +162,7 @@ BOOL WINAPI FileTimeToSystemTime(CONST FILETIME *,SYSTEMTIME *);
 BOOL WINAPI LocalFileTimeToFileTime(CONST FILETIME *,FILETIME *);
 VOID WINAPI GetSystemTime(SYSTEMTIME *);
 BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,FILETIME *);
+VOID WINAPI GetSystemTimeAsFileTime(FILETIME * time);
 
 DWORD WINAPI GetTickCount(VOID);
 
@@ -165,13 +179,6 @@ DWORD WINAPI GetTickCount(VOID);
 
 /* #include <unknwn.h> */
 #include <basetyps.h>
-struct IEnumSTATPROPSTG;
-
-typedef struct  tagSTATPROPSTG {
-	LPOLESTR lpwstrName;
-	PROPID propid;
-	VARTYPE vt;
-} STATPROPSTG;
 
 #ifdef __cplusplus
 extern "C" const IID IID_ISequentialStream;
@@ -191,4 +198,3 @@ extern const IID IID_ISequentialStream;
 /* END #include <ole2.h> */
 
 #endif
-

data/ext/p7zip/CPP/myWindows/StdAfx.h

@@ -6,6 +6,7 @@
 
 #include "config.h"
 
+#define MAXIMUM_WAIT_OBJECTS 64
 
 #define NO_INLINE /* FIXME */
 
@@ -13,8 +14,10 @@
 #include <pthread.h>
 #endif
 
+#include "Common/Common.h"
 #include "Common/MyWindows.h"
-#include "Common/Types.h"
+#include "Common/MyTypes.h"
+#include "Common/MyString.h" // FIXME
 
 #include <windows.h>
 
@@ -36,6 +39,13 @@
 #undef CS /* fix for Solaris 10 x86 */
 
 
+#ifdef __cplusplus
+# define EXTERN_C    extern "C"
+#else
+# define EXTERN_C    extern
+#endif
+
+
 /***************************/
 
 #ifndef ENV_HAVE_WCHAR__H
@@ -87,12 +97,34 @@ typedef wxWindow *HWND;
 #define MessageBox MessageBoxW
 int MessageBoxW(wxWindow * parent, const TCHAR * mes, const TCHAR * title,int flag);
 
+
+// FIXME
+#define IDCLOSE   (5001) // wxID_CLOSE
+#define IDEXIT    (5006) // wxID_EXIT
+#define IDOK      (5100) // wxID_OK
+#define IDCANCEL  (5101) // wxID_CANCEL
+#define IDABORT   (5115) // wxID_ABORT
+#define IDYES     (5103) // wxID_YES
+#define IDNO      (5104) // wxID_NO
+#define IDHELP    (5009) // wxID_HELP
+
+// Show
+#define SW_HIDE             0
+#define SW_SHOW             5
+
+
+
 typedef void *HINSTANCE;
 
-typedef          int   INT_PTR;  // FIXME 64 bits ?
-typedef unsigned int  UINT_PTR;  // FIXME 64 bits ?
-typedef          long LONG_PTR;  // FIXME 64 bits ?
-typedef          long DWORD_PTR; // FIXME 64 bits ?
+// gcc / clang on Unix  : sizeof(long==sizeof(void*) in 32 or 64 bits)
+//typedef          int   INT_PTR;
+typedef          long   INT_PTR;
+// typedef unsigned int  UINT_PTR;
+typedef unsigned long  UINT_PTR;
+
+typedef          long LONG_PTR;
+typedef unsigned long DWORD_PTR;
+
 typedef UINT_PTR WPARAM;
 
 /* WARNING
@@ -101,8 +133,68 @@ typedef UINT_PTR WPARAM;
 typedef LONG_PTR LPARAM;
 typedef LONG_PTR LRESULT;
 
+
+#define LOWORD(l)              ((WORD)((DWORD_PTR)(l) & 0xFFFF))
+#define HIWORD(l)              ((WORD)((DWORD_PTR)(l) >> 16))
+
+
 #define CALLBACK /* */
 
+#define ERROR_NEGATIVE_SEEK         0x100131 // FIXME
+#define FACILITY_WIN32                        7 // FIXME
+#define __HRESULT_FROM_WIN32(x)   ((HRESULT)(x) > 0 ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)(x) ) // FIXME
+
+static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
+{
+    return (HRESULT)x > 0 ? ((HRESULT) ((x & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)x;
+}
+
+/************ Windows2.h ***********/
+
+typedef void * WNDPROC;
+typedef void * CREATESTRUCT;
+typedef struct
+{
+	HWND  hwndFrom;
+
+	UINT  code;
+#define NM_DBLCLK       1
+#define LVN_ITEMCHANGED 2
+#define LVN_COLUMNCLICK 3	
+#define CBEN_BEGINEDIT  10
+#define CBEN_ENDEDITW   11
+	
+	
+} NMHDR;
+typedef NMHDR * LPNMHDR;
+
+typedef struct tagNMLISTVIEW
+{
+    NMHDR hdr;
+    INT iItem;
+    INT iSubItem;
+    UINT uNewState;
+    UINT uOldState;
+    // UINT uChanged;
+    // POINT ptAction;
+    LPARAM  lParam;
+} NMLISTVIEW, *LPNMLISTVIEW;
+
+typedef void * LPNMITEMACTIVATE;
+
+#define NM_RCLICK 1234 /* FIXME */
+
+// FIXME
+#define WM_CREATE 1
+#define WM_COMMAND 2
+#define WM_NOTIFY 3
+#define WM_DESTROY 4
+#define WM_CLOSE 5
+
+#define HIWORD(l)              ((WORD)((DWORD_PTR)(l) >> 16))
+#define LOWORD(l)              ((WORD)((DWORD_PTR)(l) & 0xFFFF))
+
+
 /************ LANG ***********/
 typedef WORD            LANGID;
 

data/ext/p7zip/CPP/myWindows/config.h

@@ -5,7 +5,7 @@
   #define FILESYSTEM_IS_CASE_SENSITIVE 1
 #endif
 
-  #if !defined(ENV_MACOSX) && !defined(ENV_BEOS)
+  #if !defined(ENV_BEOS)
 
     /* <wchar.h> */
     /* ENV_HAVE_WCHAR__H and not ENV_HAVE_WCHAR_H to avoid warning with wxWidgets */
@@ -22,16 +22,30 @@
     /* towupper */
     #define ENV_HAVE_TOWUPPER
 
-  #endif /* !ENV_MACOSX && !ENV_BEOS */
+  #endif /* !ENV_BEOS */
+
+  #ifdef ENV_HAIKU  /* AFTER !defined(ENV_BEOS) because ENV_HAIKU and ENV_BEOS are defined */
+    /* <wchar.h> */
+    /* ENV_HAVE_WCHAR__H and not ENV_HAVE_WCHAR_H to avoid warning with wxWidgets */
+    #define ENV_HAVE_WCHAR__H
+
+    /* <wctype.h> */
+    #define ENV_HAVE_WCTYPE_H
+
+    /* towupper */
+    #define ENV_HAVE_TOWUPPER
+  #endif
+		
+  
+  
+  #if !defined(ENV_BEOS) && !defined(ANDROID_NDK)
 
-  #if !defined(ENV_BEOS)
     #define ENV_HAVE_GETPASS
 
     #if !defined(sun)
       #define ENV_HAVE_TIMEGM
     #endif
 
-
   #endif
 
   /* lstat, readlink and S_ISLNK */
@@ -52,7 +66,8 @@
 #define ENV_HAVE_PTHREAD
 #endif
 
-#if defined(ENV_MACOSX)
+/* ANDROID don't have wcstombs or mbstowcs ? */
+#if defined(ENV_MACOSX) || defined(ANDROID_NDK)
 #define LOCALE_IS_UTF8
 #endif
 

data/ext/p7zip/CPP/myWindows/myPrivate.h

@@ -13,5 +13,13 @@ static inline const char * nameWindowToUnix(const char * lpFileName) {
   if ((lpFileName[0] == 'c') && (lpFileName[1] == ':')) return lpFileName+2;
   return lpFileName;
 }
+
+
+
 #endif
 
+// From mySplitCommandLine.cpp
+void mySplitCommandLine(int numArguments, char *arguments[],UStringVector &parts);
+class CStdOutStream;
+void showP7zipInfo(CStdOutStream *so);
+

data/ext/p7zip/CPP/myWindows/wine_date_and_time.cpp

@@ -432,3 +432,37 @@ BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, FILETIME * ft ) {
   return TRUE;
 }
 
+/***********************************************************************
+ *              GetSystemTimeAsFileTime  (KERNEL32.@)
+ *
+ *  Get the current time in utc format.
+ *
+ *  RETURNS
+ *   Nothing.
+ */
+VOID WINAPI GetSystemTimeAsFileTime(
+    FILETIME * time) /* [out] Destination for the current utc time */
+{
+    LARGE_INTEGER t;
+/*
+    NtQuerySystemTime( &t );
+*/
+    struct timeval now;
+
+    gettimeofday( &now, 0 );
+    t.QuadPart  = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970;
+    t.QuadPart += now.tv_usec * 10;
+
+    time->dwLowDateTime  = (DWORD)(t.QuadPart);
+    time->dwHighDateTime = (DWORD)(t.QuadPart >> 32);
+}
+
+DWORD WINAPI GetTickCount(VOID) { // Retrieves the number of milliseconds
+  timeval v;
+  if (gettimeofday(&v, 0) == 0)
+  {
+    return (DWORD)(v.tv_sec * (UInt64)1000 + v.tv_usec / 1000);
+  }  
+  return (DWORD)time(0)*1000; 
+}
+