diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2007-04-17 04:00:00 +0400 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:15:50 +0300 |
| commit | a145bfc7cf17f7bbcfae8f0064333c8ea75b455c (patch) | |
| tree | 4ea458c9f35956fe080562989a702ea8c9af4b90 /CPP/7zip/Bundles | |
| parent | d9666cf046a8453b33b3e2fbf4d82295a9f87df3 (diff) | |
4.45 beta
Diffstat (limited to 'CPP/7zip/Bundles')
30 files changed, 4107 insertions, 2297 deletions
diff --git a/CPP/7zip/Bundles/Alone/Alone.dsp b/CPP/7zip/Bundles/Alone/Alone.dsp index 982cfb31..f7ceb6b8 100755 --- a/CPP/7zip/Bundles/Alone/Alone.dsp +++ b/CPP/7zip/Bundles/Alone/Alone.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "FORMAT_Z" /D "FORMAT_SPLIT" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_DEFLATE64" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "BREAK_HANDLER" /D "_7ZIP_LARGE_PAGES" /D "BENCH_MT" /Yu"StdAfx.h" /FD /c # ADD BASE RSC /l 0x419 /d "NDEBUG" # ADD RSC /l 0x419 /d "NDEBUG" BSC32=bscmake.exe @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "FORMAT_Z" /D "FORMAT_SPLIT" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_DEFLATE64" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /Yu"StdAfx.h" /FD /GZ /c +# ADD CPP /nologo /Gz /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "BREAK_HANDLER" /D "_7ZIP_LARGE_PAGES" /D "BENCH_MT" /Yu"StdAfx.h" /FD /GZ /c # ADD BASE RSC /l 0x419 /d "_DEBUG" # ADD RSC /l 0x419 /d "_DEBUG" BSC32=bscmake.exe @@ -94,7 +94,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_PAT" /D "COMPRESS_MF_BT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /Yu"StdAfx.h" /FD /c -# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "FORMAT_Z" /D "FORMAT_SPLIT" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_DEFLATE64" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "BREAK_HANDLER" /D "_7ZIP_LARGE_PAGES" /D "BENCH_MT" /Yu"StdAfx.h" /FD /c # ADD BASE RSC /l 0x419 /d "NDEBUG" # ADD RSC /l 0x419 /d "NDEBUG" BSC32=bscmake.exe @@ -121,7 +121,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_PAT" /D "COMPRESS_MF_BT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c -# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "FORMAT_Z" /D "FORMAT_SPLIT" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_DEFLATE64" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /Yu"StdAfx.h" /FD /GZ /c +# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "BREAK_HANDLER" /D "_7ZIP_LARGE_PAGES" /D "BENCH_MT" /Yu"StdAfx.h" /FD /GZ /c # ADD BASE RSC /l 0x419 /d "_DEBUG" # ADD RSC /l 0x419 /d "_DEBUG" BSC32=bscmake.exe @@ -245,14 +245,6 @@ SOURCE=..\..\..\Common\AlignedBuffer.h # End Source File # Begin Source File -SOURCE=..\..\..\Common\Alloc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.h -# End Source File -# Begin Source File - SOURCE=..\..\..\Common\AutoPtr.h # End Source File # Begin Source File @@ -277,10 +269,6 @@ SOURCE=..\..\..\Common\CRC.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Common\CRC.h -# End Source File -# Begin Source File - SOURCE=..\..\..\Common\Defs.h # End Source File # Begin Source File @@ -525,6 +513,14 @@ SOURCE=..\..\..\Windows\Time.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Common\CreateCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\CreateCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Archive\Common\CrossThreadProgress.cpp # End Source File # Begin Source File @@ -549,6 +545,14 @@ SOURCE=..\..\Common\FileStreams.h # End Source File # Begin Source File +SOURCE=..\..\Common\FilterCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\FilterCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\InBuffer.cpp # End Source File # Begin Source File @@ -601,6 +605,14 @@ SOURCE=..\..\Common\MemBlocks.cpp # End Source File # Begin Source File +SOURCE=..\..\Common\MethodId.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\MethodId.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\MSBFDecoder.h # End Source File # Begin Source File @@ -680,6 +692,30 @@ SOURCE=..\..\Common\StreamUtils.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Compress\Branch\ARM.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\ARM.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\ARMThumb.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\ARMThumb.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BCJ2Register.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BCJRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Compress\Branch\BranchCoder.cpp # End Source File # Begin Source File @@ -688,10 +724,38 @@ SOURCE=..\..\Compress\Branch\BranchCoder.h # End Source File # Begin Source File +SOURCE=..\..\Compress\Branch\BranchRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Compress\Branch\Coder.h # End Source File # Begin Source File +SOURCE=..\..\Compress\Branch\IA64.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\IA64.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\PPC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\PPC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\SPARC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\SPARC.h +# End Source File +# Begin Source File + SOURCE=..\..\Compress\Branch\x86.cpp !IF "$(CFG)" == "Alone - Win32 Release" @@ -802,6 +866,10 @@ SOURCE=..\..\Compress\BZip2\BZip2Encoder.cpp SOURCE=..\..\Compress\BZip2\BZip2Encoder.h # End Source File +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2Register.cpp +# End Source File # End Group # Begin Group "Copy" @@ -814,12 +882,20 @@ SOURCE=..\..\Compress\Copy\CopyCoder.cpp SOURCE=..\..\Compress\Copy\CopyCoder.h # End Source File +# Begin Source File + +SOURCE=..\..\Compress\Copy\CopyRegister.cpp +# End Source File # End Group # Begin Group "Deflate" # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Compress\Deflate\Deflate64Register.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Compress\Deflate\DeflateConst.h # End Source File # Begin Source File @@ -876,6 +952,10 @@ SOURCE=..\..\Compress\Deflate\DeflateEncoder.h SOURCE=..\..\Compress\Deflate\DeflateExtConst.h # End Source File +# Begin Source File + +SOURCE=..\..\Compress\Deflate\DeflateRegister.cpp +# End Source File # End Group # Begin Group "Huffman" @@ -1025,6 +1105,10 @@ SOURCE=..\..\Compress\LZMA\LZMAEncoder.cpp SOURCE=..\..\Compress\LZMA\LZMAEncoder.h # End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMARegister.cpp +# End Source File # End Group # Begin Group "PPMd" @@ -1093,6 +1177,10 @@ SOURCE=..\..\Compress\PPMD\PPMDEncoder.h # End Source File # Begin Source File +SOURCE=..\..\Compress\PPMD\PPMDRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Compress\PPMD\PPMDSubAlloc.h # End Source File # Begin Source File @@ -1232,6 +1320,26 @@ SOURCE=..\..\Compress\Quantum\QuantumDecoder.cpp SOURCE=..\..\Compress\Quantum\QuantumDecoder.h # End Source File # End Group +# Begin Group "LZMA_Alone" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\LZMA_Alone\LzmaBench.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA_Alone\LzmaBench.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA_Alone\LzmaBenchCon.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA_Alone\LzmaBenchCon.h +# End Source File +# End Group # End Group # Begin Group "Archive" @@ -1317,14 +1425,6 @@ SOURCE=..\..\Archive\7z\7zItem.h # End Source File # Begin Source File -SOURCE=..\..\Archive\7z\7zMethodID.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.h -# End Source File -# Begin Source File - SOURCE=..\..\Archive\7z\7zOut.cpp # End Source File # Begin Source File @@ -1341,6 +1441,10 @@ SOURCE=..\..\Archive\7z\7zProperties.h # End Source File # Begin Source File +SOURCE=..\..\Archive\7z\7zRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Archive\7z\7zSpecStream.cpp # End Source File # Begin Source File @@ -1361,6 +1465,10 @@ SOURCE=..\..\Archive\7z\7zUpdate.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Archive\BZip2\bz2Register.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Archive\BZip2\BZip2Handler.cpp # End Source File # Begin Source File @@ -1429,6 +1537,10 @@ SOURCE=..\..\Archive\GZip\GZipOut.h # End Source File # Begin Source File +SOURCE=..\..\Archive\GZip\GZipRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Archive\GZip\GZipUpdate.cpp # End Source File # Begin Source File @@ -1481,6 +1593,10 @@ SOURCE=..\..\Archive\Tar\TarOut.h # End Source File # Begin Source File +SOURCE=..\..\Archive\Tar\TarRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Archive\Tar\TarUpdate.cpp # End Source File # Begin Source File @@ -1553,6 +1669,10 @@ SOURCE=..\..\Archive\Zip\ZipOut.h # End Source File # Begin Source File +SOURCE=..\..\Archive\Zip\ZipRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Archive\Zip\ZipUpdate.cpp # End Source File # Begin Source File @@ -1565,6 +1685,10 @@ SOURCE=..\..\Archive\Zip\ZipUpdate.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Archive\Common\CoderLoader.h +# End Source File +# Begin Source File + SOURCE=..\..\Archive\Common\CoderMixer2.cpp # End Source File # Begin Source File @@ -1597,14 +1721,6 @@ SOURCE=..\..\Archive\Common\DummyOutStream.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Common\FilterCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.h -# End Source File -# Begin Source File - SOURCE=..\..\Archive\Common\InStreamWithCRC.cpp # End Source File # Begin Source File @@ -1655,6 +1771,10 @@ SOURCE=..\..\Archive\Split\SplitHandler.cpp SOURCE=..\..\Archive\Split\SplitHandler.h # End Source File +# Begin Source File + +SOURCE=..\..\Archive\Split\SplitRegister.cpp +# End Source File # End Group # Begin Group "Z Format" @@ -1667,6 +1787,10 @@ SOURCE=..\..\Archive\Z\ZHandler.cpp SOURCE=..\..\Archive\Z\ZHandler.h # End Source File +# Begin Source File + +SOURCE=..\..\Archive\Z\ZRegister.cpp +# End Source File # End Group # Begin Group "cab" @@ -1707,6 +1831,10 @@ SOURCE=..\..\Archive\Cab\CabIn.h SOURCE=..\..\Archive\Cab\CabItem.h # End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabRegister.cpp +# End Source File # End Group # End Group # Begin Group "UI Common" @@ -1738,14 +1866,6 @@ SOURCE=..\..\UI\Common\ArchiveOpenCallback.h # End Source File # Begin Source File -SOURCE=..\..\UI\Common\ArchiverInfo.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiverInfo.h -# End Source File -# Begin Source File - SOURCE=..\..\UI\Common\DefaultName.cpp # End Source File # Begin Source File @@ -1778,6 +1898,14 @@ SOURCE=..\..\UI\Common\ExtractingFilePath.h # End Source File # Begin Source File +SOURCE=..\..\UI\Common\LoadCodecs.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\UI\Common\LoadCodecs.h +# End Source File +# Begin Source File + SOURCE=..\..\UI\Common\OpenArchive.cpp # End Source File # Begin Source File @@ -2066,6 +2194,10 @@ SOURCE=..\..\Crypto\7zAES\7zAES.cpp SOURCE=..\..\Crypto\7zAES\7zAES.h # End Source File +# Begin Source File + +SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp +# End Source File # End Group # Begin Group "WzAES" @@ -2214,6 +2346,31 @@ SOURCE=..\..\PropID.h # Begin Group "C-Compress" # PROP Default_Filter "" +# Begin Group "C Lz" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\LzHash.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h +# End Source File +# End Group +# Begin Group "C Huffman" + +# PROP Default_Filter "" # Begin Source File SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.c @@ -2223,24 +2380,69 @@ SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.c SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.h # End Source File +# End Group +# Begin Group "C Branch" + +# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\LzHash.h +SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.c +SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c +SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h +SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.h # End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +# End Source File +# End Group # End Group # Begin Source File @@ -2253,6 +2455,15 @@ SOURCE=..\..\..\..\C\7zCrc.h # End Source File # Begin Source File +SOURCE=..\..\..\..\C\Alloc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.h +# End Source File +# Begin Source File + SOURCE=..\..\..\..\C\IStream.h # End Source File # Begin Source File diff --git a/CPP/7zip/Bundles/Alone/makefile b/CPP/7zip/Bundles/Alone/makefile index e076ed3a..eeec13a2 100755 --- a/CPP/7zip/Bundles/Alone/makefile +++ b/CPP/7zip/Bundles/Alone/makefile @@ -1,34 +1,14 @@ PROG = 7za.exe LIBS = $(LIBS) user32.lib oleaut32.lib Advapi32.lib -CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ - -DNO_REGISTRY \ +CFLAGS = $(CFLAGS) -I ../../../ \ -DWIN_LONG_PATH \ - -DFORMAT_7Z \ - -DFORMAT_BZIP2 \ - -DFORMAT_CAB \ - -DFORMAT_GZIP \ - -DFORMAT_SPLIT \ - -DFORMAT_TAR \ - -DFORMAT_Z \ - -DFORMAT_ZIP \ -DCOMPRESS_MT \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_BZIP2 \ -DCOMPRESS_BZIP2_MT \ - -DCOMPRESS_COPY \ - -DCOMPRESS_DEFLATE \ - -DCOMPRESS_DEFLATE64 \ - -DCOMPRESS_IMPLODE \ - -DCOMPRESS_LZMA \ -DCOMPRESS_MF_MT \ - -DCOMPRESS_PPMD \ - -DCRYPTO_7ZAES \ - -DCRYPTO_AES \ - -DCRYPTO_ZIP \ - + -D_7ZIP_LARGE_PAGES \ + -DBREAK_HANDLER \ + -DBENCH_MT \ CONSOLE_OBJS = \ $O\ConsoleClose.obj \ @@ -42,7 +22,6 @@ CONSOLE_OBJS = \ $O\UserInputUtils.obj \ COMMON_OBJS = \ - $O\Alloc.obj \ $O\CommandLineParser.obj \ $O\CRC.obj \ $O\IntToString.obj \ @@ -70,8 +49,10 @@ WIN_OBJS = \ $O\Synchronization.obj 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\FilePathAutoRename.obj \ $O\FileStreams.obj \ + $O\FilterCoder.obj \ $O\InBuffer.obj \ $O\InOutTempBuffer.obj \ $O\LimitedStreams.obj \ @@ -79,6 +60,7 @@ WIN_OBJS = \ $O\LSBFDecoder.obj \ $O\LSBFEncoder.obj \ $O\MemBlocks.obj \ + $O\MethodId.obj \ $O\OffsetStream.obj \ $O\OutBuffer.obj \ $O\OutMemStream.obj \ @@ -92,11 +74,11 @@ UI_COMMON_OBJS = \ $O\ArchiveCommandLine.obj \ $O\ArchiveExtractCallback.obj \ $O\ArchiveOpenCallback.obj \ - $O\ArchiverInfo.obj \ $O\DefaultName.obj \ $O\EnumDirItems.obj \ $O\Extract.obj \ $O\ExtractingFilePath.obj \ + $O\LoadCodecs.obj \ $O\OpenArchive.obj \ $O\PropIDUtils.obj \ $O\SetProperties.obj \ @@ -114,7 +96,6 @@ AR_COMMON_OBJS = \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ $O\DummyOutStream.obj \ - $O\FilterCoder.obj \ $O\InStreamWithCRC.obj \ $O\ItemNameUtils.obj \ $O\MultiStream.obj \ @@ -133,22 +114,24 @@ AR_COMMON_OBJS = \ $O\7zHandlerOut.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ $O\7zOut.obj \ $O\7zProperties.obj \ $O\7zSpecStream.obj \ $O\7zUpdate.obj \ + $O\7zRegister.obj \ BZ2_OBJS = \ $O\BZip2Handler.obj \ $O\BZip2HandlerOut.obj \ $O\BZip2Update.obj \ + $O\bz2Register.obj \ CAB_OBJS = \ $O\CabBlockInStream.obj \ $O\CabHandler.obj \ $O\CabHeader.obj \ $O\CabIn.obj \ + $O\CabRegister.obj \ GZ_OBJS = \ $O\GZipHandler.obj \ @@ -157,10 +140,12 @@ GZ_OBJS = \ $O\GZipIn.obj \ $O\GZipOut.obj \ $O\GZipUpdate.obj \ + $O\GZipRegister.obj \ SPLIT_OBJS = \ $O\SplitHandler.obj \ $O\SplitHandlerOut.obj \ + $O\SplitRegister.obj \ TAR_OBJS = \ $O\TarHandler.obj \ @@ -169,9 +154,11 @@ TAR_OBJS = \ $O\TarIn.obj \ $O\TarOut.obj \ $O\TarUpdate.obj \ + $O\TarRegister.obj \ Z_OBJS = \ $O\ZHandler.obj \ + $O\ZRegister.obj \ ZIP_OBJS = \ $O\ZipAddCommon.obj \ @@ -182,23 +169,43 @@ ZIP_OBJS = \ $O\ZipItem.obj \ $O\ZipOut.obj \ $O\ZipUpdate.obj \ + $O\ZipRegister.obj \ BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\ARM.obj \ + $O\ARMThumb.obj \ + $O\IA64.obj \ + $O\PPC.obj \ + $O\SPARC.obj \ + $O\BranchRegister.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +SWAP_OPT_OBJS = \ + $O\ByteSwap.obj \ + $O\ByteSwapRegister.obj \ BZIP2_OBJS = \ $O\BZip2CRC.obj \ + $O\BZip2Register.obj \ BZIP2_OPT_OBJS = \ $O\BZip2Decoder.obj \ $O\BZip2Encoder.obj \ +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ + DEFLATE_OPT_OBJS = \ $O\DeflateDecoder.obj \ $O\DeflateEncoder.obj \ + $O\DeflateRegister.obj \ + $O\Deflate64Register.obj \ LZ_OBJS = \ $O\LzOutWindow.obj \ @@ -206,6 +213,11 @@ LZ_OBJS = \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ $O\LZMAEncoder.obj \ + $O\LZMARegister.obj \ + +LZMA_BENCH_OBJS = \ + $O\LzmaBench.obj \ + $O\LzmaBenchCon.obj \ LZX_OBJS = \ $O\LzxDecoder.obj \ @@ -218,6 +230,7 @@ IMPLODE_OBJS = \ PPMD_OPT_OBJS = \ $O\PPMDDecoder.obj \ $O\PPMDEncoder.obj \ + $O\PPMDRegister.obj \ SHRINK_OBJS = \ $O\ShrinkDecoder.obj \ @@ -228,6 +241,7 @@ COMPRESS_Z_OBJS = \ 7ZAES_OPT_OBJS = \ $O\7zAES.obj \ + $O\7zAESRegister.obj \ AES_OPT_OBJS = \ $O\MyAES.obj \ @@ -252,7 +266,7 @@ CRYPTO_ZIP_OBJS = \ $O\ZipCrypto.obj \ C_OBJS = \ - $O\7zCrc.obj \ + $O\Alloc.obj \ $O\Sort.obj \ $O\Threads.obj \ @@ -260,11 +274,21 @@ C_LZ_OBJS = \ $O\MatchFinder.obj \ $O\MatchFinderMt.obj \ +C_BRANCH_OBJS = \ + $O\BranchARM.obj \ + $O\BranchARMThumb.obj \ + $O\BranchIA64.obj \ + $O\BranchPPC.obj \ + $O\BranchSPARC.obj \ + $O\BranchX86.obj \ + +!include "../../Crc2.mak" OBJS = \ $O\StdAfx.obj \ $(CONSOLE_OBJS) \ $(COMMON_OBJS) \ + $(COMMON_OBJS_O2) \ $(WIN_OBJS) \ $(7ZIP_COMMON_OBJS) \ $(UI_COMMON_OBJS) \ @@ -280,18 +304,21 @@ OBJS = \ $(BZIP2_OBJS) \ $(BZIP2_OPT_OBJS) \ $(BRANCH_OPT_OBJS) \ + $(SWAP_OPT_OBJS) \ + $(COPY_OBJS) \ $(DEFLATE_OPT_OBJS) \ $(IMPLODE_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ + $(LZMA_BENCH_OBJS) \ $(LZX_OBJS) \ $(PPMD_OPT_OBJS) \ $(SHRINK_OBJS) \ $(COMPRESS_Z_OBJS) \ $(C_OBJS) \ $(C_LZ_OBJS) \ + $(C_BRANCH_OBJS) \ $O\BlockSort.obj \ - $O\CopyCoder.obj \ $O\HuffmanEncode.obj \ $O\RangeCoderBit.obj \ $(7ZAES_OPT_OBJS) \ @@ -301,6 +328,7 @@ OBJS = \ $(CRYPTO_ZIP_OBJS) \ $(CRYPTO_WZAES_OBJS) \ $O\QuantumDecoder.obj \ + $(CRC_OBJS) \ $O\resource.res @@ -339,10 +367,14 @@ $(ZIP_OBJS): ../../Archive/Zip/$(*B).cpp $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL_O2) +$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp + $(COMPL_O2) $(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp $(COMPL) $(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp $(COMPL_O2) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp $(COMPL_O2) $(IMPLODE_OBJS): ../../Compress/Implode/$(*B).cpp @@ -351,6 +383,9 @@ $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp $(COMPL_O2) $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(COMPL_O2) +$(LZMA_BENCH_OBJS): ../../Compress/LZMA_Alone/$(*B).cpp + $(COMPL) + $(LZX_OBJS): ../../Compress/Lzx/$(*B).cpp $(COMPL_O2) $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp @@ -362,8 +397,6 @@ $(COMPRESS_Z_OBJS): ../../Compress/Z/$(*B).cpp $O\BlockSort.obj: ../../Compress/BWT/$(*B).cpp $(COMPL_O2) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp - $(COMPL) $O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp $(COMPL) $O\QuantumDecoder.obj: ../../Compress/Quantum/$(*B).cpp @@ -386,5 +419,8 @@ $(C_OBJS): ../../../../C/$(*B).c $(COMPL_O2) $(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) $O\HuffmanEncode.obj: ../../../../C/Compress/Huffman/$(*B).c $(COMPL_O2) +!include "../../Crc.mak"
\ No newline at end of file diff --git a/CPP/7zip/Bundles/Alone7z/Alone.dsp b/CPP/7zip/Bundles/Alone7z/Alone.dsp index 5ff71f2c..e0c46273 100755 --- a/CPP/7zip/Bundles/Alone7z/Alone.dsp +++ b/CPP/7zip/Bundles/Alone7z/Alone.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMFORMAT_SPLIT" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "_NO_CRYPTO" /D "BREAK_HANDLER" /D "BENCH_MT" /Yu"StdAfx.h" /FD /c # ADD BASE RSC /l 0x419 /d "NDEBUG" # ADD RSC /l 0x419 /d "NDEBUG" BSC32=bscmake.exe @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMFORMAT_SPLIT" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /Yu"StdAfx.h" /FD /GZ /c +# ADD CPP /nologo /Gz /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "_NO_CRYPTO" /D "BREAK_HANDLER" /D "BENCH_MT" /Yu"StdAfx.h" /FD /GZ /c # ADD BASE RSC /l 0x419 /d "_DEBUG" # ADD RSC /l 0x419 /d "_DEBUG" BSC32=bscmake.exe @@ -94,7 +94,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_PAT" /D "COMPRESS_MF_BT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /Yu"StdAfx.h" /FD /c -# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMFORMAT_SPLIT" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "_NO_CRYPTO" /D "BREAK_HANDLER" /D "BENCH_MT" /Yu"StdAfx.h" /FD /c # ADD BASE RSC /l 0x419 /d "NDEBUG" # ADD RSC /l 0x419 /d "NDEBUG" BSC32=bscmake.exe @@ -121,7 +121,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_PAT" /D "COMPRESS_MF_BT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c -# ADD CPP /nologo /Gz /W4 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMFORMAT_SPLIT" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /Yu"StdAfx.h" /FD /GZ /c +# ADD CPP /nologo /Gz /W4 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "_NO_CRYPTO" /D "BREAK_HANDLER" /D "BENCH_MT" /Yu"StdAfx.h" /FD /GZ /c # ADD BASE RSC /l 0x419 /d "_DEBUG" # ADD RSC /l 0x419 /d "_DEBUG" BSC32=bscmake.exe @@ -245,14 +245,6 @@ SOURCE=..\..\..\Common\AlignedBuffer.h # End Source File # Begin Source File -SOURCE=..\..\..\Common\Alloc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.h -# End Source File -# Begin Source File - SOURCE=..\..\..\Common\AutoPtr.h # End Source File # Begin Source File @@ -277,10 +269,6 @@ SOURCE=..\..\..\Common\CRC.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Common\CRC.h -# End Source File -# Begin Source File - SOURCE=..\..\..\Common\Defs.h # End Source File # Begin Source File @@ -525,6 +513,14 @@ SOURCE=..\..\..\Windows\Time.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Common\CreateCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\CreateCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Archive\Common\CrossThreadProgress.cpp # End Source File # Begin Source File @@ -549,6 +545,14 @@ SOURCE=..\..\Common\FileStreams.h # End Source File # Begin Source File +SOURCE=..\..\Common\FilterCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\FilterCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\InBuffer.cpp # End Source File # Begin Source File @@ -597,6 +601,14 @@ SOURCE=..\..\Common\LSBFEncoder.h # End Source File # Begin Source File +SOURCE=..\..\Common\MethodId.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\MethodId.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\MSBFDecoder.h # End Source File # Begin Source File @@ -637,6 +649,14 @@ SOURCE=..\..\Common\ProgressUtils.h # End Source File # Begin Source File +SOURCE=..\..\Common\RegisterArc.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\RegisterCodec.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\StreamBinder.cpp # End Source File # Begin Source File @@ -740,96 +760,16 @@ SOURCE=..\..\Compress\Copy\CopyCoder.cpp SOURCE=..\..\Compress\Copy\CopyCoder.h # End Source File -# End Group -# Begin Group "LZ" - -# PROP Default_Filter "" -# Begin Group "MT" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\LZ\MT\MT.cpp - -!IF "$(CFG)" == "Alone - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "Alone - Win32 Debug" - -!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "Alone - Win32 DebugU" - -!ENDIF - -# End Source File # Begin Source File -SOURCE=..\..\Compress\LZ\MT\MT.h +SOURCE=..\..\Compress\Copy\CopyRegister.cpp # End Source File # End Group -# Begin Group "HC" +# Begin Group "LZ" # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\Compress\LZ\HashChain\HC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\HashChain\HC2.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\HashChain\HC3.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\HashChain\HC4.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\HashChain\HC4b.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\HashChain\HCMain.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\Compress\LZ\IMatchFinder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\LZInWindow.cpp - -!IF "$(CFG)" == "Alone - Win32 Release" - -# ADD CPP /O1 - -!ELSEIF "$(CFG)" == "Alone - Win32 Debug" - -!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU" - -# ADD CPP /O1 - -!ELSEIF "$(CFG)" == "Alone - Win32 DebugU" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\LZInWindow.h -# End Source File -# Begin Source File - SOURCE=..\..\Compress\LZ\LZOutWindow.cpp !IF "$(CFG)" == "Alone - Win32 Release" @@ -909,6 +849,10 @@ SOURCE=..\..\Compress\LZMA\LZMAEncoder.cpp SOURCE=..\..\Compress\LZMA\LZMAEncoder.h # End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMARegister.cpp +# End Source File # End Group # Begin Group "RangeCoder" @@ -949,6 +893,26 @@ SOURCE=..\..\Compress\RangeCoder\RangeCoderBitTree.h SOURCE=..\..\Compress\RangeCoder\RangeCoderOpt.h # End Source File # End Group +# Begin Group "LZMA_Alone" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\LZMA_Alone\LzmaBench.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA_Alone\LzmaBench.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA_Alone\LzmaBenchCon.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA_Alone\LzmaBenchCon.h +# End Source File +# End Group # End Group # Begin Group "Archive" @@ -1034,14 +998,6 @@ SOURCE=..\..\Archive\7z\7zItem.h # End Source File # Begin Source File -SOURCE=..\..\Archive\7z\7zMethodID.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.h -# End Source File -# Begin Source File - SOURCE=..\..\Archive\7z\7zOut.cpp # End Source File # Begin Source File @@ -1058,6 +1014,10 @@ SOURCE=..\..\Archive\7z\7zProperties.h # End Source File # Begin Source File +SOURCE=..\..\Archive\7z\7zRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Archive\7z\7zSpecStream.cpp # End Source File # Begin Source File @@ -1110,14 +1070,6 @@ SOURCE=..\..\Archive\Common\DummyOutStream.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Common\FilterCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.h -# End Source File -# Begin Source File - SOURCE=..\..\Archive\Common\InStreamWithCRC.cpp # End Source File # Begin Source File @@ -1199,14 +1151,6 @@ SOURCE=..\..\UI\Common\ArchiveOpenCallback.h # End Source File # Begin Source File -SOURCE=..\..\UI\Common\ArchiverInfo.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiverInfo.h -# End Source File -# Begin Source File - SOURCE=..\..\UI\Common\DefaultName.cpp # End Source File # Begin Source File @@ -1239,6 +1183,14 @@ SOURCE=..\..\UI\Common\ExtractingFilePath.h # End Source File # Begin Source File +SOURCE=..\..\UI\Common\LoadCodecs.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\UI\Common\LoadCodecs.h +# End Source File +# Begin Source File + SOURCE=..\..\UI\Common\OpenArchive.cpp # End Source File # Begin Source File @@ -1354,5 +1306,128 @@ SOURCE=..\..\IStream.h SOURCE=..\..\PropID.h # End Source File # End Group +# Begin Group "C" + +# PROP Default_Filter "" +# Begin Group "C Branch" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\IStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\LzHash.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Threads.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Threads.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Types.h +# End Source File +# End Group # End Target # End Project diff --git a/CPP/7zip/Bundles/Alone7z/makefile b/CPP/7zip/Bundles/Alone7z/makefile index 9bec8059..4ae28d39 100755 --- a/CPP/7zip/Bundles/Alone7z/makefile +++ b/CPP/7zip/Bundles/Alone7z/makefile @@ -2,18 +2,13 @@ PROG = 7za.exe LIBS = $(LIBS) user32.lib oleaut32.lib Advapi32.lib CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ - -DNO_REGISTRY \ -D_NO_CRYPTO \ -DWIN_LONG_PATH \ - -DFORMAT_7Z \ -DCOMPRESS_MT \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_COPY \ - -DCOMPRESS_LZMA \ -DCOMPRESS_MF_MT \ - -D_NO_CRYPTO + -D_NO_CRYPTO \ + -DBREAK_HANDLER \ + -DBENCH_MT \ CONSOLE_OBJS = \ @@ -28,7 +23,6 @@ CONSOLE_OBJS = \ $O\UserInputUtils.obj \ COMMON_OBJS = \ - $O\Alloc.obj \ $O\CommandLineParser.obj \ $O\CRC.obj \ $O\IntToString.obj \ @@ -56,12 +50,15 @@ WIN_OBJS = \ $O\Synchronization.obj 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\FilePathAutoRename.obj \ $O\FileStreams.obj \ $O\InBuffer.obj \ $O\InOutTempBuffer.obj \ + $O\FilterCoder.obj \ $O\LimitedStreams.obj \ $O\LockedStream.obj \ + $O\MethodId.obj \ $O\OffsetStream.obj \ $O\OutBuffer.obj \ $O\ProgressUtils.obj \ @@ -73,11 +70,11 @@ UI_COMMON_OBJS = \ $O\ArchiveCommandLine.obj \ $O\ArchiveExtractCallback.obj \ $O\ArchiveOpenCallback.obj \ - $O\ArchiverInfo.obj \ $O\DefaultName.obj \ $O\EnumDirItems.obj \ $O\Extract.obj \ $O\ExtractingFilePath.obj \ + $O\LoadCodecs.obj \ $O\OpenArchive.obj \ $O\PropIDUtils.obj \ $O\SetProperties.obj \ @@ -95,7 +92,6 @@ AR_COMMON_OBJS = \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ $O\DummyOutStream.obj \ - $O\FilterCoder.obj \ $O\InStreamWithCRC.obj \ $O\ItemNameUtils.obj \ $O\MultiStream.obj \ @@ -114,9 +110,9 @@ AR_COMMON_OBJS = \ $O\7zHandlerOut.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ $O\7zOut.obj \ $O\7zProperties.obj \ + $O\7zRegister.obj \ $O\7zSpecStream.obj \ $O\7zUpdate.obj \ @@ -125,6 +121,22 @@ BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\ARM.obj \ + $O\ARMThumb.obj \ + $O\IA64.obj \ + $O\PPC.obj \ + $O\SPARC.obj \ + $O\BranchRegister.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +SWAP_OPT_OBJS = \ + $O\ByteSwap.obj \ + $O\ByteSwapRegister.obj \ + +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ LZ_OBJS = \ $O\LZOutWindow.obj \ @@ -132,8 +144,14 @@ LZ_OBJS = \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ $O\LZMAEncoder.obj \ + $O\LZMARegister.obj \ + +LZMA_BENCH_OBJS = \ + $O\LzmaBench.obj \ + $O\LzmaBenchCon.obj \ C_OBJS = \ + $O\Alloc.obj \ $O\7zCrc.obj \ $O\Sort.obj \ $O\Threads.obj \ @@ -142,6 +160,14 @@ C_LZ_OBJS = \ $O\MatchFinder.obj \ $O\MatchFinderMt.obj \ +C_BRANCH_OBJS = \ + $O\BranchARM.obj \ + $O\BranchARMThumb.obj \ + $O\BranchIA64.obj \ + $O\BranchPPC.obj \ + $O\BranchSPARC.obj \ + $O\BranchX86.obj \ + OBJS = \ $O\StdAfx.obj \ $(CONSOLE_OBJS) \ @@ -152,12 +178,16 @@ OBJS = \ $(AR_COMMON_OBJS) \ $(7Z_OBJS) \ $(BRANCH_OPT_OBJS) \ + $(SWAP_OPT_OBJS) \ + $(COPY_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ + $(LZMA_BENCH_OBJS) \ $(C_OBJS) \ $(C_LZ_OBJS) \ - $O\CopyCoder.obj \ + $(C_BRANCH_OBJS) \ $O\RangeCoderBit.obj \ + $(CRC_OBJS) \ $O\resource.res @@ -181,11 +211,15 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp $(COMPL) $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL_O2) +$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp + $(COMPL_O2) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp $(COMPL) $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(COMPL_O2) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp +$(LZMA_BENCH_OBJS): ../../Compress/LZMA_Alone/$(*B).cpp $(COMPL) $O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp $(COMPL) @@ -194,3 +228,5 @@ $(C_OBJS): ../../../../C/$(*B).c $(COMPL_O2) $(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) diff --git a/CPP/7zip/Bundles/Format7z/Format7z.dsp b/CPP/7zip/Bundles/Format7z/Format7z.dsp deleted file mode 100755 index a59cd581..00000000 --- a/CPP/7zip/Bundles/Format7z/Format7z.dsp +++ /dev/null @@ -1,1006 +0,0 @@ -# Microsoft Developer Studio Project File - Name="7z" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=7z - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Format7z.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Format7z.mak" CFG="7z - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "7z - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "7z - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "7z - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /YX /FD /c -# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE_DECODER" /D "COMPRESS_BZIP2_DECODER" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /Yu"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x419 /d "NDEBUG" -# ADD RSC /l 0x419 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"C:\Program Files\7-Zip\Formats\7za.dll" /opt:NOWIN98 -# SUBTRACT LINK32 /pdb:none /debug - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\SDK" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE_DECODER" /D "COMPRESS_BZIP2_DECODER" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /Yu"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x419 /d "_DEBUG" -# ADD RSC /l 0x419 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\7-Zip\Formats\7za.dll" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "7z - Win32 Release" -# Name "7z - Win32 Debug" -# Begin Group "Spec" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\7z\7z.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Archive.def -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\DllExports.cpp -# End Source File -# Begin Source File - -SOURCE=.\resource.rc -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"StdAfx.h" -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\IntToString.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\IntToString.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\NewHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\String.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\String.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringConvert.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringConvert.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringToInt.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringToInt.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Vector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Vector.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Wildcard.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Wildcard.h -# End Source File -# End Group -# Begin Group "Windows" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\Windows\FileDir.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileDir.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileFind.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileFind.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileIO.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileIO.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\PropVariant.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\PropVariant.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\Synchronization.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\Synchronization.h -# End Source File -# End Group -# Begin Group "Archive common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2MT.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2MT.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CrossThreadProgress.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CrossThreadProgress.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\InStreamWithCRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\InStreamWithCRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ItemNameUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ItemNameUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\OutStreamWithCRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\OutStreamWithCRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ParseProperties.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ParseProperties.h -# End Source File -# End Group -# Begin Group "Compress" - -# PROP Default_Filter "" -# Begin Group "LZ" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\LZ\LZOutWindow.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\LZOutWindow.h -# End Source File -# End Group -# Begin Group "PPMD" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDContext.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDDecode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDEncode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDEncoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDSubAlloc.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDType.h -# End Source File -# End Group -# Begin Group "Branch" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Branch\BranchCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\BranchCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86_2.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86_2.h -# End Source File -# End Group -# Begin Group "LZMA" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMA.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMADecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMAEncoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMAEncoder.h -# End Source File -# End Group -# Begin Group "Copy" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Copy\CopyCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Copy\CopyCoder.h -# End Source File -# End Group -# Begin Group "RangeCoder" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBitTree.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderOpt.h -# End Source File -# End Group -# Begin Group "Deflate" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Deflate\DeflateConst.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Deflate\DeflateDecoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Deflate\DeflateDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Deflate\DeflateExtConst.h -# End Source File -# End Group -# Begin Group "BZip2" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2Const.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2CRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2CRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2Decoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2Decoder.h -# End Source File -# End Group -# End Group -# Begin Group "Crypto" - -# PROP Default_Filter "" -# Begin Group "AES" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Crypto\AES\aes.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\AES_CBC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aescpp.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aescrypt.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aeskey.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aesopt.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aestab.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\MyAES.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\MyAES.h -# End Source File -# End Group -# Begin Group "7zAES" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Crypto\7zAES\7zAES.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\7zAES\7zAES.h -# End Source File -# End Group -# Begin Group "Hash" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Crypto\Hash\Sha256.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\Hash\Sha256.h -# End Source File -# End Group -# End Group -# Begin Group "7z" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\7z\7zCompressionMode.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zCompressionMode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zDecode.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zDecode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zEncode.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zEncode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zExtract.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderInStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderInStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderOutStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderOutStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHandlerOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHeader.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zItem.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethods.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zOut.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zProperties.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zProperties.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zSpecStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zSpecStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zUpdate.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zUpdate.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zUpdateItem.h -# End Source File -# End Group -# Begin Group "7zip Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Common\InBuffer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\InBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\InOutTempBuffer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\InOutTempBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LimitedStreams.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LimitedStreams.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LockedStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LockedStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LSBFDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LSBFDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OutBuffer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OutBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\ProgressUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\ProgressUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamBinder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamBinder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamObjects.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamObjects.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamUtils.h -# End Source File -# End Group -# Begin Group "C" - -# PROP Default_Filter "" -# Begin Group "C-Lz" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\..\C\Compress\Lz\LzHash.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\..\..\C\7zCrc.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\7zCrc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Threads.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Threads.h -# End Source File -# End Group -# End Target -# End Project diff --git a/CPP/7zip/Bundles/Format7z/makefile b/CPP/7zip/Bundles/Format7z/makefile index 1134faee..f74602ae 100755 --- a/CPP/7zip/Bundles/Format7z/makefile +++ b/CPP/7zip/Bundles/Format7z/makefile @@ -1,25 +1,14 @@ PROG = 7za.dll -DEF_FILE = ../../Archive/Archive.def +DEF_FILE = ../../Archive/Archive2.def LIBS = $(LIBS) user32.lib oleaut32.lib CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ - -DNO_REGISTRY \ - -DFORMAT_7Z \ -DCOMPRESS_MT \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_BZIP2_DECODER \ - -DCOMPRESS_BZIP2_MT \ - -DCOMPRESS_COPY \ - -DCOMPRESS_DEFLATE_DECODER \ - -DCOMPRESS_LZMA \ -DCOMPRESS_MF_MT \ - -DCOMPRESS_PPMD \ - -DCRYPTO_7ZAES \ - -DCRYPTO_AES \ + -DCOMPRESS_BZIP2_MT \ + -DDEFLATE_EXTRACT_ONLY \ + -DBZIP2_EXTRACT_ONLY \ COMMON_OBJS = \ - $O\Alloc.obj \ $O\CRC.obj \ $O\IntToString.obj \ $O\NewHandler.obj \ @@ -37,22 +26,28 @@ WIN_OBJS = \ $O\Synchronization.obj 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\InBuffer.obj \ $O\InOutTempBuffer.obj \ + $O\FilterCoder.obj \ $O\LimitedStreams.obj \ $O\LockedStream.obj \ $O\LSBFDecoder.obj \ + $O\MethodId.obj \ $O\OutBuffer.obj \ $O\ProgressUtils.obj \ $O\StreamBinder.obj \ $O\StreamObjects.obj \ $O\StreamUtils.obj \ +AR_OBJS = \ + $O\ArchiveExports.obj \ + $O\DllExports2.obj \ + AR_COMMON_OBJS = \ $O\CoderMixer2.obj \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ - $O\FilterCoder.obj \ $O\InStreamWithCRC.obj \ $O\ItemNameUtils.obj \ $O\OutStreamWithCRC.obj \ @@ -60,7 +55,6 @@ AR_COMMON_OBJS = \ 7Z_OBJS = \ - $O\DllExports.obj \ $O\7zCompressionMode.obj \ $O\7zDecode.obj \ $O\7zEncode.obj \ @@ -71,26 +65,47 @@ AR_COMMON_OBJS = \ $O\7zHandlerOut.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ $O\7zOut.obj \ $O\7zProperties.obj \ $O\7zSpecStream.obj \ $O\7zUpdate.obj \ + $O\7zRegister.obj \ +COMPRESS_OBJS = \ + $O\CodecExports.obj \ + BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\ARM.obj \ + $O\ARMThumb.obj \ + $O\IA64.obj \ + $O\PPC.obj \ + $O\SPARC.obj \ + $O\BranchRegister.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +SWAP_OPT_OBJS = \ + $O\ByteSwap.obj \ + $O\ByteSwapRegister.obj \ BZIP2_OBJS = \ $O\BZip2CRC.obj \ + $O\BZip2Register.obj \ BZIP2_OPT_OBJS = \ $O\BZip2Decoder.obj \ +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ + DEFLATE_OPT_OBJS = \ $O\DeflateDecoder.obj \ + $O\DeflateRegister.obj \ LZ_OBJS = \ $O\LZOutWindow.obj \ @@ -98,14 +113,17 @@ LZ_OBJS = \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ $O\LZMAEncoder.obj \ + $O\LZMARegister.obj \ PPMD_OPT_OBJS = \ $O\PPMDDecoder.obj \ $O\PPMDEncoder.obj \ + $O\PPMDRegister.obj \ 7ZAES_OPT_OBJS = \ $O\7zAES.obj \ + $O\7zAESRegister.obj \ AES_OPT_OBJS = \ $O\MyAES.obj \ @@ -119,36 +137,51 @@ CRYPTO_HASH_OBJS = \ $O\Sha256.obj \ C_OBJS = \ - $O\7zCrc.obj \ + $O\Alloc.obj \ $O\Threads.obj \ C_LZ_OBJS = \ $O\MatchFinder.obj \ $O\MatchFinderMt.obj \ +C_BRANCH_OBJS = \ + $O\BranchARM.obj \ + $O\BranchARMThumb.obj \ + $O\BranchIA64.obj \ + $O\BranchPPC.obj \ + $O\BranchSPARC.obj \ + $O\BranchX86.obj \ + +!include "../../Crc2.mak" + OBJS = \ $O\StdAfx.obj \ $(CONSOLE_OBJS) \ $(COMMON_OBJS) \ $(WIN_OBJS) \ $(7ZIP_COMMON_OBJS) \ + $(AR_OBJS) \ $(AR_COMMON_OBJS) \ $(7Z_OBJS) \ + $(COMPRESS_OBJS) \ + $(BRANCH_OPT_OBJS) \ + $(SWAP_OPT_OBJS) \ $(BZIP2_OBJS) \ $(BZIP2_OPT_OBJS) \ - $(BRANCH_OPT_OBJS) \ + $(COPY_OBJS) \ $(DEFLATE_OPT_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ $(PPMD_OPT_OBJS) \ $(C_OBJS) \ $(C_LZ_OBJS) \ - $O\CopyCoder.obj \ + $(C_BRANCH_OBJS) \ $O\RangeCoderBit.obj \ $(7ZAES_OPT_OBJS) \ $(AES_OPT_OBJS) \ $(AES_ORIG_OBJS) \ $(CRYPTO_HASH_OBJS) \ + $(CRC_OBJS) \ $O\resource.res @@ -160,18 +193,26 @@ $(WIN_OBJS): ../../../Windows/$(*B).cpp $(COMPL) $(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp $(COMPL) +$(AR_OBJS): ../../Archive/$(*B).cpp + $(COMPL) $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp $(COMPL) $(7Z_OBJS): ../../Archive/7z/$(*B).cpp $(COMPL) +$(COMPRESS_OBJS): ../../Compress/$(*B).cpp + $(COMPL) $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL_O2) +$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp + $(COMPL_O2) $(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp $(COMPL) $(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp $(COMPL_O2) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp $(COMPL_O2) $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp @@ -181,8 +222,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp $(COMPL_O2) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp - $(COMPL) $O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp $(COMPL) @@ -197,5 +236,9 @@ $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp $(C_OBJS): ../../../../C/$(*B).c $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) $(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c $(COMPL_O2) + +!include "../../Crc.mak" diff --git a/CPP/7zip/Bundles/Format7zExtract/Format7z.dsp b/CPP/7zip/Bundles/Format7zExtract/Format7z.dsp deleted file mode 100755 index d049d00c..00000000 --- a/CPP/7zip/Bundles/Format7zExtract/Format7z.dsp +++ /dev/null @@ -1,813 +0,0 @@ -# Microsoft Developer Studio Project File - Name="7z" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=7z - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Format7z.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Format7z.mak" CFG="7z - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "7z - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "7z - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "7z - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /YX /FD /c -# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "EXTRACT_ONLY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE_DECODER" /D "COMPRESS_BZIP2_DECODER" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /Yu"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x419 /d "NDEBUG" -# ADD RSC /l 0x419 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"C:\Program Files\7-Zip\Formats\7zxa.dll" /opt:NOWIN98 -# SUBTRACT LINK32 /pdb:none /debug - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\SDK" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "EXTRACT_ONLY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_MT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE_DECODER" /D "COMPRESS_BZIP2_DECODER" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /Yu"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x419 /d "_DEBUG" -# ADD RSC /l 0x419 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\7-Zip\Formats\7zxa.dll" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "7z - Win32 Release" -# Name "7z - Win32 Debug" -# Begin Group "Spec" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\7z\7z.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Archive.def -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\DllExports.cpp -# End Source File -# Begin Source File - -SOURCE=.\resource.rc -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"StdAfx.h" -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\IntToString.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\IntToString.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\NewHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\NewHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\String.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\String.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringConvert.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringConvert.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringToInt.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringToInt.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Vector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Vector.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Wildcard.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Wildcard.h -# End Source File -# End Group -# Begin Group "Windows" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\Windows\FileDir.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileDir.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileFind.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileFind.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileIO.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileIO.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\PropVariant.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\PropVariant.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\Synchronization.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\Synchronization.h -# End Source File -# End Group -# Begin Group "Archive common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2MT.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2MT.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CrossThreadProgress.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CrossThreadProgress.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ItemNameUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ItemNameUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\OutStreamWithCRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\OutStreamWithCRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ParseProperties.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ParseProperties.h -# End Source File -# End Group -# Begin Group "Compress" - -# PROP Default_Filter "" -# Begin Group "LZ" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\LZ\LZOutWindow.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\LZOutWindow.h -# End Source File -# End Group -# Begin Group "PPMD" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDContext.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDDecode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDSubAlloc.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PPMD\PPMDType.h -# End Source File -# End Group -# Begin Group "Branch" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Branch\BranchCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\BranchCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86_2.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86_2.h -# End Source File -# End Group -# Begin Group "LZMA" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMA.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMADecoder.h -# End Source File -# End Group -# Begin Group "Copy" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Copy\CopyCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Copy\CopyCoder.h -# End Source File -# End Group -# Begin Group "RangeCoder" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBitTree.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderOpt.h -# End Source File -# End Group -# Begin Group "Deflate" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Deflate\DeflateConst.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Deflate\DeflateDecoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Deflate\DeflateDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Deflate\DeflateExtConst.h -# End Source File -# End Group -# Begin Group "BZip2" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2Const.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2CRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2CRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2Decoder.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2\BZip2Decoder.h -# End Source File -# End Group -# End Group -# Begin Group "Crypto" - -# PROP Default_Filter "" -# Begin Group "AES" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Crypto\AES\aes.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\AES_CBC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aescpp.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aescrypt.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aeskey.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aesopt.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\aestab.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\MyAES.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\AES\MyAES.h -# End Source File -# End Group -# Begin Group "7zAES" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Crypto\7zAES\7zAES.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\7zAES\7zAES.h -# End Source File -# End Group -# Begin Group "Hash" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Crypto\Hash\Sha256.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\Hash\Sha256.h -# End Source File -# End Group -# End Group -# Begin Group "7z" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\7z\7zDecode.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zDecode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zExtract.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderOutStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderOutStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHeader.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zItem.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethods.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zProperties.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zProperties.h -# End Source File -# End Group -# Begin Group "7zip Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Common\InBuffer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\InBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LimitedStreams.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LimitedStreams.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LockedStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LockedStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LSBFDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LSBFDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OutBuffer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OutBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\ProgressUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\ProgressUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamBinder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamBinder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamObjects.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamObjects.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamUtils.h -# End Source File -# End Group -# End Target -# End Project diff --git a/CPP/7zip/Bundles/Format7zExtract/Format7z.dsw b/CPP/7zip/Bundles/Format7zExtract/Format7z.dsw deleted file mode 100755 index 324dab1f..00000000 --- a/CPP/7zip/Bundles/Format7zExtract/Format7z.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "7z"=.\Format7z.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile index e52ab019..a8549741 100755 --- a/CPP/7zip/Bundles/Format7zExtract/makefile +++ b/CPP/7zip/Bundles/Format7zExtract/makefile @@ -1,25 +1,12 @@ PROG = 7zxa.dll -DEF_FILE = ../../Archive/Archive.def +DEF_FILE = ../../Archive/Archive2.def LIBS = $(LIBS) user32.lib oleaut32.lib CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ - -DNO_REGISTRY \ -DEXTRACT_ONLY \ - -DFORMAT_7Z \ -DCOMPRESS_MT \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_BZIP2_DECODER \ -DCOMPRESS_BZIP2_MT \ - -DCOMPRESS_COPY \ - -DCOMPRESS_DEFLATE_DECODER \ - -DCOMPRESS_LZMA \ - -DCOMPRESS_PPMD \ - -DCRYPTO_7ZAES \ - -DCRYPTO_AES \ COMMON_OBJS = \ - $O\Alloc.obj \ $O\CRC.obj \ $O\IntToString.obj \ $O\NewHandler.obj \ @@ -37,29 +24,33 @@ WIN_OBJS = \ $O\Synchronization.obj 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\InBuffer.obj \ $O\InOutTempBuffer.obj \ + $O\FilterCoder.obj \ $O\LimitedStreams.obj \ $O\LockedStream.obj \ $O\LSBFDecoder.obj \ + $O\MethodId.obj \ $O\OutBuffer.obj \ $O\ProgressUtils.obj \ $O\StreamBinder.obj \ $O\StreamObjects.obj \ $O\StreamUtils.obj \ +AR_OBJS = \ + $O\ArchiveExports.obj \ + $O\DllExports2.obj \ + AR_COMMON_OBJS = \ $O\CoderMixer2.obj \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ - $O\FilterCoder.obj \ $O\ItemNameUtils.obj \ $O\OutStreamWithCRC.obj \ $O\ParseProperties.obj \ - 7Z_OBJS = \ - $O\DllExports.obj \ $O\7zCompressionMode.obj \ $O\7zDecode.obj \ $O\7zExtract.obj \ @@ -67,36 +58,60 @@ AR_COMMON_OBJS = \ $O\7zHandler.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ $O\7zProperties.obj \ + $O\7zRegister.obj \ + +COMPRESS_OBJS = \ + $O\CodecExports.obj \ BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\ARM.obj \ + $O\ARMThumb.obj \ + $O\IA64.obj \ + $O\PPC.obj \ + $O\SPARC.obj \ + $O\BranchRegister.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +SWAP_OPT_OBJS = \ + $O\ByteSwap.obj \ + $O\ByteSwapRegister.obj \ BZIP2_OBJS = \ $O\BZip2CRC.obj \ + $O\BZip2Register.obj \ BZIP2_OPT_OBJS = \ $O\BZip2Decoder.obj \ +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ + DEFLATE_OPT_OBJS = \ $O\DeflateDecoder.obj \ + $O\DeflateRegister.obj \ LZ_OBJS = \ $O\LZOutWindow.obj \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ + $O\LZMARegister.obj \ PPMD_OPT_OBJS = \ $O\PPMDDecoder.obj \ + $O\PPMDRegister.obj \ 7ZAES_OPT_OBJS = \ $O\7zAES.obj \ + $O\7zAESRegister.obj \ AES_OPT_OBJS = \ $O\MyAES.obj \ @@ -109,26 +124,45 @@ AES_ORIG_OBJS = \ CRYPTO_HASH_OBJS = \ $O\Sha256.obj \ +C_OBJS = \ + $O\Alloc.obj \ + +C_BRANCH_OBJS = \ + $O\BranchARM.obj \ + $O\BranchARMThumb.obj \ + $O\BranchIA64.obj \ + $O\BranchPPC.obj \ + $O\BranchSPARC.obj \ + $O\BranchX86.obj \ + +!include "../../Crc2.mak" + OBJS = \ $O\StdAfx.obj \ $(CONSOLE_OBJS) \ $(COMMON_OBJS) \ $(WIN_OBJS) \ $(7ZIP_COMMON_OBJS) \ + $(AR_OBJS) \ $(AR_COMMON_OBJS) \ $(7Z_OBJS) \ + $(COMPRESS_OBJS) \ + $(SWAP_OPT_OBJS) \ $(BZIP2_OBJS) \ $(BZIP2_OPT_OBJS) \ $(BRANCH_OPT_OBJS) \ + $(COPY_OBJS) \ $(DEFLATE_OPT_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ $(PPMD_OPT_OBJS) \ - $O\CopyCoder.obj \ $(7ZAES_OPT_OBJS) \ $(AES_OPT_OBJS) \ $(AES_ORIG_OBJS) \ $(CRYPTO_HASH_OBJS) \ + $(C_OBJS) \ + $(C_BRANCH_OBJS) \ + $(CRC_OBJS) \ $O\resource.res @@ -140,18 +174,26 @@ $(WIN_OBJS): ../../../Windows/$(*B).cpp $(COMPL) $(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp $(COMPL) +$(AR_OBJS): ../../Archive/$(*B).cpp + $(COMPL) $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp $(COMPL) $(7Z_OBJS): ../../Archive/7z/$(*B).cpp $(COMPL) +$(COMPRESS_OBJS): ../../Compress/$(*B).cpp + $(COMPL) $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL_O2) +$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp + $(COMPL_O2) $(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp $(COMPL) $(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp $(COMPL_O2) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp $(COMPL_O2) $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp @@ -161,9 +203,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp $(COMPL_O2) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp - $(COMPL) - $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp $(COMPL_O2) $(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c @@ -172,3 +211,9 @@ $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp $(COMPL_O2) $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp $(COMPL_O2) +$(C_OBJS): ../../../../C/$(*B).c + $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) + +!include "../../Crc.mak" diff --git a/CPP/7zip/Bundles/Format7zExtractR/makefile b/CPP/7zip/Bundles/Format7zExtractR/makefile index b8bfde85..17a836dc 100755 --- a/CPP/7zip/Bundles/Format7zExtractR/makefile +++ b/CPP/7zip/Bundles/Format7zExtractR/makefile @@ -1,20 +1,12 @@ PROG = 7zxr.dll -DEF_FILE = ../../Archive/Archive.def +DEF_FILE = ../../Archive/Archive2.def LIBS = $(LIBS) user32.lib oleaut32.lib CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ - -DNO_REGISTRY \ -DEXTRACT_ONLY \ - -DFORMAT_7Z \ -DCOMPRESS_MT \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_COPY \ - -DCOMPRESS_LZMA \ -D_NO_CRYPTO COMMON_OBJS = \ - $O\Alloc.obj \ $O\CRC.obj \ $O\IntToString.obj \ $O\NewHandler.obj \ @@ -32,28 +24,33 @@ WIN_OBJS = \ $O\Synchronization.obj 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\InBuffer.obj \ $O\InOutTempBuffer.obj \ + $O\FilterCoder.obj \ $O\LimitedStreams.obj \ $O\LockedStream.obj \ + $O\MethodId.obj \ $O\OutBuffer.obj \ $O\ProgressUtils.obj \ $O\StreamBinder.obj \ $O\StreamObjects.obj \ $O\StreamUtils.obj \ +AR_OBJS = \ + $O\ArchiveExports.obj \ + $O\DllExports2.obj \ + AR_COMMON_OBJS = \ $O\CoderMixer2.obj \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ - $O\FilterCoder.obj \ $O\ItemNameUtils.obj \ $O\OutStreamWithCRC.obj \ $O\ParseProperties.obj \ 7Z_OBJS = \ - $O\DllExports.obj \ $O\7zCompressionMode.obj \ $O\7zDecode.obj \ $O\7zExtract.obj \ @@ -61,21 +58,52 @@ AR_COMMON_OBJS = \ $O\7zHandler.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ $O\7zProperties.obj \ + $O\7zRegister.obj \ + +COMPRESS_OBJS = \ + $O\CodecExports.obj \ + +SWAP_OPT_OBJS = \ + $O\ByteSwap.obj \ + $O\ByteSwapRegister.obj \ BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\ARM.obj \ + $O\ARMThumb.obj \ + $O\IA64.obj \ + $O\PPC.obj \ + $O\SPARC.obj \ + $O\BranchRegister.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ LZ_OBJS = \ $O\LZOutWindow.obj \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ + $O\LZMARegister.obj \ + +C_OBJS = \ + $O\Alloc.obj \ + $O\7zCrc.obj +C_BRANCH_OBJS = \ + $O\BranchARM.obj \ + $O\BranchARMThumb.obj \ + $O\BranchIA64.obj \ + $O\BranchPPC.obj \ + $O\BranchSPARC.obj \ + $O\BranchX86.obj \ OBJS = \ $O\StdAfx.obj \ @@ -83,12 +111,17 @@ OBJS = \ $(COMMON_OBJS) \ $(WIN_OBJS) \ $(7ZIP_COMMON_OBJS) \ + $(AR_OBJS) \ $(AR_COMMON_OBJS) \ $(7Z_OBJS) \ + $(COMPRESS_OBJS) \ $(BRANCH_OPT_OBJS) \ + $(SWAP_OPT_OBJS) \ + $(COPY_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ - $O\CopyCoder.obj \ + $(C_OBJS) \ + $(C_BRANCH_OBJS) \ $O\resource.res @@ -100,18 +133,28 @@ $(WIN_OBJS): ../../../Windows/$(*B).cpp $(COMPL) $(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp $(COMPL) +$(AR_OBJS): ../../Archive/$(*B).cpp + $(COMPL) $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp $(COMPL) $(7Z_OBJS): ../../Archive/7z/$(*B).cpp $(COMPL) +$(COMPRESS_OBJS): ../../Compress/$(*B).cpp + $(COMPL) $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL_O2) +$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp + $(COMPL_O2) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp $(COMPL) $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(COMPL_O2) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp - $(COMPL) +$(C_OBJS): ../../../../C/$(*B).c + $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) diff --git a/CPP/7zip/Bundles/Format7zF/Format7z.dsp b/CPP/7zip/Bundles/Format7zF/Format7z.dsp new file mode 100755 index 00000000..164fc24b --- /dev/null +++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsp @@ -0,0 +1,2350 @@ +# Microsoft Developer Studio Project File - Name="7z" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=7z - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Format7z.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "Format7z.mak" CFG="7z - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "7z - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "7z - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "7z - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 1 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /YX /FD /c +# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "NO_REGISTRY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "EXTERNAL_CODECS" /D "_7ZIP_LARGE_PAGES" /Yu"StdAfx.h" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x419 /d "NDEBUG" +# ADD RSC /l 0x419 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"C:\Program Files\7-Zip\7z.dll" /opt:NOWIN98 +# SUBTRACT LINK32 /pdb:none /debug + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 1 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\SDK" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "NO_REGISTRY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "EXTERNAL_CODECS" /D "_7ZIP_LARGE_PAGES" /Yu"StdAfx.h" /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x419 /d "_DEBUG" +# ADD RSC /l 0x419 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\7-Zip\7z.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "7z - Win32 Release" +# Name "7z - Win32 Debug" +# Begin Group "Spec" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\7z\7z.ico +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Archive2.def +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\ArchiveExports.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\CodecExports.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\DllExports2.cpp +# End Source File +# Begin Source File + +SOURCE=.\resource.rc +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.cpp +# ADD CPP /Yc"StdAfx.h" +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.h +# End Source File +# End Group +# Begin Group "Common" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\Common\CRC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\IntToString.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\IntToString.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\NewHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\String.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\String.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\StringConvert.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\StringConvert.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\StringToInt.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\StringToInt.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\UTFConvert.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\UTFConvert.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\Vector.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\Vector.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\Wildcard.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\Wildcard.h +# End Source File +# End Group +# Begin Group "Windows" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\Windows\FileDir.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\FileDir.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\FileFind.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\FileFind.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\FileIO.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\FileIO.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\PropVariant.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\PropVariant.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\Synchronization.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Windows\Synchronization.h +# End Source File +# End Group +# Begin Group "Compress" + +# PROP Default_Filter "" +# Begin Group "LZ" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\LZ\LZOutWindow.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZ\LZOutWindow.h +# End Source File +# End Group +# Begin Group "PPMD" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDContext.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDDecode.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDDecoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDEncode.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDEncoder.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDEncoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDSubAlloc.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDType.h +# End Source File +# End Group +# Begin Group "Branch" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Branch\ARM.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\ARM.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\ARMThumb.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\ARMThumb.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BCJ2Register.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BCJRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BranchCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BranchCoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BranchRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\IA64.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\IA64.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\PPC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\PPC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\SPARC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\SPARC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\x86.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\x86.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\x86_2.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\x86_2.h +# End Source File +# End Group +# Begin Group "LZMA" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMA.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMADecoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMAEncoder.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMAEncoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMARegister.cpp +# End Source File +# End Group +# Begin Group "Copy" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Copy\CopyCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Copy\CopyCoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Copy\CopyRegister.cpp +# End Source File +# End Group +# Begin Group "RangeCoder" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\RangeCoder\RangeCoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\RangeCoder\RangeCoderBitTree.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\RangeCoder\RangeCoderOpt.h +# End Source File +# End Group +# Begin Group "Deflate" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Deflate\Deflate64Register.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Deflate\DeflateConst.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Deflate\DeflateDecoder.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Deflate\DeflateDecoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Deflate\DeflateEncoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Deflate\DeflateEncoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Deflate\DeflateNsisRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Deflate\DeflateRegister.cpp +# End Source File +# End Group +# Begin Group "BZip2" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2Const.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2CRC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2CRC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2Decoder.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2Decoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2Encoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2Encoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BZip2\BZip2Register.cpp +# End Source File +# End Group +# Begin Group "Rar Codecs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Rar\Rar1Decoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Rar\Rar1Decoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Rar\Rar2Decoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Rar\Rar2Decoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Rar\Rar3Decoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Rar\Rar3Decoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Rar\Rar3Vm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Rar\Rar3Vm.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Rar\RarCodecsRegister.cpp +# End Source File +# End Group +# Begin Group "BWT" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\BWT\BlockSort.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BWT\BlockSort.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\BWT\Mtf8.h +# End Source File +# End Group +# Begin Group "Implode" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Implode\ImplodeDecoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Implode\ImplodeDecoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Implode\ImplodeHuffmanDecoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Implode\ImplodeHuffmanDecoder.h +# End Source File +# End Group +# Begin Group "Lzx" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Lzx\Lzx.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Lzx\Lzx86Converter.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Lzx\Lzx86Converter.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Lzx\LzxDecoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Lzx\LzxDecoder.h +# End Source File +# End Group +# Begin Group "Z Codec" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Z\ZDecoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Z\ZDecoder.h +# End Source File +# End Group +# Begin Group "Arj Codecs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Arj\ArjDecoder1.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Arj\ArjDecoder1.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Arj\ArjDecoder2.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Arj\ArjDecoder2.h +# End Source File +# End Group +# Begin Group "ByteSwap" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\ByteSwap\ByteSwap.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\ByteSwap\ByteSwap.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\ByteSwap\ByteSwapRegister.cpp +# End Source File +# End Group +# Begin Group "Shrink" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Shrink\ShrinkDecoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Shrink\ShrinkDecoder.h +# End Source File +# End Group +# Begin Group "Quantum" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Quantum\QuantumDecoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Quantum\QuantumDecoder.h +# End Source File +# End Group +# Begin Group "Lzh Codecs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Compress\Lzh\Lzh1Decoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Lzh\Lzh1Decoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Lzh\LzhDecoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Lzh\LzhDecoder.h +# End Source File +# End Group +# End Group +# Begin Group "Crypto" + +# PROP Default_Filter "" +# Begin Group "AES" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Crypto\AES\aes.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\AES\AES_CBC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\AES\aescpp.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\AES\aescrypt.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\AES\aeskey.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\AES\aesopt.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\AES\aestab.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\AES\MyAES.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\AES\MyAES.h +# End Source File +# End Group +# Begin Group "7zAES" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Crypto\7zAES\7zAES.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\7zAES\7zAES.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp +# End Source File +# End Group +# Begin Group "Hash" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Crypto\Hash\HmacSha1.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\HmacSha1.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\Pbkdf2HmacSha1.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\Pbkdf2HmacSha1.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\RandGen.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\RandGen.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\Sha1.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\Sha1.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\Sha256.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Hash\Sha256.h +# End Source File +# End Group +# Begin Group "RarAES" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Crypto\RarAES\RarAES.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\RarAES\RarAES.h +# End Source File +# End Group +# Begin Group "RarCrypto" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Crypto\Rar20\Rar20Cipher.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Rar20\Rar20Cipher.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Rar20\Rar20Crypto.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Rar20\Rar20Crypto.h +# End Source File +# End Group +# Begin Group "WzAES" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Crypto\WzAES\WzAES.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\WzAES\WzAES.h +# End Source File +# End Group +# Begin Group "ZipCrypto" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Crypto\Zip\ZipCipher.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Zip\ZipCipher.h +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Zip\ZipCrypto.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Crypto\Zip\ZipCrypto.h +# End Source File +# End Group +# End Group +# Begin Group "7zip Common" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Common\CreateCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\CreateCoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\FilterCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\FilterCoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\InBuffer.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\InBuffer.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\InOutTempBuffer.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\InOutTempBuffer.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\LimitedStreams.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\LimitedStreams.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\LockedStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\LockedStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\LSBFDecoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\LSBFDecoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\LSBFEncoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\LSBFEncoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\MemBlocks.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\MemBlocks.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\MethodId.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\MethodId.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\OffsetStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\OffsetStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\OutBuffer.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\OutBuffer.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\OutMemStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\OutMemStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\ProgressMt.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\ProgressMt.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\ProgressUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\ProgressUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\RegisterArc.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\RegisterCodec.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StreamBinder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StreamBinder.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StreamObjects.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StreamObjects.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StreamUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StreamUtils.h +# End Source File +# End Group +# Begin Group "C" + +# PROP Default_Filter "" +# Begin Group "Compress C" + +# PROP Default_Filter "" +# Begin Group "C-Lz" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\LzHash.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h +# End Source File +# End Group +# Begin Group "Huffman" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.h +# End Source File +# End Group +# Begin Group "C Branch" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +# End Source File +# End Group +# End Group +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\IStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Sort.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Sort.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Threads.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Threads.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Types.h +# End Source File +# End Group +# Begin Group "Archive" + +# PROP Default_Filter "" +# Begin Group "7z" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\7z\7zCompressionMode.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zCompressionMode.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zDecode.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zDecode.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zEncode.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zEncode.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zExtract.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zFolderInStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zFolderInStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zFolderOutStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zFolderOutStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zHandlerOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zOut.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zProperties.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zProperties.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zSpecStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zSpecStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zUpdate.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zUpdate.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\7z\7zUpdateItem.h +# End Source File +# End Group +# Begin Group "Rar" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarItem.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarVolumeInStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Rar\RarVolumeInStream.h +# End Source File +# End Group +# Begin Group "Arj" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Arj\ArjHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Arj\ArjHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Arj\ArjHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Arj\ArjIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Arj\ArjIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Arj\ArjItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Arj\ArjRegister.cpp +# End Source File +# End Group +# Begin Group "bz2" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\BZip2\bz2Register.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\BZip2\BZip2Handler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\BZip2\BZip2Handler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\BZip2\BZip2HandlerOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\BZip2\BZip2Item.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\BZip2\BZip2Update.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\BZip2\BZip2Update.h +# End Source File +# End Group +# Begin Group "Cab" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabBlockInStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabBlockInStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cab\CabRegister.cpp +# End Source File +# End Group +# Begin Group "Chm" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Chm\ChmHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Chm\ChmHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Chm\ChmHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Chm\ChmHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Chm\ChmIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Chm\ChmIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Chm\ChmRegister.cpp +# End Source File +# End Group +# Begin Group "Archive common" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Common\CoderMixer2.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\CoderMixer2.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\CoderMixer2MT.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\CoderMixer2MT.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\CrossThreadProgress.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\CrossThreadProgress.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\DummyOutStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\DummyOutStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\InStreamWithCRC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\InStreamWithCRC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\ItemNameUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\ItemNameUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\MultiStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\MultiStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\OutStreamWithCRC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\OutStreamWithCRC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\ParseProperties.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Common\ParseProperties.h +# End Source File +# End Group +# Begin Group "Cpio" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Cpio\CpioHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cpio\CpioHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cpio\CpioHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cpio\CpioHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cpio\CpioIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cpio\CpioIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cpio\CpioItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Cpio\CpioRegister.cpp +# End Source File +# End Group +# Begin Group "Deb" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Deb\DebHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Deb\DebHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Deb\DebHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Deb\DebHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Deb\DebIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Deb\DebIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Deb\DebItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Deb\DebRegister.cpp +# End Source File +# End Group +# Begin Group "GZip" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipHandlerOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipOut.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipUpdate.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\GZip\GZipUpdate.h +# End Source File +# End Group +# Begin Group "Iso" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Iso\IsoHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Iso\IsoHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Iso\IsoHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Iso\IsoHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Iso\IsoIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Iso\IsoIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Iso\IsoItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Iso\IsoRegister.cpp +# End Source File +# End Group +# Begin Group "Lzh" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhCRC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhCRC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhOutStreamWithCRC.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhOutStreamWithCRC.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Lzh\LzhRegister.cpp +# End Source File +# End Group +# Begin Group "Nsis" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Nsis\NsisDecode.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Nsis\NsisDecode.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Nsis\NsisHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Nsis\NsisHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Nsis\NsisIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Nsis\NsisIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Nsis\NsisRegister.cpp +# End Source File +# End Group +# Begin Group "RPM" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\RPM\RpmHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\RPM\RpmHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\RPM\RpmHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\RPM\RpmIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\RPM\RpmIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\RPM\RpmRegister.cpp +# End Source File +# End Group +# Begin Group "Split" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Split\SplitHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Split\SplitHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Split\SplitHandlerOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Split\SplitRegister.cpp +# End Source File +# End Group +# Begin Group "Tar" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarHandlerOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarOut.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarUpdate.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Tar\TarUpdate.h +# End Source File +# End Group +# Begin Group "Z" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Z\ZHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Z\ZHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Z\ZRegister.cpp +# End Source File +# End Group +# Begin Group "Zip" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipAddCommon.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipAddCommon.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipCompressionMode.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipHandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipHandlerOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipHeader.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipHeader.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipIn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipIn.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipItem.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipItem.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipItemEx.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipOut.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipOut.h +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipRegister.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipUpdate.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Archive\Zip\ZipUpdate.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\Archive\IArchive.h +# End Source File +# End Group +# Begin Group "7zip" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\ICoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\IPassword.h +# End Source File +# Begin Source File + +SOURCE=..\..\IProgress.h +# End Source File +# End Group +# End Target +# End Project diff --git a/CPP/7zip/Bundles/Format7z/Format7z.dsw b/CPP/7zip/Bundles/Format7zF/Format7z.dsw index 324dab1f..324dab1f 100755 --- a/CPP/7zip/Bundles/Format7z/Format7z.dsw +++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsw diff --git a/CPP/7zip/Bundles/Format7zF/StdAfx.cpp b/CPP/7zip/Bundles/Format7zF/StdAfx.cpp new file mode 100755 index 00000000..d0feea85 --- /dev/null +++ b/CPP/7zip/Bundles/Format7zF/StdAfx.cpp @@ -0,0 +1,3 @@ +// StdAfx.cpp + +#include "StdAfx.h" diff --git a/CPP/7zip/Bundles/Format7zF/StdAfx.h b/CPP/7zip/Bundles/Format7zF/StdAfx.h new file mode 100755 index 00000000..2e4be10b --- /dev/null +++ b/CPP/7zip/Bundles/Format7zF/StdAfx.h @@ -0,0 +1,9 @@ +// StdAfx.h + +#ifndef __STDAFX_H +#define __STDAFX_H + +#include "../../../Common/MyWindows.h" +#include "../../../Common/NewHandler.h" + +#endif diff --git a/CPP/7zip/Bundles/Format7zF/makefile b/CPP/7zip/Bundles/Format7zF/makefile new file mode 100755 index 00000000..52554f24 --- /dev/null +++ b/CPP/7zip/Bundles/Format7zF/makefile @@ -0,0 +1,498 @@ +PROG = 7z.dll +DEF_FILE = ../../Archive/Archive2.def +LIBS = $(LIBS) user32.lib oleaut32.lib +CFLAGS = $(CFLAGS) -I ../../../ \ + -DEXTERNAL_CODECS \ + -DCOMPRESS_MT \ + -DCOMPRESS_BZIP2_MT \ + -DCOMPRESS_MF_MT \ + -D_7ZIP_LARGE_PAGES \ + +COMMON_OBJS = \ + $O\CRC.obj \ + $O\IntToString.obj \ + $O\NewHandler.obj \ + $O\String.obj \ + $O\StringConvert.obj \ + $O\StringToInt.obj \ + $O\Vector.obj \ + $O\UTFConvert.obj \ + $O\Wildcard.obj \ + +WIN_OBJS = \ + $O\FileDir.obj \ + $O\FileFind.obj \ + $O\FileIO.obj \ + $O\PropVariant.obj \ + $O\Synchronization.obj + +7ZIP_COMMON_OBJS = \ + $O\InBuffer.obj \ + $O\InOutTempBuffer.obj \ + $O\CreateCoder.obj \ + $O\FilterCoder.obj \ + $O\LimitedStreams.obj \ + $O\LockedStream.obj \ + $O\LSBFDecoder.obj \ + $O\LSBFEncoder.obj \ + $O\MethodId.obj \ + $O\MemBlocks.obj \ + $O\OffsetStream.obj \ + $O\OutBuffer.obj \ + $O\OutMemStream.obj \ + $O\ProgressMt.obj \ + $O\ProgressUtils.obj \ + $O\StreamBinder.obj \ + $O\StreamObjects.obj \ + $O\StreamUtils.obj \ + +AR_OBJS = \ + $O\ArchiveExports.obj \ + $O\DllExports2.obj \ + +AR_COMMON_OBJS = \ + $O\CoderMixer2.obj \ + $O\CoderMixer2MT.obj \ + $O\CrossThreadProgress.obj \ + $O\DummyOutStream.obj \ + $O\InStreamWithCRC.obj \ + $O\ItemNameUtils.obj \ + $O\MultiStream.obj \ + $O\OutStreamWithCRC.obj \ + $O\ParseProperties.obj \ + + +7Z_OBJS = \ + $O\7zCompressionMode.obj \ + $O\7zDecode.obj \ + $O\7zEncode.obj \ + $O\7zExtract.obj \ + $O\7zFolderInStream.obj \ + $O\7zFolderOutStream.obj \ + $O\7zHandler.obj \ + $O\7zHandlerOut.obj \ + $O\7zHeader.obj \ + $O\7zIn.obj \ + $O\7zOut.obj \ + $O\7zProperties.obj \ + $O\7zSpecStream.obj \ + $O\7zUpdate.obj \ + $O\7zRegister.obj \ + +ARJ_OBJS = \ + $O\ArjHandler.obj \ + $O\ArjIn.obj \ + $O\ArjRegister.obj \ + +BZ2_OBJS = \ + $O\BZip2Handler.obj \ + $O\BZip2HandlerOut.obj \ + $O\BZip2Update.obj \ + $O\bz2Register.obj \ + +CAB_OBJS = \ + $O\CabBlockInStream.obj \ + $O\CabHandler.obj \ + $O\CabHeader.obj \ + $O\CabIn.obj \ + $O\CabRegister.obj \ + +CHM_OBJS = \ + $O\ChmHandler.obj \ + $O\ChmHeader.obj \ + $O\ChmIn.obj \ + $O\ChmRegister.obj \ + +CPIO_OBJS = \ + $O\CpioHandler.obj \ + $O\CpioHeader.obj \ + $O\CpioIn.obj \ + $O\CpioRegister.obj \ + +DEB_OBJS = \ + $O\DebHandler.obj \ + $O\DebHeader.obj \ + $O\DebIn.obj \ + $O\DebRegister.obj \ + +GZ_OBJS = \ + $O\GZipHandler.obj \ + $O\GZipHandlerOut.obj \ + $O\GZipHeader.obj \ + $O\GZipIn.obj \ + $O\GZipOut.obj \ + $O\GZipUpdate.obj \ + $O\GZipRegister.obj \ + +ISO_OBJS = \ + $O\IsoHandler.obj \ + $O\IsoHeader.obj \ + $O\IsoIn.obj \ + $O\IsoRegister.obj \ + +LZH_OBJS = \ + $O\LzhCRC.obj \ + $O\LzhHandler.obj \ + $O\LzhIn.obj \ + $O\LzhOutStreamWithCRC.obj \ + $O\LzhRegister.obj \ + +NSIS_OBJS = \ + $O\NsisDecode.obj \ + $O\NsisHandler.obj \ + $O\NsisIn.obj \ + $O\NsisRegister.obj \ + +RAR_OBJS = \ + $O\RarHandler.obj \ + $O\RarHeader.obj \ + $O\RarIn.obj \ + $O\RarItem.obj \ + $O\RarVolumeInStream.obj \ + $O\RarRegister.obj \ + +RPM_OBJS = \ + $O\RpmHandler.obj \ + $O\RpmIn.obj \ + $O\RpmRegister.obj \ + +SPLIT_OBJS = \ + $O\SplitHandler.obj \ + $O\SplitHandlerOut.obj \ + $O\SplitRegister.obj \ + +TAR_OBJS = \ + $O\TarHandler.obj \ + $O\TarHandlerOut.obj \ + $O\TarHeader.obj \ + $O\TarIn.obj \ + $O\TarOut.obj \ + $O\TarUpdate.obj \ + $O\TarRegister.obj \ + +Z_OBJS = \ + $O\ZHandler.obj \ + $O\ZRegister.obj \ + +ZIP_OBJS = \ + $O\ZipAddCommon.obj \ + $O\ZipHandler.obj \ + $O\ZipHandlerOut.obj \ + $O\ZipHeader.obj \ + $O\ZipIn.obj \ + $O\ZipItem.obj \ + $O\ZipOut.obj \ + $O\ZipUpdate.obj \ + $O\ZipRegister.obj \ + +COMPRESS_OBJS = \ + $O\CodecExports.obj \ + +BRANCH_OPT_OBJS = \ + $O\BranchCoder.obj \ + $O\BranchRegister.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + $O\x86.obj \ + $O\x86_2.obj \ + $O\ARM.obj \ + $O\ARMThumb.obj \ + $O\IA64.obj \ + $O\PPC.obj \ + $O\SPARC.obj \ + +SWAP_OPT_OBJS = \ + $O\ByteSwap.obj \ + $O\ByteSwapRegister.obj \ + +BZIP2_OBJS = \ + $O\BZip2CRC.obj \ + $O\BZip2Register.obj \ + +BZIP2_OPT_OBJS = \ + $O\BZip2Decoder.obj \ + $O\BZip2Encoder.obj \ + +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ + +DEFLATE_OPT_OBJS = \ + $O\DeflateDecoder.obj \ + $O\DeflateEncoder.obj \ + $O\DeflateRegister.obj \ + $O\Deflate64Register.obj \ + $O\DeflateNsisRegister.obj \ + +IMPLODE_OBJS = \ + $O\ImplodeDecoder.obj \ + $O\ImplodeHuffmanDecoder.obj \ + +LZ_OBJS = \ + $O\LZOutWindow.obj \ + +LZMA_OPT_OBJS = \ + $O\LZMADecoder.obj \ + $O\LZMAEncoder.obj \ + $O\LZMARegister.obj \ + +LZX_OBJS = \ + $O\LzxDecoder.obj \ + $O\Lzx86Converter.obj \ + +PPMD_OPT_OBJS = \ + $O\PPMDDecoder.obj \ + $O\PPMDEncoder.obj \ + $O\PPMDRegister.obj \ + +RAR29_OPT_OBJS = \ + $O\Rar1Decoder.obj \ + $O\Rar2Decoder.obj \ + $O\Rar3Decoder.obj \ + $O\Rar3Vm.obj \ + $O\RarCodecsRegister.obj \ + +SHRINK_OBJS = \ + $O\ShrinkDecoder.obj \ + +COMPRESS_ARJ_OBJS = \ + $O\ArjDecoder1.obj \ + $O\ArjDecoder2.obj \ + +COMPRESS_LZH_OBJS = \ + $O\LzhDecoder.obj \ + +COMPRESS_Z_OBJS = \ + $O\ZDecoder.obj \ + +7ZAES_OPT_OBJS = \ + $O\7zAES.obj \ + $O\7zAESRegister.obj \ + +AES_OPT_OBJS = \ + $O\MyAES.obj \ + +AES_ORIG_OBJS = \ + $O\aescrypt.obj \ + $O\aeskey.obj \ + $O\aestab.obj \ + +CRYPTO_HASH_OBJS = \ + $O\HmacSha1.obj \ + $O\Pbkdf2HmacSha1.obj \ + $O\RandGen.obj \ + $O\Sha1.obj \ + $O\Sha256.obj \ + +CRYPTO_WZAES_OBJS = \ + $O\WzAES.obj \ + +CRYPTO_ZIP_OBJS = \ + $O\ZipCipher.obj \ + $O\ZipCrypto.obj \ + +CRYPTO_RAR20_OBJS = \ + $O\Rar20Cipher.obj \ + $O\Rar20Crypto.obj \ + +CRYPTO_RARAES_OBJS = \ + $O\RarAES.obj \ + + +C_OBJS = \ + $O\Alloc.obj \ + $O\Threads.obj \ + $O\Sort.obj \ + +C_LZ_OBJS = \ + $O\MatchFinder.obj \ + $O\MatchFinderMt.obj \ + +C_BRANCH_OBJS = \ + $O\BranchARM.obj \ + $O\BranchARMThumb.obj \ + $O\BranchIA64.obj \ + $O\BranchPPC.obj \ + $O\BranchSPARC.obj \ + $O\BranchX86.obj \ + +!include "../../Crc2.mak" + +OBJS = \ + $O\StdAfx.obj \ + $(CONSOLE_OBJS) \ + $(COMMON_OBJS) \ + $(WIN_OBJS) \ + $(7ZIP_COMMON_OBJS) \ + $(AR_OBJS) \ + $(AR_COMMON_OBJS) \ + $(7Z_OBJS) \ + $(ARJ_OBJS) \ + $(BZ2_OBJS) \ + $(CAB_OBJS) \ + $(CHM_OBJS) \ + $(CPIO_OBJS) \ + $(DEB_OBJS) \ + $(GZ_OBJS) \ + $(ISO_OBJS) \ + $(LZH_OBJS) \ + $(NSIS_OBJS) \ + $(RAR_OBJS) \ + $(RPM_OBJS) \ + $(SPLIT_OBJS) \ + $(TAR_OBJS) \ + $(Z_OBJS) \ + $(ZIP_OBJS) \ + $(BZIP2_OBJS) \ + $(BZIP2_OPT_OBJS) \ + $(COMPRESS_OBJS) \ + $(BRANCH_OPT_OBJS) \ + $(SWAP_OPT_OBJS) \ + $(COPY_OBJS) \ + $(DEFLATE_OPT_OBJS) \ + $(IMPLODE_OBJS) \ + $(LZ_OBJS) \ + $(LZMA_OPT_OBJS) \ + $(LZX_OBJS) \ + $(PPMD_OPT_OBJS) \ + $(RAR29_OPT_OBJS) \ + $(SHRINK_OBJS) \ + $(COMPRESS_ARJ_OBJS) \ + $(COMPRESS_LZH_OBJS) \ + $(COMPRESS_Z_OBJS) \ + $O\QuantumDecoder.obj \ + $(C_OBJS) \ + $(C_LZ_OBJS) \ + $(C_BRANCH_OBJS) \ + $O\HuffmanEncode.obj \ + $O\BlockSort.obj \ + $O\RangeCoderBit.obj \ + $(7ZAES_OPT_OBJS) \ + $(AES_OPT_OBJS) \ + $(AES_ORIG_OBJS) \ + $(CRYPTO_ZIP_OBJS) \ + $(CRYPTO_WZAES_OBJS) \ + $(CRYPTO_HASH_OBJS) \ + $(CRYPTO_RAR20_OBJS) \ + $(CRYPTO_RARAES_OBJS) \ + $(CRC_OBJS) \ + $O\resource.res + + +!include "../../../Build.mak" + +$(COMMON_OBJS): ../../../Common/$(*B).cpp + $(COMPL) +$(WIN_OBJS): ../../../Windows/$(*B).cpp + $(COMPL) +$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp + $(COMPL) +$(AR_OBJS): ../../Archive/$(*B).cpp + $(COMPL) +$(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp + $(COMPL) + +$(7Z_OBJS): ../../Archive/7z/$(*B).cpp + $(COMPL) +$(ARJ_OBJS): ../../Archive/Arj/$(*B).cpp + $(COMPL) +$(BZ2_OBJS): ../../Archive/BZip2/$(*B).cpp + $(COMPL) +$(CAB_OBJS): ../../Archive/Cab/$(*B).cpp + $(COMPL) +$(CHM_OBJS): ../../Archive/Chm/$(*B).cpp + $(COMPL) +$(CPIO_OBJS): ../../Archive/Cpio/$(*B).cpp + $(COMPL) +$(DEB_OBJS): ../../Archive/Deb/$(*B).cpp + $(COMPL) +$(GZ_OBJS): ../../Archive/GZip/$(*B).cpp + $(COMPL) +$(ISO_OBJS): ../../Archive/Iso/$(*B).cpp + $(COMPL) +$(LZH_OBJS): ../../Archive/Lzh/$(*B).cpp + $(COMPL) +$(NSIS_OBJS): ../../Archive/Nsis/$(*B).cpp + $(COMPL) +$(RAR_OBJS): ../../Archive/Rar/$(*B).cpp + $(COMPL) +$(RPM_OBJS): ../../Archive/Rpm/$(*B).cpp + $(COMPL) +$(SPLIT_OBJS): ../../Archive/Split/$(*B).cpp + $(COMPL) +$(TAR_OBJS): ../../Archive/Tar/$(*B).cpp + $(COMPL) +$(Z_OBJS): ../../Archive/Z/$(*B).cpp + $(COMPL) +$(ZIP_OBJS): ../../Archive/Zip/$(*B).cpp + $(COMPL) + +$(COMPRESS_OBJS): ../../Compress/$(*B).cpp + $(COMPL) +$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp + $(COMPL_O2) +$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp + $(COMPL_O2) +$(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp + $(COMPL) +$(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp + $(COMPL_O2) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) +$(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp + $(COMPL_O2) +$(IMPLODE_OBJS): ../../Compress/Implode/$(*B).cpp + $(COMPL) +$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp + $(COMPL) +$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp + $(COMPL_O2) +$(LZX_OBJS): ../../Compress/Lzx/$(*B).cpp + $(COMPL_O2) +$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp + $(COMPL_O2) +$(RAR29_OPT_OBJS): ../../Compress/Rar/$(*B).cpp + $(COMPL_O2) +$(SHRINK_OBJS): ../../Compress/Shrink/$(*B).cpp + $(COMPL) +$(COMPRESS_ARJ_OBJS): ../../Compress/Arj/$(*B).cpp + $(COMPL) +$(COMPRESS_LZH_OBJS): ../../Compress/Lzh/$(*B).cpp + $(COMPL) +$(COMPRESS_Z_OBJS): ../../Compress/Z/$(*B).cpp + $(COMPL) +$O\QuantumDecoder.obj: ../../Compress/Quantum/$(*B).cpp + $(COMPL) + +$O\BlockSort.obj: ../../Compress/BWT/$(*B).cpp + $(COMPL_O2) +$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp + $(COMPL) + +$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp + $(COMPL_O2) +$(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c + $(COMPL_O2_W3) +$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp + $(COMPL_O2) +$(CRYPTO_ZIP_OBJS): ../../Crypto/Zip/$(*B).cpp + $(COMPL) +$(CRYPTO_WZAES_OBJS): ../../Crypto/WzAES/$(*B).cpp + $(COMPL_O2) +$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp + $(COMPL_O2) +$(CRYPTO_RAR20_OBJS): ../../Crypto/Rar20/$(*B).cpp + $(COMPL) +$(CRYPTO_RARAES_OBJS): ../../Crypto/RarAES/$(*B).cpp + $(COMPL) + +$(C_OBJS): ../../../../C/$(*B).c + $(COMPL_O2) +$(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c + $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) +$O\HuffmanEncode.obj: ../../../../C/Compress/Huffman/$(*B).c + $(COMPL_O2) + +!include "../../Crc.mak" diff --git a/CPP/7zip/Bundles/Format7zF/resource.rc b/CPP/7zip/Bundles/Format7zF/resource.rc new file mode 100755 index 00000000..9bf56129 --- /dev/null +++ b/CPP/7zip/Bundles/Format7zF/resource.rc @@ -0,0 +1,26 @@ +#include "../../MyVersionInfo.rc" + +MY_VERSION_INFO_DLL("7z Standalone Plugin", "7za") + + +0 ICON "../../Archive/7z/7z.ico" +1 ICON "../../Archive/Zip/zip.ico" +2 ICON "../../Archive/BZip2/bz2.ico" +3 ICON "../../Archive/Rar/rar.ico" +4 ICON "../../Archive/Arj/arj.ico" +5 ICON "../../Archive/Z/z.ico" +6 ICON "../../Archive/Lzh/lzh.ico" +7 ICON "../../Archive/Cab/cab.ico" +8 ICON "../../Archive/Iso/iso.ico" +9 ICON "../../Archive/Split/split.ico" +10 ICON "../../Archive/RPM/rpm.ico" +11 ICON "../../Archive/Deb/deb.ico" +12 ICON "../../Archive/Cpio/cpio.ico" +13 ICON "../../Archive/Tar/tar.ico" +14 ICON "../../Archive/GZip/gz.ico" + + +STRINGTABLE +BEGIN + 100 "7z:0 zip:1 bz2:2 bzip2:2 tbz2:2 tbz:2 rar:3 arj:4 z:5 taz:5 lzh:6 lha:6 cab:7 iso:8 split:9 rpm:10 deb:11 cpio:12 tar:13 gz:14 gzip:14 tgz:14 tpz:14" +END diff --git a/CPP/7zip/Bundles/Format7zR/makefile b/CPP/7zip/Bundles/Format7zR/makefile index d3cc3d55..3175e7f2 100755 --- a/CPP/7zip/Bundles/Format7zR/makefile +++ b/CPP/7zip/Bundles/Format7zR/makefile @@ -1,20 +1,12 @@ PROG = 7zra.dll -DEF_FILE = ../../Archive/Archive.def +DEF_FILE = ../../Archive/Archive2.def LIBS = $(LIBS) user32.lib oleaut32.lib CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ - -DNO_REGISTRY \ - -DFORMAT_7Z \ -DCOMPRESS_MT \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_COPY \ - -DCOMPRESS_LZMA \ -DCOMPRESS_MF_MT \ -D_NO_CRYPTO COMMON_OBJS = \ - $O\Alloc.obj \ $O\CRC.obj \ $O\IntToString.obj \ $O\NewHandler.obj \ @@ -32,21 +24,27 @@ WIN_OBJS = \ $O\Synchronization.obj 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\InBuffer.obj \ $O\InOutTempBuffer.obj \ + $O\FilterCoder.obj \ $O\LimitedStreams.obj \ $O\LockedStream.obj \ + $O\MethodId.obj \ $O\OutBuffer.obj \ $O\ProgressUtils.obj \ $O\StreamBinder.obj \ $O\StreamObjects.obj \ $O\StreamUtils.obj \ +AR_OBJS = \ + $O\ArchiveExports.obj \ + $O\DllExports2.obj \ + AR_COMMON_OBJS = \ $O\CoderMixer2.obj \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ - $O\FilterCoder.obj \ $O\InStreamWithCRC.obj \ $O\ItemNameUtils.obj \ $O\OutStreamWithCRC.obj \ @@ -54,7 +52,6 @@ AR_COMMON_OBJS = \ 7Z_OBJS = \ - $O\DllExports.obj \ $O\7zCompressionMode.obj \ $O\7zDecode.obj \ $O\7zEncode.obj \ @@ -65,17 +62,36 @@ AR_COMMON_OBJS = \ $O\7zHandlerOut.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ $O\7zOut.obj \ $O\7zProperties.obj \ $O\7zSpecStream.obj \ $O\7zUpdate.obj \ + $O\7zRegister.obj \ +COMPRESS_OBJS = \ + $O\CodecExports.obj \ + BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\ARM.obj \ + $O\ARMThumb.obj \ + $O\IA64.obj \ + $O\PPC.obj \ + $O\SPARC.obj \ + $O\BranchRegister.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +SWAP_OPT_OBJS = \ + $O\ByteSwap.obj \ + $O\ByteSwapRegister.obj \ + +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ LZ_OBJS = \ $O\LZOutWindow.obj \ @@ -83,8 +99,10 @@ LZ_OBJS = \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ $O\LZMAEncoder.obj \ + $O\LZMARegister.obj \ C_OBJS = \ + $O\Alloc.obj \ $O\7zCrc.obj \ $O\Sort.obj \ $O\Threads.obj \ @@ -93,24 +111,36 @@ C_LZ_OBJS = \ $O\MatchFinder.obj \ $O\MatchFinderMt.obj \ +C_BRANCH_OBJS = \ + $O\BranchARM.obj \ + $O\BranchARMThumb.obj \ + $O\BranchIA64.obj \ + $O\BranchPPC.obj \ + $O\BranchSPARC.obj \ + $O\BranchX86.obj \ + OBJS = \ $O\StdAfx.obj \ $(CONSOLE_OBJS) \ $(COMMON_OBJS) \ $(WIN_OBJS) \ $(7ZIP_COMMON_OBJS) \ + $(AR_OBJS) \ $(AR_COMMON_OBJS) \ $(7Z_OBJS) \ $(BZIP2_OBJS) \ $(BZIP2_OPT_OBJS) \ + $(COMPRESS_OBJS) \ $(BRANCH_OPT_OBJS) \ + $(SWAP_OPT_OBJS) \ + $(COPY_OBJS) \ $(DEFLATE_OPT_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ $(PPMD_OPT_OBJS) \ $(C_OBJS) \ $(C_LZ_OBJS) \ - $O\CopyCoder.obj \ + $(C_BRANCH_OBJS) \ $O\RangeCoderBit.obj \ $(7ZAES_OPT_OBJS) \ $(AES_OPT_OBJS) \ @@ -127,20 +157,26 @@ $(WIN_OBJS): ../../../Windows/$(*B).cpp $(COMPL) $(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp $(COMPL) +$(AR_OBJS): ../../Archive/$(*B).cpp + $(COMPL) $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp $(COMPL) $(7Z_OBJS): ../../Archive/7z/$(*B).cpp $(COMPL) +$(COMPRESS_OBJS): ../../Compress/$(*B).cpp + $(COMPL) $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL_O2) +$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp + $(COMPL_O2) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp $(COMPL) $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(COMPL_O2) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp - $(COMPL) $O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp $(COMPL) @@ -148,3 +184,5 @@ $(C_OBJS): ../../../../C/$(*B).c $(COMPL_O2) $(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) diff --git a/CPP/7zip/Bundles/SFXCon/Main.cpp b/CPP/7zip/Bundles/SFXCon/Main.cpp index 65ed8931..97efd2b8 100755 --- a/CPP/7zip/Bundles/SFXCon/Main.cpp +++ b/CPP/7zip/Bundles/SFXCon/Main.cpp @@ -66,7 +66,7 @@ enum EEnum kNonRecursed, }; } - +/* static const char kRecursedIDChar = 'R'; static const wchar_t *kRecursedPostCharSet = L"0-"; @@ -83,7 +83,7 @@ static const char kImmediateNameID = '!'; static const char kSomeCludePostStringMinSize = 2; // at least <@|!><N>ame must be static const char kSomeCludeAfterRecursedPostStringMinSize = 2; // at least <@|!><N>ame must be - +*/ static const CSwitchForm kSwitchForms[kNumSwitches] = { { L"?", NSwitchType::kSimple, false }, @@ -120,12 +120,12 @@ static const NRecursedType::EEnum kCommandRecursedDefault[kNumCommandForms] = NRecursedType::kRecursed }; -static const bool kTestExtractRecursedDefault = true; -static const bool kAddRecursedDefault = false; +// static const bool kTestExtractRecursedDefault = true; +// static const bool kAddRecursedDefault = false; static const int kMaxCmdLineSize = 1000; static const wchar_t *kUniversalWildcard = L"*"; -static const int kMinNonSwitchWords = 1; +// static const int kMinNonSwitchWords = 1; static const int kCommandIndex = 0; static const char *kHelpString = @@ -146,13 +146,13 @@ static const char *kHelpString = // exception messages static const char *kUserErrorMessage = "Incorrect command line"; // NExitCode::kUserError -static const char *kIncorrectListFile = "Incorrect wildcard in listfile"; +// static const char *kIncorrectListFile = "Incorrect wildcard in listfile"; static const char *kIncorrectWildCardInCommandLine = "Incorrect wildcard in command line"; // static const CSysString kFileIsNotArchiveMessageBefore = "File \""; // static const CSysString kFileIsNotArchiveMessageAfter = "\" is not archive"; -static const char *kProcessArchiveMessage = " archive: "; +// static const char *kProcessArchiveMessage = " archive: "; static const char *kCantFindSFX = " cannot find sfx"; @@ -353,6 +353,19 @@ int Main2( v2.Add(archiveName); const NWildcard::CCensorNode &wildcardCensorHead = wildcardCensor.Pairs.Front().Head; + + CCodecs *codecs = new CCodecs; + CMyComPtr< + #ifdef EXTERNAL_CODECS + ICompressCodecsInfo + #else + IUnknown + #endif + > compressCodecsInfo = codecs; + HRESULT result = codecs->Load(); + if (result != S_OK) + throw CSystemException(result); + if(command.CommandType != NCommandType::kList) { CExtractCallbackConsole *ecs = new CExtractCallbackConsole; @@ -379,6 +392,7 @@ int Main2( UString errorMessage; HRESULT result = DecompressArchives( + codecs, v1, v2, wildcardCensorHead, eo, &openCallback, ecs, errorMessage); @@ -403,6 +417,7 @@ int Main2( else { HRESULT result = ListArchives( + codecs, v1, v2, wildcardCensorHead, true, false, diff --git a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp index 5b61dae3..17ffd0df 100755 --- a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp +++ b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "COMPRESS_BCJ2" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_COPY" /D "COMPRESS_PPMD" /D "_SFX" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "COMPRESS_BCJ2" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "EXTRACT_ONLY" /D "_SFX" /D "NO_READ_FROM_CODER" /Yu"StdAfx.h" /FD /c # ADD BASE RSC /l 0x419 /d "NDEBUG" # ADD RSC /l 0x419 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_COPY" /D "COMPRESS_PPMD" /D "_SFX" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /Yu"StdAfx.h" /FD /GZ /c +# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "EXTRACT_ONLY" /D "_SFX" /D "NO_READ_FROM_CODER" /Yu"StdAfx.h" /FD /GZ /c # ADD BASE RSC /l 0x419 /d "_DEBUG" # ADD RSC /l 0x419 /d "_DEBUG" BSC32=bscmake.exe @@ -141,14 +141,6 @@ SOURCE=..\..\Archive\Common\CrossThreadProgress.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Common\FilterCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.h -# End Source File -# Begin Source File - SOURCE=..\..\Archive\Common\ItemNameUtils.cpp # End Source File # Begin Source File @@ -265,11 +257,7 @@ SOURCE=..\..\Archive\7z\7zItem.h # End Source File # Begin Source File -SOURCE=..\..\Archive\7z\7zMethodID.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.h +SOURCE=..\..\Archive\7z\7zRegister.cpp # End Source File # End Group # Begin Group "Compress" @@ -282,12 +270,24 @@ SOURCE=..\..\Archive\7z\7zMethodID.h SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp # End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMARegister.cpp +# End Source File # End Group # Begin Group "Branch" # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Compress\Branch\BCJ2Register.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BCJRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Compress\Branch\BranchCoder.cpp # End Source File # Begin Source File @@ -310,6 +310,10 @@ SOURCE=..\..\Compress\Branch\x86_2.cpp SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp # End Source File +# Begin Source File + +SOURCE=..\..\Compress\PPMD\PPMDRegister.cpp +# End Source File # End Group # Begin Group "LZ" @@ -334,6 +338,10 @@ SOURCE=..\..\Compress\Copy\CopyCoder.cpp SOURCE=..\..\Compress\Copy\CopyCoder.h # End Source File +# Begin Source File + +SOURCE=..\..\Compress\Copy\CopyRegister.cpp +# End Source File # End Group # End Group # Begin Group "Crypto" @@ -350,6 +358,10 @@ SOURCE=..\..\Crypto\7zAES\7zAES.cpp SOURCE=..\..\Crypto\7zAES\7zAES.h # End Source File +# Begin Source File + +SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp +# End Source File # End Group # Begin Group "AES" @@ -411,10 +423,6 @@ SOURCE=..\..\Crypto\Hash\Sha256.h # End Source File # End Group # End Group -# Begin Group "SDK" - -# PROP Default_Filter "" -# End Group # Begin Group "Windows" # PROP Default_Filter "" @@ -488,14 +496,6 @@ SOURCE=..\..\..\Windows\Synchronization.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\Common\Alloc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.h -# End Source File -# Begin Source File - SOURCE=..\..\..\Common\CommandLineParser.cpp # End Source File # Begin Source File @@ -580,6 +580,14 @@ SOURCE=..\..\..\Common\Wildcard.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Common\CreateCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\CreateCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\FilePathAutoRename.cpp # End Source File # Begin Source File @@ -596,6 +604,14 @@ SOURCE=..\..\Common\FileStreams.h # End Source File # Begin Source File +SOURCE=..\..\Common\FilterCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\FilterCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\InBuffer.cpp # End Source File # Begin Source File @@ -691,14 +707,6 @@ SOURCE=..\..\UI\Common\ArchiveOpenCallback.h # End Source File # Begin Source File -SOURCE=..\..\UI\Common\ArchiverInfo.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiverInfo.h -# End Source File -# Begin Source File - SOURCE=..\..\UI\Common\DefaultName.cpp # End Source File # Begin Source File @@ -731,6 +739,14 @@ SOURCE=..\..\UI\Common\ExtractMode.h # End Source File # Begin Source File +SOURCE=..\..\UI\Common\LoadCodecs.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\UI\Common\LoadCodecs.h +# End Source File +# Begin Source File + SOURCE=..\..\UI\Common\OpenArchive.cpp # End Source File # Begin Source File @@ -747,6 +763,45 @@ SOURCE=..\..\UI\Common\PropIDUtils.h # End Source File # End Group # End Group +# Begin Group "C" + +# PROP Default_Filter "" +# Begin Group "C Branch" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.h +# End Source File +# End Group # Begin Source File SOURCE=.\7z.ico diff --git a/CPP/7zip/Bundles/SFXCon/makefile b/CPP/7zip/Bundles/SFXCon/makefile index 7501a497..61edd86b 100755 --- a/CPP/7zip/Bundles/SFXCon/makefile +++ b/CPP/7zip/Bundles/SFXCon/makefile @@ -1,18 +1,9 @@ PROG = 7zCon.sfx LIBS = $(LIBS) user32.lib oleaut32.lib CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ - -DNO_REGISTRY \ -DEXTRACT_ONLY \ + -DNO_READ_FROM_CODER \ -D_SFX \ - -DFORMAT_7Z \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_COPY \ - -DCOMPRESS_LZMA \ - -DCOMPRESS_PPMD \ - -DCRYPTO_7ZAES \ - -DCRYPTO_AES \ SFX_CONSOLE_OBJS = \ $O\Main.obj \ @@ -26,7 +17,6 @@ CONSOLE_OBJS = \ $O\UserInputUtils.obj \ COMMON_OBJS = \ - $O\Alloc.obj \ $O\CommandLineParser.obj \ $O\CRC.obj \ $O\IntToString.obj \ @@ -49,9 +39,11 @@ WIN_OBJS = \ $O\Synchronization.obj 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\FilePathAutoRename.obj \ $O\FileStreams.obj \ $O\InBuffer.obj \ + $O\FilterCoder.obj \ $O\LimitedStreams.obj \ $O\LockedStream.obj \ $O\OutBuffer.obj \ @@ -63,8 +55,8 @@ WIN_OBJS = \ UI_COMMON_OBJS = \ $O\ArchiveExtractCallback.obj \ $O\ArchiveOpenCallback.obj \ - $O\ArchiverInfo.obj \ $O\DefaultName.obj \ + $O\LoadCodecs.obj \ $O\Extract.obj \ $O\ExtractingFilePath.obj \ $O\OpenArchive.obj \ @@ -74,7 +66,6 @@ AR_COMMON_OBJS = \ $O\CoderMixer2.obj \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ - $O\FilterCoder.obj \ $O\ItemNameUtils.obj \ $O\OutStreamWithCRC.obj \ @@ -86,24 +77,33 @@ AR_COMMON_OBJS = \ $O\7zHandler.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ + $O\7zRegister.obj \ BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ LZ_OBJS = \ $O\LZOutWindow.obj \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ + $O\LZMARegister.obj \ PPMD_OPT_OBJS = \ $O\PPMDDecoder.obj \ + $O\PPMDRegister.obj \ 7ZAES_OPT_OBJS = \ $O\7zAES.obj \ + $O\7zAESRegister.obj \ AES_OPT_OBJS = \ $O\MyAES.obj \ @@ -116,6 +116,14 @@ AES_ORIG_OBJS = \ CRYPTO_HASH_OBJS = \ $O\Sha256.obj \ +C_OBJS = \ + $O\Alloc.obj \ + +C_BRANCH_OBJS = \ + $O\BranchX86.obj \ + +!include "../../Crc2.mak" + OBJS = \ $O\StdAfx.obj \ $(SFX_CONSOLE_OBJS) \ @@ -127,14 +135,17 @@ OBJS = \ $(AR_COMMON_OBJS) \ $(7Z_OBJS) \ $(BRANCH_OPT_OBJS) \ + $(COPY_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ $(PPMD_OPT_OBJS) \ - $O\CopyCoder.obj \ $(7ZAES_OPT_OBJS) \ $(AES_OPT_OBJS) \ $(AES_ORIG_OBJS) \ $(CRYPTO_HASH_OBJS) \ + $(C_OBJS) \ + $(C_BRANCH_OBJS) \ + $(CRC_OBJS) \ $O\resource.res @@ -160,6 +171,8 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp $(COMPL) $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp $(COMPL) $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp @@ -167,9 +180,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp $(COMPL) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp - $(COMPL) - $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp $(COMPL) $(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c @@ -178,3 +188,9 @@ $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp $(COMPL) $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp $(COMPL) +$(C_OBJS): ../../../../C/$(*B).c + $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) + +!include "../../Crc.mak" diff --git a/CPP/7zip/Bundles/SFXSetup/ExtractCallback.cpp b/CPP/7zip/Bundles/SFXSetup/ExtractCallback.cpp index 6294516c..7051b9cd 100755 --- a/CPP/7zip/Bundles/SFXSetup/ExtractCallback.cpp +++ b/CPP/7zip/Bundles/SFXSetup/ExtractCallback.cpp @@ -19,7 +19,7 @@ using namespace NWindows; using namespace NFile; -static LPCWSTR kErrorTitle = L"7-Zip"; +// static LPCWSTR kErrorTitle = L"7-Zip"; static LPCWSTR kCantDeleteFile = L"Can not delete output file"; static LPCWSTR kCantOpenFile = L"Can not open output file"; static LPCWSTR kUnsupportedMethod = L"Unsupported Method"; diff --git a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp index 19fcb0d2..a0df3042 100755 --- a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp +++ b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp @@ -51,6 +51,7 @@ static const LPCWSTR kCantFindArchive = L"Can not find archive file"; static const LPCWSTR kCantOpenArchive = L"File is not correct archive"; HRESULT ExtractArchive( + CCodecs *codecs, const UString &fileName, const UString &folderName, COpenCallbackGUI *openCallback, @@ -68,7 +69,7 @@ HRESULT ExtractArchive( CThreadExtracting extracter; - HRESULT result = MyOpenArchive(fileName, extracter.ArchiveLink, openCallback); + HRESULT result = MyOpenArchive(codecs, fileName, extracter.ArchiveLink, openCallback); if (result != S_OK) { diff --git a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h index 595d2b29..a042270b 100755 --- a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h +++ b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h @@ -5,8 +5,10 @@ #include "Common/String.h" #include "../../UI/GUI/OpenCallbackGUI.h" +#include "../../UI/Common/LoadCodecs.h" HRESULT ExtractArchive( + CCodecs *codecs, const UString &fileName, const UString &folderName, COpenCallbackGUI *openCallback, diff --git a/CPP/7zip/Bundles/SFXSetup/Main.cpp b/CPP/7zip/Bundles/SFXSetup/Main.cpp index 12de5c01..ff20b304 100755 --- a/CPP/7zip/Bundles/SFXSetup/Main.cpp +++ b/CPP/7zip/Bundles/SFXSetup/Main.cpp @@ -210,13 +210,22 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR / return 1; } + CCodecs *codecs = new CCodecs; + CMyComPtr<IUnknown> compressCodecsInfo = codecs; + HRESULT result = codecs->Load(); + if (result != S_OK) + { + MyMessageBox(L"Can not load codecs"); + return 1; + } + COpenCallbackGUI openCallback; UString tempDirPath = GetUnicodeString(tempDir.GetPath()); { bool isCorrupt = false; UString errorMessage; - HRESULT result = ExtractArchive(fullPath, tempDirPath, &openCallback, showProgress, + HRESULT result = ExtractArchive(codecs, fullPath, tempDirPath, &openCallback, showProgress, isCorrupt, errorMessage); if (result != S_OK) diff --git a/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp b/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp index a58feab5..bf0194b9 100755 --- a/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp +++ b/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x419 /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /GZ /c +# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x419 /d "_DEBUG" @@ -98,7 +98,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "_SFX" /Yu"StdAfx.h" /FD /c -# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x419 /d "NDEBUG" @@ -193,11 +193,7 @@ SOURCE=..\..\Archive\7z\7zItem.h # End Source File # Begin Source File -SOURCE=..\..\Archive\7z\7zMethodID.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.h +SOURCE=..\..\Archive\7z\7zRegister.cpp # End Source File # End Group # Begin Group "Archive Common" @@ -229,14 +225,6 @@ SOURCE=..\..\Archive\Common\CrossThreadProgress.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Common\FilterCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.h -# End Source File -# Begin Source File - SOURCE=..\..\Archive\Common\ItemNameUtils.cpp # End Source File # Begin Source File @@ -262,12 +250,24 @@ SOURCE=..\..\Archive\Common\OutStreamWithCRC.h SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp # End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMARegister.cpp +# End Source File # End Group # Begin Group "Branch" # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Compress\Branch\BCJ2Register.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BCJRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Compress\Branch\BranchCoder.cpp # End Source File # Begin Source File @@ -294,6 +294,10 @@ SOURCE=..\..\Compress\Copy\CopyCoder.cpp SOURCE=..\..\Compress\Copy\CopyCoder.h # End Source File +# Begin Source File + +SOURCE=..\..\Compress\Copy\CopyRegister.cpp +# End Source File # End Group # Begin Group "LZ" @@ -308,23 +312,11 @@ SOURCE=..\..\Compress\LZ\LZOutWindow.h # End Source File # End Group # End Group -# Begin Group "SDK" - -# PROP Default_Filter "" -# End Group # Begin Group "Common" # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\Common\Alloc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.h -# End Source File -# Begin Source File - SOURCE=..\..\..\Common\CommandLineParser.cpp # End Source File # Begin Source File @@ -505,6 +497,14 @@ SOURCE=..\..\..\Windows\Window.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Common\CreateCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\CreateCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\FileStreams.cpp # End Source File # Begin Source File @@ -513,6 +513,14 @@ SOURCE=..\..\Common\FileStreams.h # End Source File # Begin Source File +SOURCE=..\..\Common\FilterCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\FilterCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\InBuffer.cpp # End Source File # Begin Source File @@ -604,23 +612,23 @@ SOURCE=..\..\UI\Common\ArchiveOpenCallback.h # End Source File # Begin Source File -SOURCE=..\..\UI\Common\ArchiverInfo.cpp +SOURCE=..\..\UI\Common\DefaultName.cpp # End Source File # Begin Source File -SOURCE=..\..\UI\Common\ArchiverInfo.h +SOURCE=..\..\UI\Common\DefaultName.h # End Source File # Begin Source File -SOURCE=..\..\UI\Common\DefaultName.cpp +SOURCE=..\..\UI\Common\ExtractMode.h # End Source File # Begin Source File -SOURCE=..\..\UI\Common\DefaultName.h +SOURCE=..\..\UI\Common\LoadCodecs.cpp # End Source File # Begin Source File -SOURCE=..\..\UI\Common\ExtractMode.h +SOURCE=..\..\UI\Common\LoadCodecs.h # End Source File # Begin Source File @@ -668,6 +676,41 @@ SOURCE=..\..\FileManager\FormatUtils.cpp SOURCE=..\..\FileManager\FormatUtils.h # End Source File # End Group +# Begin Group "C" + +# PROP Default_Filter "" +# Begin Group "C Branch" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.h +# End Source File +# End Group # Begin Source File SOURCE=.\ExtractCallback.cpp diff --git a/CPP/7zip/Bundles/SFXSetup/makefile b/CPP/7zip/Bundles/SFXSetup/makefile index 1f86c42c..129d60cf 100755 --- a/CPP/7zip/Bundles/SFXSetup/makefile +++ b/CPP/7zip/Bundles/SFXSetup/makefile @@ -1,16 +1,11 @@ PROG = 7zS.sfx LIBS = $(LIBS) user32.lib oleaut32.lib shell32.lib ole32.lib comctl32.lib CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ -DNO_REGISTRY \ -DEXTRACT_ONLY \ + -DNO_READ_FROM_CODER \ -D_SFX \ - -DFORMAT_7Z \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_COPY \ - -DCOMPRESS_LZMA \ - -D_NO_CRYPTO + -D_NO_CRYPTO \ SFX_WIN_OBJS = \ $O\Main.obj \ @@ -21,7 +16,6 @@ GUI_OBJS = \ $O\OpenCallbackGUI.obj \ COMMON_OBJS = \ - $O\Alloc.obj \ $O\CommandLineParser.obj \ $O\CRC.obj \ $O\IntToString.obj \ @@ -49,8 +43,10 @@ WIN_CTRL_OBJS = \ $O\Dialog.obj \ 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\FileStreams.obj \ $O\InBuffer.obj \ + $O\FilterCoder.obj \ $O\LimitedStreams.obj \ $O\LockedStream.obj \ $O\OutBuffer.obj \ @@ -61,8 +57,8 @@ WIN_CTRL_OBJS = \ UI_COMMON_OBJS = \ $O\ArchiveOpenCallback.obj \ - $O\ArchiverInfo.obj \ $O\DefaultName.obj \ + $O\LoadCodecs.obj \ $O\OpenArchive.obj \ FM_OBJS = \ @@ -72,7 +68,6 @@ AR_COMMON_OBJS = \ $O\CoderMixer2.obj \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ - $O\FilterCoder.obj \ $O\ItemNameUtils.obj \ $O\OutStreamWithCRC.obj \ @@ -83,18 +78,33 @@ AR_COMMON_OBJS = \ $O\7zHandler.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ + $O\7zRegister.obj \ BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ LZ_OBJS = \ $O\LZOutWindow.obj \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ + $O\LZMARegister.obj \ + +C_OBJS = \ + $O\Alloc.obj \ + +C_BRANCH_OBJS = \ + $O\BranchX86.obj \ + +!include "../../Crc2.mak" OBJS = \ $O\StdAfx.obj \ @@ -109,11 +119,14 @@ OBJS = \ $(AR_COMMON_OBJS) \ $(7Z_OBJS) \ $(BRANCH_OPT_OBJS) \ + $(COPY_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ - $O\CopyCoder.obj \ $O\MyMessages.obj \ $O\ProgressDialog.obj \ + $(C_OBJS) \ + $(C_BRANCH_OBJS) \ + $(CRC_OBJS) \ $O\resource.res @@ -143,14 +156,23 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp $(COMPL) $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp $(COMPL) $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(COMPL) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp - $(COMPL) $O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp $(COMPL) $O\ProgressDialog.obj: ../../FileManager/Resource/ProgressDialog/$(*B).cpp $(COMPL) + +$(C_OBJS): ../../../../C/$(*B).c + $(COMPL_O2) + +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) + +!include "../../Crc.mak" + diff --git a/CPP/7zip/Bundles/SFXWin/Main.cpp b/CPP/7zip/Bundles/SFXWin/Main.cpp index 166d58cb..9c85d6b7 100755 --- a/CPP/7zip/Bundles/SFXWin/Main.cpp +++ b/CPP/7zip/Bundles/SFXWin/Main.cpp @@ -72,6 +72,15 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR / return 1; } + CCodecs *codecs = new CCodecs; + CMyComPtr<IUnknown> compressCodecsInfo = codecs; + HRESULT result = codecs->Load(); + if (result != S_OK) + { + ShowErrorMessage(0, result); + return S_OK; + } + COpenCallbackGUI openCallback; openCallback.PasswordIsDefined = !password.IsEmpty(); @@ -99,7 +108,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR / NWildcard::CCensorNode wildcardCensor; wildcardCensor.AddItem(true, L"*", true, true, true); - HRESULT result = ExtractGUI(v1, v2, + result = ExtractGUI(codecs, v1, v2, wildcardCensor, eo, (assumeYes ? false: true), &openCallback, ecs); /* diff --git a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp index ead66bc6..3e9b5c33 100755 --- a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp +++ b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_PPMD" /D "_SFX" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_SFXWIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "NO_READ_FROM_CODER" /D "_SFX" /Yu"StdAfx.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x419 /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_PPMD" /D "_SFX" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /Yu"StdAfx.h" /FD /GZ /c +# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_SFXWIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "NO_READ_FROM_CODER" /D "_SFX" /Yu"StdAfx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x419 /d "_DEBUG" @@ -98,7 +98,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_PPMD" /D "_SFX" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /Yu"StdAfx.h" /FD /c -# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_PPMD" /D "_SFX" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /Yu"StdAfx.h" /FD /c +# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_SFXWIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "NO_READ_FROM_CODER" /D "_SFX" /Yu"StdAfx.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x419 /d "NDEBUG" @@ -181,11 +181,7 @@ SOURCE=..\..\Archive\7z\7zIn.h # End Source File # Begin Source File -SOURCE=..\..\Archive\7z\7zMethodID.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zMethodID.h +SOURCE=..\..\Archive\7z\7zRegister.cpp # End Source File # End Group # Begin Group "Archive Common" @@ -217,14 +213,6 @@ SOURCE=..\..\Archive\Common\CrossThreadProgress.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Common\FilterCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FilterCoder.h -# End Source File -# Begin Source File - SOURCE=..\..\Archive\Common\ItemNameUtils.cpp # End Source File # Begin Source File @@ -250,12 +238,24 @@ SOURCE=..\..\Archive\Common\OutStreamWithCRC.h SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp # End Source File +# Begin Source File + +SOURCE=..\..\Compress\LZMA\LZMARegister.cpp +# End Source File # End Group # Begin Group "Branch" # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Compress\Branch\BCJ2Register.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\Branch\BCJRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Compress\Branch\BranchCoder.cpp # End Source File # Begin Source File @@ -292,6 +292,10 @@ SOURCE=..\..\Compress\PPMD\PPMDDecoder.h # End Source File # Begin Source File +SOURCE=..\..\Compress\PPMD\PPMDRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Compress\PPMD\PPMDSubAlloc.h # End Source File # Begin Source File @@ -322,6 +326,10 @@ SOURCE=..\..\Compress\Copy\CopyCoder.cpp SOURCE=..\..\Compress\Copy\CopyCoder.h # End Source File +# Begin Source File + +SOURCE=..\..\Compress\Copy\CopyRegister.cpp +# End Source File # End Group # End Group # Begin Group "Crypto" @@ -383,6 +391,10 @@ SOURCE=..\..\Crypto\7zAES\7zAES.h # End Source File # Begin Source File +SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Crypto\7zAES\MySHA256.h # End Source File # End Group @@ -444,6 +456,14 @@ SOURCE=..\..\FileManager\Resource\ProgressDialog\ProgressDialog.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Common\CreateCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\CreateCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\FilePathAutoRename.cpp # End Source File # Begin Source File @@ -460,6 +480,14 @@ SOURCE=..\..\Common\FileStreams.h # End Source File # Begin Source File +SOURCE=..\..\Common\FilterCoder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\FilterCoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Common\InBuffer.cpp # End Source File # Begin Source File @@ -660,14 +688,6 @@ SOURCE=..\..\..\Windows\Window.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\Common\Alloc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Alloc.h -# End Source File -# Begin Source File - SOURCE=..\..\..\Common\CommandLineParser.cpp # End Source File # Begin Source File @@ -747,14 +767,6 @@ SOURCE=..\..\UI\Common\ArchiveOpenCallback.h # End Source File # Begin Source File -SOURCE=..\..\UI\Common\ArchiverInfo.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiverInfo.h -# End Source File -# Begin Source File - SOURCE=..\..\UI\Common\DefaultName.cpp # End Source File # Begin Source File @@ -779,6 +791,14 @@ SOURCE=..\..\UI\Common\ExtractingFilePath.h # End Source File # Begin Source File +SOURCE=..\..\UI\Common\LoadCodecs.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\UI\Common\LoadCodecs.h +# End Source File +# Begin Source File + SOURCE=..\..\UI\Common\OpenArchive.cpp # End Source File # Begin Source File @@ -827,6 +847,41 @@ SOURCE=..\..\UI\Explorer\MyMessages.h # End Source File # End Group # End Group +# Begin Group "C" + +# PROP Default_Filter "" +# Begin Group "C Branch" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\7zCrc.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Alloc.h +# End Source File +# End Group # Begin Source File SOURCE=.\7z.ico diff --git a/CPP/7zip/Bundles/SFXWin/makefile b/CPP/7zip/Bundles/SFXWin/makefile index 00d3ecc6..b883bcf5 100755 --- a/CPP/7zip/Bundles/SFXWin/makefile +++ b/CPP/7zip/Bundles/SFXWin/makefile @@ -1,19 +1,10 @@ PROG = 7z.sfx LIBS = $(LIBS) user32.lib oleaut32.lib shell32.lib ole32.lib CFLAGS = $(CFLAGS) -I ../../../ \ - -DEXCLUDE_COM \ -DNO_REGISTRY \ -DEXTRACT_ONLY \ + -DNO_READ_FROM_CODER \ -D_SFX \ - -DFORMAT_7Z \ - -DCOMPRESS_BCJ_X86 \ - -DCOMPRESS_BCJ2 \ - -DCOMPRESS_COPY \ - -DCOMPRESS_LZMA \ - -DCOMPRESS_PPMD \ - -DCRYPTO_AES \ - -DCRYPTO_7ZAES \ - SFX_WIN_OBJS = \ $O\Main.obj \ @@ -24,9 +15,8 @@ GUI_OBJS = \ $O\OpenCallbackGUI.obj \ COMMON_OBJS = \ - $O\Alloc.obj \ - $O\CommandLineParser.obj \ $O\CRC.obj \ + $O\CommandLineParser.obj \ $O\IntToString.obj \ $O\NewHandler.obj \ $O\String.obj \ @@ -52,9 +42,11 @@ WIN_CTRL_OBJS = \ $O\Dialog.obj \ 7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ $O\FilePathAutoRename.obj \ $O\FileStreams.obj \ $O\InBuffer.obj \ + $O\FilterCoder.obj \ $O\LimitedStreams.obj \ $O\LockedStream.obj \ $O\OutBuffer.obj \ @@ -66,10 +58,10 @@ WIN_CTRL_OBJS = \ UI_COMMON_OBJS = \ $O\ArchiveExtractCallback.obj \ $O\ArchiveOpenCallback.obj \ - $O\ArchiverInfo.obj \ $O\DefaultName.obj \ $O\Extract.obj \ $O\ExtractingFilePath.obj \ + $O\LoadCodecs.obj \ $O\OpenArchive.obj \ FM_OBJS = \ @@ -80,7 +72,6 @@ AR_COMMON_OBJS = \ $O\CoderMixer2.obj \ $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ - $O\FilterCoder.obj \ $O\ItemNameUtils.obj \ $O\OutStreamWithCRC.obj \ @@ -91,24 +82,33 @@ AR_COMMON_OBJS = \ $O\7zHandler.obj \ $O\7zHeader.obj \ $O\7zIn.obj \ - $O\7zMethodID.obj \ + $O\7zRegister.obj \ BRANCH_OPT_OBJS = \ $O\BranchCoder.obj \ $O\x86.obj \ $O\x86_2.obj \ + $O\BCJRegister.obj \ + $O\BCJ2Register.obj \ + +COPY_OBJS = \ + $O\CopyCoder.obj \ + $O\CopyRegister.obj \ LZ_OBJS = \ $O\LZOutWindow.obj \ LZMA_OPT_OBJS = \ $O\LZMADecoder.obj \ + $O\LZMARegister.obj \ PPMD_OPT_OBJS = \ $O\PPMDDecoder.obj \ + $O\PPMDRegister.obj \ 7ZAES_OPT_OBJS = \ $O\7zAES.obj \ + $O\7zAESRegister.obj \ AES_OPT_OBJS = \ $O\MyAES.obj \ @@ -121,6 +121,14 @@ AES_ORIG_OBJS = \ CRYPTO_HASH_OBJS = \ $O\Sha256.obj \ +C_OBJS = \ + $O\Alloc.obj \ + +C_BRANCH_OBJS = \ + $O\BranchX86.obj \ + +!include "../../Crc2.mak" + OBJS = \ $O\StdAfx.obj \ $(SFX_WIN_OBJS) \ @@ -134,10 +142,10 @@ OBJS = \ $(AR_COMMON_OBJS) \ $(7Z_OBJS) \ $(BRANCH_OPT_OBJS) \ + $(COPY_OBJS) \ $(LZ_OBJS) \ $(LZMA_OPT_OBJS) \ $(PPMD_OPT_OBJS) \ - $O\CopyCoder.obj \ $(CRYPTO_HASH_OBJS) \ $(7ZAES_OPT_OBJS) \ $(AES_OPT_OBJS) \ @@ -147,6 +155,9 @@ OBJS = \ $O\OverwriteDialog.obj \ $O\PasswordDialog.obj \ $O\ProgressDialog.obj \ + $(C_OBJS) \ + $(C_BRANCH_OBJS) \ + $(CRC_OBJS) \ $O\resource.res @@ -176,6 +187,8 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp $(COMPL) $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp $(COMPL) +$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp + $(COMPL) $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp $(COMPL) $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp @@ -183,9 +196,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp $(COMPL) -$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp - $(COMPL) - $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp $(COMPL) $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp @@ -205,3 +215,10 @@ $O\PasswordDialog.obj: ../../FileManager/Resource/PasswordDialog/$(*B).cpp $(COMPL) $O\ProgressDialog.obj: ../../FileManager/Resource/ProgressDialog/$(*B).cpp $(COMPL) +$(C_OBJS): ../../../../C/$(*B).c + $(COMPL_O2) +$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c + $(COMPL_O2) + +!include "../../Crc.mak" +
\ No newline at end of file diff --git a/CPP/7zip/Bundles/makefile b/CPP/7zip/Bundles/makefile index 7e7d7cdc..fd95af31 100755 --- a/CPP/7zip/Bundles/makefile +++ b/CPP/7zip/Bundles/makefile @@ -2,6 +2,7 @@ DIRS = \ Alone\~ \ Alone7z\~ \ Format7z\~ \ + Format7zF\~ \ Format7zR\~ \ Format7zExtract\~ \ Format7zExtractR\~ \ |