seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/7zip/Archive/Zip/ZipUpdate.h

@@ -1,4 +1,4 @@
-// Zip/Update.h
+// ZipUpdate.h
 
 #ifndef __ZIP_UPDATE_H
 #define __ZIP_UPDATE_H
@@ -18,28 +18,29 @@ struct CUpdateRange
 {
   UInt64 Position;
   UInt64 Size;
-  CUpdateRange() {};
+  
+  // CUpdateRange() {};
   CUpdateRange(UInt64 position, UInt64 size): Position(position), Size(size) {};
 };
 
 struct CUpdateItem
 {
   bool NewData;
-  bool NewProperties;
+  bool NewProps;
   bool IsDir;
   bool NtfsTimeIsDefined;
   bool IsUtf8;
-  int IndexInArchive;
+  int IndexInArc;
   int IndexInClient;
-  UInt32 Attributes;
+  UInt32 Attrib;
   UInt32 Time;
   UInt64 Size;
   AString Name;
   // bool Commented;
   // CUpdateRange CommentRange;
-  FILETIME NtfsMTime;
-  FILETIME NtfsATime;
-  FILETIME NtfsCTime;
+  FILETIME Ntfs_MTime;
+  FILETIME Ntfs_ATime;
+  FILETIME Ntfs_CTime;
 
   CUpdateItem(): NtfsTimeIsDefined(false), IsUtf8(false), Size(0) {}
 };
@@ -47,9 +48,9 @@ struct CUpdateItem
 HRESULT Update(
     DECL_EXTERNAL_CODECS_LOC_VARS
     const CObjectVector<CItemEx> &inputItems,
-    const CObjectVector<CUpdateItem> &updateItems,
+    CObjectVector<CUpdateItem> &updateItems,
     ISequentialOutStream *seqOutStream,
-    CInArchive *inArchive,
+    CInArchive *inArchive, bool removeSfx,
     CCompressionMethodMode *compressionMethodMode,
     IArchiveUpdateCallback *updateCallback);
 

data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile

@@ -1,328 +1,11 @@
-PROG=../../../../bin/7z.so
 
-LOCAL_FLAGS=\
-  $(CC_SHARED) \
-  -DEXTERNAL_CODECS \
-  -DUNICODE -D_UNICODE
+TARGET_FLAGS=$(CC_SHARED) -DRegisterArc=DllRegisterArc -DRegisterCodec=DllRegisterCodec
 
 include ../../../../makefile.crc32
 include ../../../../makefile.machine
 
-PCH_NAME=$(PRE_COMPILED_HEADER)
-
-LOCAL_SHARED=$(LINK_SHARED)
+LOCAL_LINK=$(LINK_SHARED)
 LIBS=$(LOCAL_LIBS_DLL)
 
-# NewHandler.o
-COMMON_OBJS = \
-  CRC.o \
-  IntToString.o \
-  MyMap.o \
-  MyString.o \
-  MyWindows.o \
-  MyXml.o \
-  StringConvert.o \
-  StringToInt.o \
-  MyVector.o \
-  UTFConvert.o \
-  Wildcard.o \
-
-WIN_OBJS = \
-  FileDir.o \
-  FileFind.o \
-  FileIO.o \
-  PropVariant.o \
-  PropVariantUtils.o \
-  Synchronization.o \
-  System.o \
-  Time.o \
-
-7ZIP_COMMON_OBJS = \
-  InBuffer.o \
-  InOutTempBuffer.o \
-  CreateCoder.o \
-  CWrappers.o \
-  FilterCoder.o \
-  LimitedStreams.o \
-  LockedStream.o \
-  MethodId.o \
-  MethodProps.o \
-  MemBlocks.o \
-  OffsetStream.o \
-  OutBuffer.o \
-  OutMemStream.o \
-  ProgressMt.o \
-  ProgressUtils.o \
-  StreamBinder.o \
-  StreamObjects.o \
-  StreamUtils.o \
-  VirtThread.o \
-
-AR_OBJS = \
-  ArchiveExports.o \
-  DllExports2.o \
-  ApmHandler.o \
-  ArjHandler.o \
-  Bz2Handler.o \
-  CpioHandler.o \
-  CramfsHandler.o \
-  DebHandler.o \
-  DeflateProps.o \
-  DmgHandler.o \
-  ElfHandler.o \
-  FatHandler.o \
-  FlvHandler.o \
-  GzHandler.o \
-  LzhHandler.o \
-  LzmaHandler.o \
-  MachoHandler.o \
-  MbrHandler.o \
-  MslzHandler.o \
-  MubHandler.o \
-  NtfsHandler.o \
-  PeHandler.o \
-  PpmdHandler.o \
-  RpmHandler.o \
-  SplitHandler.o \
-  SwfHandler.o \
-  SquashfsHandler.o \
-  VhdHandler.o \
-  XarHandler.o \
-  XzHandler.o \
-  ZHandler.o \
-
-AR_COMMON_OBJS = \
-  CoderMixer2.o \
-  CoderMixer2MT.o \
-  CrossThreadProgress.o \
-  DummyOutStream.o \
-  FindSignature.o \
-  InStreamWithCRC.o \
-  ItemNameUtils.o \
-  MultiStream.o \
-  OutStreamWithCRC.o \
-  OutStreamWithSha1.o \
-  HandlerOut.o \
-  ParseProperties.o \
-
-
-7Z_OBJS = \
-  7zCompressionMode.o \
-  7zDecode.o \
-  7zEncode.o \
-  7zExtract.o \
-  7zFolderInStream.o \
-  7zFolderOutStream.o \
-  7zHandler.o \
-  7zHandlerOut.o \
-  7zHeader.o \
-  7zIn.o \
-  7zOut.o \
-  7zProperties.o \
-  7zSpecStream.o \
-  7zUpdate.o \
-  7zRegister.o \
-
-CAB_OBJS = \
-  CabBlockInStream.o \
-  CabHandler.o \
-  CabHeader.o \
-  CabIn.o \
-  CabRegister.o \
-
-CHM_OBJS = \
-  ChmHandler.o \
-  ChmHeader.o \
-  ChmIn.o \
-  ChmRegister.o \
-
-COM_OBJS = \
-  ComHandler.o \
-  ComIn.o \
-  ComRegister.o \
-
-HFS_OBJS = \
-  HfsHandler.o \
-  HfsIn.o \
-  HfsRegister.o \
-
-ISO_OBJS = \
-  IsoHandler.o \
-  IsoHeader.o \
-  IsoIn.o \
-  IsoRegister.o \
-
-NSIS_OBJS = \
-  NsisDecode.o \
-  NsisHandler.o \
-  NsisIn.o \
-  NsisRegister.o \
-
-RAR_OBJS = \
-  RarHandler.o \
-  RarHeader.o \
-  RarIn.o \
-  RarItem.o \
-  RarVolumeInStream.o \
-  RarRegister.o \
-
-TAR_OBJS = \
-  TarHandler.o \
-  TarHandlerOut.o \
-  TarHeader.o \
-  TarIn.o \
-  TarOut.o \
-  TarUpdate.o \
-  TarRegister.o \
-
-UDF_OBJS = \
-  UdfHandler.o \
-  UdfIn.o \
-  UdfRegister.o \
-
-WIM_OBJS = \
-  WimHandler.o \
-  WimHandlerOut.o \
-  WimIn.o \
-  WimRegister.o \
-
-ZIP_OBJS = \
-  ZipAddCommon.o \
-  ZipHandler.o \
-  ZipHandlerOut.o \
-  ZipHeader.o \
-  ZipIn.o \
-  ZipItem.o \
-  ZipOut.o \
-  ZipUpdate.o \
-  ZipRegister.o \
-
-COMPRESS_OBJS = \
-  CodecExports.o \
-  ArjDecoder1.o \
-  ArjDecoder2.o \
-  Bcj2Coder.o \
-  Bcj2Register.o \
-  BcjCoder.o \
-  BcjRegister.o \
-  BitlDecoder.o \
-  BranchCoder.o \
-  BranchMisc.o \
-  BranchRegister.o \
-  ByteSwap.o \
-  BZip2Crc.o \
-  BZip2Decoder.o \
-  BZip2Encoder.o \
-  BZip2Register.o \
-  CopyCoder.o \
-  CopyRegister.o \
-  Deflate64Register.o \
-  DeflateDecoder.o \
-  DeflateEncoder.o \
-  DeflateRegister.o \
-  DeltaFilter.o \
-  Lzma2Decoder.o \
-  Lzma2Encoder.o \
-  Lzma2Register.o \
-  ImplodeDecoder.o \
-  ImplodeHuffmanDecoder.o \
-  LzhDecoder.o \
-  LzmaDecoder.o \
-  LzmaEncoder.o \
-  LzmaRegister.o \
-  LzOutWindow.o \
-  Lzx86Converter.o \
-  LzxDecoder.o \
-  PpmdDecoder.o \
-  PpmdEncoder.o \
-  PpmdRegister.o \
-  PpmdZip.o \
-  QuantumDecoder.o \
-  ShrinkDecoder.o \
-  ZlibDecoder.o \
-  ZlibEncoder.o \
-  ZDecoder.o \
-
-COMPRESS_OBJS_NON_FREE = \
-  Rar1Decoder.o \
-  Rar2Decoder.o \
-  Rar3Decoder.o \
-  Rar3Vm.o \
-  RarCodecsRegister.o \
-
-CRYPTO_OBJS = \
-  7zAes.o \
-  7zAesRegister.o \
-  HmacSha1.o \
-  MyAes.o \
-  Pbkdf2HmacSha1.o \
-  RandGen.o \
-  Rar20Crypto.o \
-  RarAes.o \
-  Sha1.o \
-  WzAes.o \
-  ZipCrypto.o \
-  ZipStrong.o \
-
-
-C_OBJS = \
-  7zBuf2.o \
-  7zStream.o \
-  Aes.o \
-  Alloc.o \
-  Bra.o \
-  Bra86.o \
-  BraIA64.o \
-  BwtSort.o \
-  Delta.o \
-  HuffEnc.o \
-  LzFind.o \
-  LzFindMt.o \
-  Lzma2Dec.o \
-  Lzma2Enc.o \
-  LzmaDec.o \
-  LzmaEnc.o \
-  MtCoder.o \
-  Ppmd7.o \
-  Ppmd7Dec.o \
-  Ppmd7Enc.o \
-  Ppmd8.o \
-  Ppmd8Dec.o \
-  Ppmd8Enc.o \
-  Sha256.o \
-  Sort.o \
-  Threads.o \
-  Xz.o \
-  XzCrc64.o \
-  XzDec.o \
-  XzEnc.o \
-  XzIn.o \
-
-
-OBJS = \
-  wine_date_and_time.o \
-  myGetTickCount.o \
-  $(COMMON_OBJS) \
-  $(WIN_OBJS) \
-  $(7ZIP_COMMON_OBJS) \
-  $(AR_OBJS) \
-  $(AR_COMMON_OBJS) \
-  $(7Z_OBJS) \
-  $(CAB_OBJS) \
-  $(CHM_OBJS) \
-  $(COM_OBJS) \
-  $(HFS_OBJS) \
-  $(ISO_OBJS) \
-  $(NSIS_OBJS) \
-  $(RAR_OBJS) \
-  $(TAR_OBJS) \
-  $(UDF_OBJS) \
-  $(WIM_OBJS) \
-  $(ZIP_OBJS) \
-  $(COMPRESS_OBJS) \
-  $(CRYPTO_OBJS) \
-  $(C_OBJS) \
-  $(OBJ_CRC32)  \
-
 include ../../../../makefile.glb