seven-zip 1.4.1 → 1.7.0.rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +49 -0
- data/.github/workflows/release.yml +15 -30
- data/README.md +16 -3
- data/Rakefile +2 -0
- data/ext/p7zip/C/7zBuf.h +4 -8
- data/ext/p7zip/C/7zBuf2.c +9 -3
- data/ext/p7zip/C/7zCrc.c +84 -32
- data/ext/p7zip/C/7zCrc.h +2 -2
- data/ext/p7zip/C/7zCrcOpt.c +89 -8
- data/ext/p7zip/C/7zStream.c +4 -2
- data/ext/p7zip/C/{Types.h → 7zTypes.h} +8 -6
- data/ext/p7zip/C/7zVersion.h +21 -6
- data/ext/p7zip/C/Aes.c +28 -15
- data/ext/p7zip/C/Aes.h +2 -2
- data/ext/p7zip/C/Alloc.c +60 -12
- data/ext/p7zip/C/Alloc.h +6 -7
- data/ext/p7zip/C/Bcj2.c +256 -0
- data/ext/p7zip/C/Bcj2.h +146 -0
- data/ext/p7zip/C/Bcj2Enc.c +312 -0
- data/ext/p7zip/C/Blake2.h +48 -0
- data/ext/p7zip/C/Blake2s.c +244 -0
- data/ext/p7zip/C/Bra.c +2 -0
- data/ext/p7zip/C/Bra.h +4 -8
- data/ext/p7zip/C/Bra86.c +48 -51
- data/ext/p7zip/C/BraIA64.c +3 -1
- data/ext/p7zip/C/BwtSort.c +3 -4
- data/ext/p7zip/C/BwtSort.h +4 -8
- data/ext/p7zip/C/Compiler.h +32 -0
- data/ext/p7zip/C/CpuArch.c +50 -7
- data/ext/p7zip/C/CpuArch.h +112 -41
- data/ext/p7zip/C/Delta.c +2 -0
- data/ext/p7zip/C/Delta.h +4 -8
- data/ext/p7zip/C/HuffEnc.c +8 -6
- data/ext/p7zip/C/HuffEnc.h +4 -8
- data/ext/p7zip/C/LzFind.c +391 -108
- data/ext/p7zip/C/LzFind.h +20 -18
- data/ext/p7zip/C/LzFindMt.c +100 -90
- data/ext/p7zip/C/LzFindMt.h +4 -8
- data/ext/p7zip/C/LzHash.h +23 -20
- data/ext/p7zip/C/Lzma2Dec.c +48 -26
- data/ext/p7zip/C/Lzma2Dec.h +4 -8
- data/ext/p7zip/C/Lzma2Enc.c +58 -15
- data/ext/p7zip/C/Lzma2Enc.h +3 -7
- data/ext/p7zip/C/{LzmaUtil/Lzma86Enc.h → Lzma86.h} +47 -14
- data/ext/p7zip/C/{LzmaUtil/Lzma86Dec.c → Lzma86Dec.c} +6 -13
- data/ext/p7zip/C/{LzmaUtil/Lzma86Enc.c → Lzma86Enc.c} +8 -15
- data/ext/p7zip/C/LzmaDec.c +180 -79
- data/ext/p7zip/C/LzmaDec.h +4 -8
- data/ext/p7zip/C/LzmaEnc.c +230 -147
- data/ext/p7zip/C/LzmaEnc.h +6 -8
- data/ext/p7zip/C/MtCoder.c +3 -3
- data/ext/p7zip/C/Ppmd.h +5 -5
- data/ext/p7zip/C/Ppmd7.c +9 -7
- data/ext/p7zip/C/Ppmd7.h +3 -3
- data/ext/p7zip/C/Ppmd7Dec.c +2 -0
- data/ext/p7zip/C/Ppmd7Enc.c +4 -2
- data/ext/p7zip/C/Ppmd8.c +34 -31
- data/ext/p7zip/C/Ppmd8.h +5 -1
- data/ext/p7zip/C/Ppmd8Dec.c +2 -0
- data/ext/p7zip/C/Ppmd8Enc.c +2 -0
- data/ext/p7zip/C/Precomp.h +10 -0
- data/ext/p7zip/C/RotateDefs.h +11 -1
- data/ext/p7zip/C/Sha1.c +340 -0
- data/ext/p7zip/C/Sha1.h +38 -0
- data/ext/p7zip/C/Sha256.c +107 -63
- data/ext/p7zip/C/Sha256.h +2 -2
- data/ext/p7zip/C/Sort.c +59 -11
- data/ext/p7zip/C/Sort.h +8 -10
- data/ext/p7zip/C/Threads.h +1 -1
- data/ext/p7zip/C/Xz.c +7 -5
- data/ext/p7zip/C/Xz.h +40 -17
- data/ext/p7zip/C/XzCrc64.c +69 -16
- data/ext/p7zip/C/XzCrc64.h +2 -2
- data/ext/p7zip/C/XzCrc64Opt.c +69 -0
- data/ext/p7zip/C/XzDec.c +93 -55
- data/ext/p7zip/C/XzEnc.c +206 -165
- data/ext/p7zip/C/XzEnc.h +23 -9
- data/ext/p7zip/C/XzIn.c +50 -43
- data/ext/p7zip/CPP/7zip/Archive/7z/7zCompressionMode.h +37 -13
- data/ext/p7zip/CPP/7zip/Archive/7z/7zDecode.cpp +392 -181
- data/ext/p7zip/CPP/7zip/Archive/7z/7zDecode.h +29 -29
- data/ext/p7zip/CPP/7zip/Archive/7z/7zEncode.cpp +424 -212
- data/ext/p7zip/CPP/7zip/Archive/7z/7zEncode.h +53 -16
- data/ext/p7zip/CPP/7zip/Archive/7z/7zExtract.cpp +312 -174
- data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderInStream.cpp +74 -61
- data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderInStream.h +22 -19
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHandler.cpp +505 -232
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHandler.h +70 -16
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHandlerOut.cpp +602 -172
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHeader.cpp +5 -0
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHeader.h +54 -3
- data/ext/p7zip/CPP/7zip/Archive/7z/7zIn.cpp +981 -616
- data/ext/p7zip/CPP/7zip/Archive/7z/7zIn.h +275 -89
- data/ext/p7zip/CPP/7zip/Archive/7z/7zItem.h +77 -162
- data/ext/p7zip/CPP/7zip/Archive/7z/7zOut.cpp +288 -238
- data/ext/p7zip/CPP/7zip/Archive/7z/7zOut.h +189 -20
- data/ext/p7zip/CPP/7zip/Archive/7z/7zProperties.cpp +59 -49
- data/ext/p7zip/CPP/7zip/Archive/7z/7zRegister.cpp +12 -9
- data/ext/p7zip/CPP/7zip/Archive/7z/7zSpecStream.cpp +4 -6
- data/ext/p7zip/CPP/7zip/Archive/7z/7zSpecStream.h +5 -5
- data/ext/p7zip/CPP/7zip/Archive/7z/7zUpdate.cpp +1743 -447
- data/ext/p7zip/CPP/7zip/Archive/7z/7zUpdate.h +61 -10
- data/ext/p7zip/CPP/7zip/Archive/ApmHandler.cpp +84 -120
- data/ext/p7zip/CPP/7zip/Archive/ArHandler.cpp +854 -0
- data/ext/p7zip/CPP/7zip/Archive/ArchiveExports.cpp +48 -32
- data/ext/p7zip/CPP/7zip/Archive/ArjHandler.cpp +519 -340
- data/ext/p7zip/CPP/7zip/Archive/Bz2Handler.cpp +223 -203
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabBlockInStream.cpp +50 -139
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabBlockInStream.h +17 -18
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabHandler.cpp +566 -234
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabHandler.h +10 -1
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabHeader.cpp +2 -2
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabHeader.h +12 -15
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabIn.cpp +341 -122
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabIn.h +81 -66
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabItem.h +17 -14
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabRegister.cpp +10 -4
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHandler.cpp +190 -83
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHandler.h +7 -1
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmIn.cpp +292 -174
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmIn.h +73 -47
- data/ext/p7zip/CPP/7zip/Archive/ComHandler.cpp +886 -0
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2.cpp +994 -71
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2.h +364 -101
- data/ext/p7zip/CPP/7zip/Archive/Common/DummyOutStream.cpp +7 -12
- data/ext/p7zip/CPP/7zip/Archive/Common/DummyOutStream.h +4 -3
- data/ext/p7zip/CPP/7zip/Archive/Common/FindSignature.cpp +6 -6
- data/ext/p7zip/CPP/7zip/Archive/Common/FindSignature.h +2 -2
- data/ext/p7zip/CPP/7zip/Archive/Common/HandlerOut.cpp +77 -543
- data/ext/p7zip/CPP/7zip/Archive/Common/HandlerOut.h +31 -51
- data/ext/p7zip/CPP/7zip/Archive/Common/InStreamWithCRC.cpp +18 -14
- data/ext/p7zip/CPP/7zip/Archive/Common/ItemNameUtils.cpp +34 -7
- data/ext/p7zip/CPP/7zip/Archive/Common/ItemNameUtils.h +5 -2
- data/ext/p7zip/CPP/7zip/Archive/Common/MultiStream.cpp +25 -24
- data/ext/p7zip/CPP/7zip/Archive/Common/MultiStream.h +8 -3
- data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithCRC.h +1 -0
- data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithSha1.cpp +2 -2
- data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithSha1.h +5 -5
- data/ext/p7zip/CPP/7zip/Archive/Common/ParseProperties.cpp +0 -174
- data/ext/p7zip/CPP/7zip/Archive/Common/ParseProperties.h +2 -14
- data/ext/p7zip/CPP/7zip/Archive/CpioHandler.cpp +506 -335
- data/ext/p7zip/CPP/7zip/Archive/CramfsHandler.cpp +227 -84
- data/ext/p7zip/CPP/7zip/Archive/DeflateProps.cpp +0 -115
- data/ext/p7zip/CPP/7zip/Archive/DeflateProps.h +0 -29
- data/ext/p7zip/CPP/7zip/Archive/DllExports2.cpp +63 -17
- data/ext/p7zip/CPP/7zip/Archive/DmgHandler.cpp +1007 -339
- data/ext/p7zip/CPP/7zip/Archive/ElfHandler.cpp +618 -177
- data/ext/p7zip/CPP/7zip/Archive/ExtHandler.cpp +2867 -0
- data/ext/p7zip/CPP/7zip/Archive/FatHandler.cpp +136 -76
- data/ext/p7zip/CPP/7zip/Archive/FlvHandler.cpp +132 -150
- data/ext/p7zip/CPP/7zip/Archive/GptHandler.cpp +405 -0
- data/ext/p7zip/CPP/7zip/Archive/GzHandler.cpp +560 -214
- data/ext/p7zip/CPP/7zip/Archive/HandlerCont.cpp +288 -0
- data/ext/p7zip/CPP/7zip/Archive/HandlerCont.h +116 -0
- data/ext/p7zip/CPP/7zip/Archive/HfsHandler.cpp +1880 -0
- data/ext/p7zip/CPP/7zip/Archive/IArchive.h +415 -51
- data/ext/p7zip/CPP/7zip/Archive/IhexHandler.cpp +497 -0
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHandler.cpp +158 -71
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHandler.h +2 -1
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHeader.cpp +0 -9
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHeader.h +8 -5
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoIn.cpp +311 -91
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoIn.h +101 -83
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoItem.h +48 -39
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoRegister.cpp +12 -4
- data/ext/p7zip/CPP/7zip/Archive/LzhHandler.cpp +127 -114
- data/ext/p7zip/CPP/7zip/Archive/LzmaHandler.cpp +264 -121
- data/ext/p7zip/CPP/7zip/Archive/MachoHandler.cpp +402 -242
- data/ext/p7zip/CPP/7zip/Archive/MbrHandler.cpp +56 -114
- data/ext/p7zip/CPP/7zip/Archive/MslzHandler.cpp +230 -90
- data/ext/p7zip/CPP/7zip/Archive/MubHandler.cpp +129 -153
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisDecode.cpp +179 -58
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisDecode.h +36 -7
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisHandler.cpp +407 -237
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisHandler.h +9 -16
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisIn.cpp +5535 -1098
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisIn.h +345 -81
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisRegister.cpp +11 -4
- data/ext/p7zip/CPP/7zip/Archive/NtfsHandler.cpp +1424 -434
- data/ext/p7zip/CPP/7zip/Archive/PeHandler.cpp +1831 -521
- data/ext/p7zip/CPP/7zip/Archive/PpmdHandler.cpp +50 -35
- data/ext/p7zip/CPP/7zip/Archive/QcowHandler.cpp +615 -0
- data/ext/p7zip/CPP/7zip/Archive/Rar/Rar5Handler.cpp +2746 -0
- data/ext/p7zip/CPP/7zip/Archive/Rar/Rar5Handler.h +411 -0
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarHandler.cpp +1241 -355
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarHandler.h +70 -20
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarHeader.h +38 -34
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarItem.h +34 -16
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarVol.h +129 -0
- data/ext/p7zip/CPP/7zip/Archive/RpmHandler.cpp +641 -194
- data/ext/p7zip/CPP/7zip/Archive/SplitHandler.cpp +174 -181
- data/ext/p7zip/CPP/7zip/Archive/SquashfsHandler.cpp +237 -174
- data/ext/p7zip/CPP/7zip/Archive/SwfHandler.cpp +471 -192
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandler.cpp +350 -59
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandler.h +24 -7
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandlerOut.cpp +79 -27
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHeader.cpp +5 -7
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHeader.h +20 -44
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarIn.cpp +279 -64
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarIn.h +10 -1
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarItem.h +34 -8
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarOut.cpp +145 -87
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarOut.h +13 -5
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarRegister.cpp +14 -9
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarUpdate.cpp +154 -27
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarUpdate.h +10 -6
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfHandler.cpp +53 -128
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfHandler.h +6 -5
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfIn.cpp +384 -119
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfIn.h +40 -21
- data/ext/p7zip/CPP/7zip/Archive/UefiHandler.cpp +1618 -0
- data/ext/p7zip/CPP/7zip/Archive/VdiHandler.cpp +362 -0
- data/ext/p7zip/CPP/7zip/Archive/VhdHandler.cpp +438 -247
- data/ext/p7zip/CPP/7zip/Archive/VmdkHandler.cpp +1518 -0
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandler.cpp +837 -249
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandler.h +73 -47
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandlerOut.cpp +1614 -351
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimIn.cpp +1519 -513
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimIn.h +498 -139
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimRegister.cpp +13 -9
- data/ext/p7zip/CPP/7zip/Archive/XarHandler.cpp +272 -128
- data/ext/p7zip/CPP/7zip/Archive/XzHandler.cpp +502 -253
- data/ext/p7zip/CPP/7zip/Archive/XzHandler.h +65 -0
- data/ext/p7zip/CPP/7zip/Archive/ZHandler.cpp +114 -39
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipAddCommon.cpp +118 -134
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipAddCommon.h +6 -0
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipCompressionMode.h +40 -20
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandler.cpp +541 -274
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandler.h +13 -40
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp +165 -254
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHeader.h +70 -178
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipIn.cpp +1934 -550
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipIn.h +294 -63
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItem.cpp +160 -86
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItem.h +139 -110
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipOut.cpp +177 -154
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipOut.h +50 -18
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipRegister.cpp +18 -9
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipUpdate.cpp +367 -201
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipUpdate.h +11 -10
- data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile +2 -319
- data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile.depend +0 -4962
- data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile.list +1004 -259
- data/ext/p7zip/CPP/7zip/Common/CWrappers.cpp +26 -22
- data/ext/p7zip/CPP/7zip/Common/CWrappers.h +19 -14
- data/ext/p7zip/CPP/7zip/Common/CreateCoder.cpp +298 -130
- data/ext/p7zip/CPP/7zip/Common/CreateCoder.h +118 -34
- data/ext/p7zip/CPP/7zip/Common/FilePathAutoRename.cpp +24 -28
- data/ext/p7zip/CPP/7zip/Common/FilePathAutoRename.h +5 -5
- data/ext/p7zip/CPP/7zip/Common/FileStreams.cpp +268 -65
- data/ext/p7zip/CPP/7zip/Common/FileStreams.h +70 -33
- data/ext/p7zip/CPP/7zip/Common/FilterCoder.cpp +302 -131
- data/ext/p7zip/CPP/7zip/Common/FilterCoder.h +141 -43
- data/ext/p7zip/CPP/7zip/Common/InBuffer.cpp +87 -35
- data/ext/p7zip/CPP/7zip/Common/InBuffer.h +54 -45
- data/ext/p7zip/CPP/7zip/Common/InOutTempBuffer.cpp +22 -17
- data/ext/p7zip/CPP/7zip/Common/InOutTempBuffer.h +5 -5
- data/ext/p7zip/CPP/7zip/Common/LimitedStreams.cpp +256 -43
- data/ext/p7zip/CPP/7zip/Common/LimitedStreams.h +135 -8
- data/ext/p7zip/CPP/7zip/Common/MemBlocks.cpp +5 -5
- data/ext/p7zip/CPP/7zip/Common/MemBlocks.h +3 -3
- data/ext/p7zip/CPP/7zip/Common/MethodId.cpp +0 -24
- data/ext/p7zip/CPP/7zip/Common/MethodId.h +1 -1
- data/ext/p7zip/CPP/7zip/Common/MethodProps.cpp +430 -71
- data/ext/p7zip/CPP/7zip/Common/MethodProps.h +170 -17
- data/ext/p7zip/CPP/7zip/Common/OffsetStream.cpp +8 -4
- data/ext/p7zip/CPP/7zip/Common/OffsetStream.h +4 -3
- data/ext/p7zip/CPP/7zip/Common/OutBuffer.cpp +26 -31
- data/ext/p7zip/CPP/7zip/Common/OutBuffer.h +17 -18
- data/ext/p7zip/CPP/7zip/Common/OutMemStream.cpp +5 -5
- data/ext/p7zip/CPP/7zip/Common/OutMemStream.h +5 -4
- data/ext/p7zip/CPP/7zip/Common/ProgressUtils.cpp +22 -13
- data/ext/p7zip/CPP/7zip/Common/ProgressUtils.h +4 -3
- data/ext/p7zip/CPP/7zip/Common/PropId.cpp +108 -0
- data/ext/p7zip/CPP/7zip/Common/RegisterArc.h +63 -17
- data/ext/p7zip/CPP/7zip/Common/RegisterCodec.h +79 -6
- data/ext/p7zip/CPP/7zip/Common/StreamBinder.cpp +95 -90
- data/ext/p7zip/CPP/7zip/Common/StreamBinder.h +46 -23
- data/ext/p7zip/CPP/7zip/Common/StreamObjects.cpp +88 -24
- data/ext/p7zip/CPP/7zip/Common/StreamObjects.h +36 -14
- data/ext/p7zip/CPP/7zip/Common/StreamUtils.cpp +4 -4
- data/ext/p7zip/CPP/7zip/Common/StreamUtils.h +6 -6
- data/ext/p7zip/CPP/7zip/Common/UniqBlocks.cpp +57 -0
- data/ext/p7zip/CPP/7zip/Common/UniqBlocks.h +26 -0
- data/ext/p7zip/CPP/7zip/Common/VirtThread.cpp +8 -6
- data/ext/p7zip/CPP/7zip/Common/VirtThread.h +6 -5
- data/ext/p7zip/CPP/7zip/Compress/BZip2Const.h +13 -12
- data/ext/p7zip/CPP/7zip/Compress/BZip2Crc.h +1 -1
- data/ext/p7zip/CPP/7zip/Compress/BZip2Decoder.cpp +198 -147
- data/ext/p7zip/CPP/7zip/Compress/BZip2Decoder.h +60 -27
- data/ext/p7zip/CPP/7zip/Compress/BZip2Encoder.cpp +111 -116
- data/ext/p7zip/CPP/7zip/Compress/BZip2Encoder.h +53 -59
- data/ext/p7zip/CPP/7zip/Compress/BZip2Register.cpp +12 -7
- data/ext/p7zip/CPP/7zip/Compress/Bcj2Coder.cpp +554 -282
- data/ext/p7zip/CPP/7zip/Compress/Bcj2Coder.h +73 -71
- data/ext/p7zip/CPP/7zip/Compress/Bcj2Register.cpp +10 -5
- data/ext/p7zip/CPP/7zip/Compress/BcjCoder.cpp +13 -4
- data/ext/p7zip/CPP/7zip/Compress/BcjCoder.h +17 -5
- data/ext/p7zip/CPP/7zip/Compress/BcjRegister.cpp +7 -9
- data/ext/p7zip/CPP/7zip/Compress/BitlDecoder.cpp +2 -2
- data/ext/p7zip/CPP/7zip/Compress/BitlDecoder.h +58 -61
- data/ext/p7zip/CPP/7zip/Compress/BitlEncoder.h +24 -25
- data/ext/p7zip/CPP/7zip/Compress/BitmDecoder.h +46 -17
- data/ext/p7zip/CPP/7zip/Compress/BitmEncoder.h +18 -19
- data/ext/p7zip/CPP/7zip/Compress/BranchMisc.cpp +14 -28
- data/ext/p7zip/CPP/7zip/Compress/BranchMisc.h +27 -6
- data/ext/p7zip/CPP/7zip/Compress/BranchRegister.cpp +26 -15
- data/ext/p7zip/CPP/7zip/Compress/ByteSwap.cpp +45 -26
- data/ext/p7zip/CPP/7zip/Compress/CodecExports.cpp +254 -70
- data/ext/p7zip/CPP/7zip/Compress/CopyCoder.cpp +65 -17
- data/ext/p7zip/CPP/7zip/Compress/CopyCoder.h +15 -3
- data/ext/p7zip/CPP/7zip/Compress/CopyRegister.cpp +5 -4
- data/ext/p7zip/CPP/7zip/Compress/Deflate64Register.cpp +12 -6
- data/ext/p7zip/CPP/7zip/Compress/DeflateConst.h +43 -46
- data/ext/p7zip/CPP/7zip/Compress/DeflateDecoder.cpp +145 -81
- data/ext/p7zip/CPP/7zip/Compress/DeflateDecoder.h +31 -33
- data/ext/p7zip/CPP/7zip/Compress/DeflateEncoder.cpp +179 -162
- data/ext/p7zip/CPP/7zip/Compress/DeflateEncoder.h +35 -30
- data/ext/p7zip/CPP/7zip/Compress/DeflateRegister.cpp +11 -7
- data/ext/p7zip/CPP/7zip/Compress/DeltaFilter.cpp +55 -39
- data/ext/p7zip/CPP/7zip/Compress/{DllExports2.cpp → DllExports2Compress.cpp} +8 -8
- data/ext/p7zip/CPP/7zip/Compress/DllExportsCompress.cpp +48 -0
- data/ext/p7zip/CPP/7zip/Compress/HuffmanDecoder.h +220 -49
- data/ext/p7zip/CPP/7zip/Compress/ImplodeDecoder.cpp +14 -9
- data/ext/p7zip/CPP/7zip/Compress/ImplodeDecoder.h +2 -3
- data/ext/p7zip/CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp +7 -7
- data/ext/p7zip/CPP/7zip/Compress/ImplodeHuffmanDecoder.h +1 -1
- data/ext/p7zip/CPP/7zip/Compress/LzOutWindow.cpp +1 -1
- data/ext/p7zip/CPP/7zip/Compress/LzOutWindow.h +21 -18
- data/ext/p7zip/CPP/7zip/Compress/LzhDecoder.cpp +171 -141
- data/ext/p7zip/CPP/7zip/Compress/LzhDecoder.h +32 -64
- data/ext/p7zip/CPP/7zip/Compress/Lzham/LICENSE +22 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/LzhamRegister.cpp +783 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/README.md +211 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham.h +803 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_dynamic_lib.h +156 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_exports.inc +31 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_static_lib.h +59 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/zlib.h +2 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/CMakeLists.txt +69 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_comp.h +38 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.cpp +244 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.h +46 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp.cpp +750 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.cpp +2240 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.h +503 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_state.cpp +1684 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.cpp +947 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.h +164 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_null_threading.h +98 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.cpp +214 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.h +535 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_threading.h +12 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_win32_threading.cpp +232 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_win32_threading.h +387 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzhamcomp.vcxproj +208 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/CMakeLists.txt +86 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.cpp +80 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.h +58 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.cpp +73 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.h +13 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_config.h +25 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_core.h +303 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_decomp.h +37 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_helpers.h +54 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.cpp +286 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.h +32 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecomp.cpp +1586 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.cpp +131 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.h +89 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_math.h +142 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.cpp +463 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.h +115 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.cpp +159 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.h +284 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.cpp +431 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.h +157 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.cpp +1527 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.h +494 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.cpp +147 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.h +99 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_traits.h +141 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_types.h +72 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_utils.h +58 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.cpp +83 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.h +628 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzhamdecomp.vcxproj +224 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamlib/lzham_lib.cpp +179 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamlib/lzhamlib.vcxproj +187 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile +10 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile.depend +0 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile.list +129 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Decoder.cpp +123 -46
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Decoder.h +29 -14
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Encoder.cpp +14 -9
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Encoder.h +1 -1
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Register.cpp +9 -7
- data/ext/p7zip/CPP/7zip/Compress/LzmaDecoder.cpp +24 -8
- data/ext/p7zip/CPP/7zip/Compress/LzmaDecoder.h +8 -1
- data/ext/p7zip/CPP/7zip/Compress/LzmaEncoder.cpp +30 -27
- data/ext/p7zip/CPP/7zip/Compress/LzmaEncoder.h +3 -1
- data/ext/p7zip/CPP/7zip/Compress/LzmaRegister.cpp +9 -7
- data/ext/p7zip/CPP/7zip/Compress/LzmsDecoder.cpp +576 -0
- data/ext/p7zip/CPP/7zip/Compress/LzmsDecoder.h +271 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzx.h +32 -36
- data/ext/p7zip/CPP/7zip/Compress/LzxDecoder.cpp +380 -238
- data/ext/p7zip/CPP/7zip/Compress/LzxDecoder.h +170 -83
- data/ext/p7zip/CPP/7zip/Compress/Mtf8.h +7 -9
- data/ext/p7zip/CPP/7zip/Compress/PpmdDecoder.cpp +1 -5
- data/ext/p7zip/CPP/7zip/Compress/PpmdEncoder.cpp +51 -18
- data/ext/p7zip/CPP/7zip/Compress/PpmdEncoder.h +18 -8
- data/ext/p7zip/CPP/7zip/Compress/PpmdRegister.cpp +9 -8
- data/ext/p7zip/CPP/7zip/Compress/PpmdZip.cpp +61 -25
- data/ext/p7zip/CPP/7zip/Compress/PpmdZip.h +21 -6
- data/ext/p7zip/CPP/7zip/Compress/QuantumDecoder.cpp +122 -102
- data/ext/p7zip/CPP/7zip/Compress/QuantumDecoder.h +68 -157
- data/ext/p7zip/CPP/7zip/Compress/Rar/makefile +33 -18
- data/ext/p7zip/CPP/7zip/Compress/Rar/makefile.depend +0 -158
- data/ext/p7zip/CPP/7zip/Compress/Rar/makefile.list +105 -56
- data/ext/p7zip/CPP/7zip/Compress/Rar1Decoder.cpp +34 -21
- data/ext/p7zip/CPP/7zip/Compress/Rar1Decoder.h +2 -0
- data/ext/p7zip/CPP/7zip/Compress/Rar2Decoder.cpp +77 -67
- data/ext/p7zip/CPP/7zip/Compress/Rar2Decoder.h +12 -10
- data/ext/p7zip/CPP/7zip/Compress/Rar3Decoder.cpp +139 -118
- data/ext/p7zip/CPP/7zip/Compress/Rar3Decoder.h +48 -33
- data/ext/p7zip/CPP/7zip/Compress/Rar3Vm.cpp +148 -113
- data/ext/p7zip/CPP/7zip/Compress/Rar3Vm.h +35 -19
- data/ext/p7zip/CPP/7zip/Compress/Rar5Decoder.cpp +961 -0
- data/ext/p7zip/CPP/7zip/Compress/Rar5Decoder.h +335 -0
- data/ext/p7zip/CPP/7zip/Compress/RarCodecsRegister.cpp +13 -6
- data/ext/p7zip/CPP/7zip/Compress/ShrinkDecoder.cpp +91 -71
- data/ext/p7zip/CPP/7zip/Compress/ShrinkDecoder.h +2 -4
- data/ext/p7zip/CPP/7zip/Compress/XpressDecoder.cpp +129 -0
- data/ext/p7zip/CPP/7zip/Compress/XpressDecoder.h +13 -0
- data/ext/p7zip/CPP/7zip/Compress/ZDecoder.cpp +98 -20
- data/ext/p7zip/CPP/7zip/Compress/ZDecoder.h +19 -7
- data/ext/p7zip/CPP/7zip/Compress/ZlibDecoder.cpp +14 -11
- data/ext/p7zip/CPP/7zip/Compress/ZlibDecoder.h +32 -1
- data/ext/p7zip/CPP/7zip/Crypto/7zAes.cpp +137 -101
- data/ext/p7zip/CPP/7zip/Crypto/7zAes.h +31 -30
- data/ext/p7zip/CPP/7zip/Crypto/7zAesRegister.cpp +8 -9
- data/ext/p7zip/CPP/7zip/Crypto/HmacSha1.cpp +39 -28
- data/ext/p7zip/CPP/7zip/Crypto/HmacSha1.h +3 -3
- data/ext/p7zip/CPP/7zip/Crypto/HmacSha256.cpp +62 -0
- data/ext/p7zip/CPP/7zip/Crypto/HmacSha256.h +27 -0
- data/ext/p7zip/CPP/7zip/Crypto/MyAes.cpp +73 -7
- data/ext/p7zip/CPP/7zip/Crypto/MyAes.h +25 -8
- data/ext/p7zip/CPP/7zip/Crypto/MyAesReg.cpp +16 -0
- data/ext/p7zip/CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp +29 -15
- data/ext/p7zip/CPP/7zip/Crypto/Pbkdf2HmacSha1.h +2 -1
- data/ext/p7zip/CPP/7zip/Crypto/RandGen.cpp +49 -34
- data/ext/p7zip/CPP/7zip/Crypto/RandGen.h +2 -2
- data/ext/p7zip/CPP/7zip/Crypto/Rar20Crypto.cpp +36 -39
- data/ext/p7zip/CPP/7zip/Crypto/Rar20Crypto.h +15 -17
- data/ext/p7zip/CPP/7zip/Crypto/Rar5Aes.cpp +257 -0
- data/ext/p7zip/CPP/7zip/Crypto/Rar5Aes.h +84 -0
- data/ext/p7zip/CPP/7zip/Crypto/RarAes.cpp +70 -71
- data/ext/p7zip/CPP/7zip/Crypto/RarAes.h +24 -19
- data/ext/p7zip/CPP/7zip/Crypto/Sha1Cls.h +51 -0
- data/ext/p7zip/CPP/7zip/Crypto/WzAes.cpp +68 -54
- data/ext/p7zip/CPP/7zip/Crypto/WzAes.h +37 -27
- data/ext/p7zip/CPP/7zip/Crypto/ZipCrypto.cpp +60 -34
- data/ext/p7zip/CPP/7zip/Crypto/ZipCrypto.h +28 -11
- data/ext/p7zip/CPP/7zip/Crypto/ZipStrong.cpp +90 -28
- data/ext/p7zip/CPP/7zip/Crypto/ZipStrong.h +13 -2
- data/ext/p7zip/CPP/7zip/Guid.txt +57 -11
- data/ext/p7zip/CPP/7zip/ICoder.h +202 -17
- data/ext/p7zip/CPP/7zip/IDecl.h +16 -3
- data/ext/p7zip/CPP/7zip/IPassword.h +1 -2
- data/ext/p7zip/CPP/7zip/IProgress.h +2 -16
- data/ext/p7zip/CPP/7zip/IStream.h +82 -13
- data/ext/p7zip/CPP/7zip/MyVersion.h +2 -11
- data/ext/p7zip/CPP/7zip/PropID.h +60 -9
- data/ext/p7zip/CPP/Common/C_FileIO.cpp +5 -1
- data/ext/p7zip/CPP/Common/C_FileIO.h +7 -1
- data/ext/p7zip/CPP/Common/CommandLineParser.cpp +122 -148
- data/ext/p7zip/CPP/Common/CommandLineParser.h +20 -29
- data/ext/p7zip/CPP/Common/Common.h +13 -0
- data/ext/p7zip/CPP/Common/CrcReg.cpp +98 -0
- data/ext/p7zip/CPP/Common/Defs.h +5 -10
- data/ext/p7zip/CPP/Common/DynLimBuf.cpp +93 -0
- data/ext/p7zip/CPP/Common/DynLimBuf.h +40 -0
- data/ext/p7zip/CPP/Common/DynamicBuffer.h +45 -31
- data/ext/p7zip/CPP/Common/IntToString.cpp +109 -40
- data/ext/p7zip/CPP/Common/IntToString.h +14 -9
- data/ext/p7zip/CPP/Common/Lang.cpp +120 -87
- data/ext/p7zip/CPP/Common/Lang.h +10 -15
- data/ext/p7zip/CPP/Common/ListFileUtils.cpp +82 -40
- data/ext/p7zip/CPP/Common/ListFileUtils.h +7 -4
- data/ext/p7zip/CPP/Common/MyBuffer.h +244 -0
- data/ext/p7zip/CPP/Common/MyCom.h +65 -28
- data/ext/p7zip/CPP/Common/MyGuidDef.h +1 -1
- data/ext/p7zip/CPP/Common/MyInitGuid.h +23 -0
- data/ext/p7zip/CPP/Common/MyLinux.h +42 -0
- data/ext/p7zip/CPP/Common/MyMap.cpp +8 -8
- data/ext/p7zip/CPP/Common/MyMap.h +2 -2
- data/ext/p7zip/CPP/Common/MyString.cpp +1643 -117
- data/ext/p7zip/CPP/Common/MyString.h +677 -486
- data/ext/p7zip/CPP/Common/MyTypes.h +38 -0
- data/ext/p7zip/CPP/Common/MyUnknown.h +4 -0
- data/ext/p7zip/CPP/Common/MyVector.cpp +0 -84
- data/ext/p7zip/CPP/Common/MyVector.h +472 -112
- data/ext/p7zip/CPP/Common/MyWindows.cpp +18 -1
- data/ext/p7zip/CPP/Common/MyWindows.h +8 -0
- data/ext/p7zip/CPP/Common/MyXml.cpp +169 -118
- data/ext/p7zip/CPP/Common/MyXml.h +14 -11
- data/ext/p7zip/CPP/Common/NewHandler.cpp +39 -0
- data/ext/p7zip/CPP/Common/NewHandler.h +55 -2
- data/ext/p7zip/CPP/Common/Random.h +14 -0
- data/ext/p7zip/CPP/Common/Sha1Reg.cpp +40 -0
- data/ext/p7zip/CPP/Common/Sha256Reg.cpp +40 -0
- data/ext/p7zip/CPP/Common/StdInStream.cpp +46 -27
- data/ext/p7zip/CPP/Common/StdInStream.h +11 -10
- data/ext/p7zip/CPP/Common/StdOutStream.cpp +48 -35
- data/ext/p7zip/CPP/Common/StdOutStream.h +44 -17
- data/ext/p7zip/CPP/Common/StringConvert.cpp +56 -17
- data/ext/p7zip/CPP/Common/StringConvert.h +7 -3
- data/ext/p7zip/CPP/Common/StringToInt.cpp +102 -48
- data/ext/p7zip/CPP/Common/StringToInt.h +13 -10
- data/ext/p7zip/CPP/Common/TextConfig.cpp +33 -47
- data/ext/p7zip/CPP/Common/TextConfig.h +3 -6
- data/ext/p7zip/CPP/Common/UTFConvert.cpp +218 -75
- data/ext/p7zip/CPP/Common/UTFConvert.h +4 -3
- data/ext/p7zip/CPP/Common/Wildcard.cpp +345 -125
- data/ext/p7zip/CPP/Common/Wildcard.h +82 -13
- data/ext/p7zip/CPP/Common/XzCrc64Reg.cpp +42 -0
- data/ext/p7zip/CPP/Windows/FileDir.cpp +427 -475
- data/ext/p7zip/CPP/Windows/FileDir.h +94 -72
- data/ext/p7zip/CPP/Windows/FileFind.cpp +235 -244
- data/ext/p7zip/CPP/Windows/FileFind.h +63 -59
- data/ext/p7zip/CPP/Windows/FileIO.cpp +29 -46
- data/ext/p7zip/CPP/Windows/FileIO.h +40 -42
- data/ext/p7zip/CPP/Windows/FileName.cpp +696 -17
- data/ext/p7zip/CPP/Windows/FileName.h +11 -3
- data/ext/p7zip/CPP/Windows/NtCheck.h +2 -0
- data/ext/p7zip/CPP/Windows/PropVariant.cpp +134 -30
- data/ext/p7zip/CPP/Windows/PropVariant.h +80 -24
- data/ext/p7zip/CPP/Windows/PropVariantUtils.cpp +89 -18
- data/ext/p7zip/CPP/Windows/PropVariantUtils.h +12 -7
- data/ext/p7zip/CPP/Windows/System.cpp +20 -15
- data/ext/p7zip/CPP/Windows/System.h +3 -2
- data/ext/p7zip/CPP/Windows/TimeUtils.cpp +203 -0
- data/ext/p7zip/CPP/Windows/TimeUtils.h +24 -0
- data/ext/p7zip/CPP/include_windows/basetyps.h +4 -4
- data/ext/p7zip/CPP/include_windows/windows.h +17 -11
- data/ext/p7zip/CPP/myWindows/StdAfx.h +97 -5
- data/ext/p7zip/CPP/myWindows/config.h +20 -5
- data/ext/p7zip/CPP/myWindows/myPrivate.h +8 -0
- data/ext/p7zip/CPP/myWindows/wine_date_and_time.cpp +34 -0
- data/ext/p7zip/ChangeLog +283 -35
- data/ext/p7zip/{DOCS → DOC}/7zC.txt +6 -13
- data/ext/p7zip/{DOCS → DOC}/License.txt +3 -2
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/add.htm +93 -87
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/bench.htm +88 -79
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/delete.htm +62 -59
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/extract.htm +96 -91
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/extract_full.htm +73 -68
- data/ext/p7zip/DOC/MANUAL/cmdline/commands/hash.htm +65 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/index.htm +36 -33
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/list.htm +78 -77
- data/ext/p7zip/DOC/MANUAL/cmdline/commands/rename.htm +51 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/style.css +232 -232
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/test.htm +47 -46
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/update.htm +71 -66
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/exit_codes.htm +27 -27
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/index.htm +29 -29
- data/ext/p7zip/{DOCS/MANUAL/switches → DOC/MANUAL/cmdline}/style.css +232 -232
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_exclude.htm +56 -56
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_include.htm +80 -83
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_no.htm +52 -52
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/bb.htm +61 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/bs.htm +67 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/charset.htm +61 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/exclude.htm +71 -60
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/include.htm +89 -87
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/index.htm +95 -64
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/large_pages.htm +59 -50
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/list_tech.htm +36 -36
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/method.htm +738 -625
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/output_dir.htm +53 -53
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/overwrite.htm +56 -56
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/password.htm +55 -54
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/recurse.htm +85 -83
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/sa.htm +58 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/scc.htm +42 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm +53 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm +39 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/sfx.htm +153 -156
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/shared.htm +40 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/sni.htm +56 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/sns.htm +77 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/spf.htm +80 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ssc.htm +50 -50
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stdin.htm +56 -55
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stdout.htm +54 -50
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/stl.htm +39 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stop_switch.htm +31 -31
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/stx.htm +50 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline/switches}/style.css +232 -232
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/type.htm +121 -83
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/update.htm +177 -176
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/volume.htm +49 -49
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/working_dir.htm +56 -55
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/yes.htm +48 -48
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/syntax.htm +120 -120
- data/ext/p7zip/DOC/MANUAL/fm/about.htm +21 -0
- data/ext/p7zip/DOC/MANUAL/fm/benchmark.htm +56 -0
- data/ext/p7zip/DOC/MANUAL/fm/index.htm +54 -0
- data/ext/p7zip/DOC/MANUAL/fm/menu.htm +154 -0
- data/ext/p7zip/DOC/MANUAL/fm/options.htm +152 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm +311 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm +78 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm +63 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css +232 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/index.htm +22 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/style.css +232 -0
- data/ext/p7zip/DOC/MANUAL/fm/style.css +232 -0
- data/ext/p7zip/DOC/MANUAL/general/7z.htm +117 -0
- data/ext/p7zip/DOC/MANUAL/general/faq.htm +125 -0
- data/ext/p7zip/DOC/MANUAL/general/formats.htm +100 -0
- data/ext/p7zip/DOC/MANUAL/general/index.htm +27 -0
- data/ext/p7zip/DOC/MANUAL/general/license.htm +30 -0
- data/ext/p7zip/DOC/MANUAL/general/performance.htm +98 -0
- data/ext/p7zip/DOC/MANUAL/general/style.css +232 -0
- data/ext/p7zip/DOC/MANUAL/general/thanks.htm +43 -0
- data/ext/p7zip/DOC/MANUAL/start.htm +37 -0
- data/ext/p7zip/DOC/MANUAL/style.css +232 -0
- data/ext/p7zip/DOC/Methods.txt +158 -0
- data/ext/p7zip/{DOCS → DOC}/copying.txt +9 -11
- data/ext/p7zip/DOC/lzma.txt +328 -0
- data/ext/p7zip/{DOCS → DOC}/readme.txt +42 -65
- data/ext/p7zip/{DOCS/history.txt → DOC/src-history.txt} +88 -2
- data/ext/p7zip/README +117 -91
- data/ext/p7zip/TODO +0 -2
- data/ext/p7zip/install.sh +31 -29
- data/ext/p7zip/last_error +1 -0
- data/ext/p7zip/makefile +29 -125
- data/ext/p7zip/makefile.afl +23 -0
- data/ext/p7zip/makefile.aix_gcc +5 -4
- data/ext/p7zip/makefile.android_arm +49 -0
- data/ext/p7zip/makefile.beos +5 -4
- data/ext/p7zip/makefile.common +150 -0
- data/ext/p7zip/makefile.crc32 +3 -3
- data/ext/p7zip/makefile.cygwin +5 -4
- data/ext/p7zip/makefile.cygwin64 +21 -0
- data/ext/p7zip/makefile.cygwin64_asm +22 -0
- data/ext/p7zip/makefile.cygwin_asm +6 -4
- data/ext/p7zip/makefile.cygwin_clang +21 -0
- data/ext/p7zip/makefile.cygwin_clang_asm +23 -0
- data/ext/p7zip/{makefile.djgpp_old → makefile.djgpp} +5 -4
- data/ext/p7zip/makefile.djgpp_watt +7 -5
- data/ext/p7zip/makefile.freebsd5 +5 -4
- data/ext/p7zip/{makefile.freebsd6 → makefile.freebsd6+} +6 -5
- data/ext/p7zip/makefile.glb +27 -18
- data/ext/p7zip/makefile.gprof +3 -2
- data/ext/p7zip/makefile.haiku +19 -0
- data/ext/p7zip/makefile.hpux-acc +3 -2
- data/ext/p7zip/makefile.hpux-acc_64 +3 -2
- data/ext/p7zip/makefile.hpux-gcc +5 -4
- data/ext/p7zip/makefile.linux_amd64 +5 -4
- data/ext/p7zip/makefile.linux_amd64_asm +12 -5
- data/ext/p7zip/makefile.linux_amd64_asm_icc +5 -3
- data/ext/p7zip/makefile.linux_amd64_sanitizer +26 -0
- data/ext/p7zip/makefile.linux_any_cpu +5 -4
- data/ext/p7zip/makefile.linux_any_cpu_gcc_4.X +7 -4
- data/ext/p7zip/makefile.linux_clang_amd64_asm +25 -0
- data/ext/p7zip/makefile.linux_clang_amd64_asm_sanitize +27 -0
- data/ext/p7zip/makefile.linux_cross_aarch64 +25 -0
- data/ext/p7zip/makefile.linux_cross_arm +7 -4
- data/ext/p7zip/makefile.linux_cross_djgpp +27 -0
- data/ext/p7zip/makefile.linux_cross_m68k +26 -0
- data/ext/p7zip/makefile.linux_cross_mipsel +27 -0
- data/ext/p7zip/makefile.linux_cross_ppc +25 -0
- data/ext/p7zip/makefile.linux_cross_ppc64 +25 -0
- data/ext/p7zip/makefile.linux_cross_ppc64le +25 -0
- data/ext/p7zip/makefile.linux_cross_s390x +25 -0
- data/ext/p7zip/makefile.linux_cross_sparc64 +25 -0
- data/ext/p7zip/makefile.linux_gcc6_sanitize +23 -0
- data/ext/p7zip/makefile.linux_gcc_2.95_no_need_for_libstdc +6 -4
- data/ext/p7zip/makefile.linux_other +6 -5
- data/ext/p7zip/makefile.linux_s390x +5 -4
- data/ext/p7zip/{makefile.machine_base → makefile.linux_scan-build} +5 -4
- data/ext/p7zip/makefile.linux_valgrind +25 -0
- data/ext/p7zip/{makefile.linux_clang_amd64 → makefile.linux_x32} +6 -5
- data/ext/p7zip/makefile.linux_x86_asm_gcc_4.X +10 -5
- data/ext/p7zip/makefile.linux_x86_asm_gcc_4.X_fltk +8 -4
- data/ext/p7zip/makefile.linux_x86_asm_gcc_mudflap_4.X +4 -2
- data/ext/p7zip/makefile.linux_x86_asm_icc +4 -2
- data/ext/p7zip/makefile.linux_x86_icc +3 -2
- data/ext/p7zip/makefile.macosx_arm64 +17 -0
- data/ext/p7zip/{makefile.macosx_32bits → makefile.macosx_gcc_32bits} +3 -2
- data/ext/p7zip/{makefile.macosx_32bits_asm → makefile.macosx_gcc_32bits_asm} +5 -3
- data/ext/p7zip/{makefile.macosx_32bits_ppc → makefile.macosx_gcc_32bits_ppc} +3 -2
- data/ext/p7zip/{makefile.macosx_64bits → makefile.macosx_gcc_64bits} +3 -2
- data/ext/p7zip/makefile.macosx_llvm_64bits +9 -3
- data/ext/p7zip/makefile.netbsd +5 -4
- data/ext/p7zip/makefile.netware_asm_gcc_3.X +6 -4
- data/ext/p7zip/makefile.oldmake +41 -130
- data/ext/p7zip/makefile.openbsd +7 -3
- data/ext/p7zip/makefile.openbsd_no_port +9 -5
- data/ext/p7zip/makefile.qnx_shared.bin +5 -4
- data/ext/p7zip/makefile.qnx_static +5 -4
- data/ext/p7zip/makefile.solaris_sparc_CC_32 +5 -4
- data/ext/p7zip/makefile.solaris_sparc_CC_64 +6 -4
- data/ext/p7zip/makefile.solaris_sparc_gcc +7 -6
- data/ext/p7zip/makefile.solaris_x86 +5 -4
- data/ext/p7zip/makefile.tru64 +5 -4
- data/ext/seven_zip_ruby/extconf.rb +92 -6
- data/ext/seven_zip_ruby/seven_zip_archive.cpp +42 -19
- data/ext/seven_zip_ruby/seven_zip_archive.h +1 -1
- data/ext/seven_zip_ruby/utils.cpp +267 -124
- data/ext/seven_zip_ruby/utils.h +2 -0
- data/lib/seven_zip_ruby/7z.dll +0 -0
- data/lib/seven_zip_ruby/7z.sfx +0 -0
- data/lib/seven_zip_ruby/7z64.dll +0 -0
- data/lib/seven_zip_ruby/7zCon.sfx +0 -0
- data/lib/seven_zip_ruby/seven_zip_reader.rb +16 -1
- data/lib/seven_zip_ruby/version.rb +1 -1
- data/p7zip/.gitignore +7 -0
- data/p7zip/README.txt +29 -0
- data/p7zip/extract.sh +134 -0
- data/spec/seven_zip_ruby_spec.rb +22 -13
- data/test/res/The Flying Spaghetti Monster.txt +3 -0
- data/test/res/The Three Little Pigs.txt +5 -0
- data/test/res/UTF_content.txt +3 -0
- data/test/res/test_reader_data.7z +0 -0
- data/test/res/test_reader_filename_cp932.7z +0 -0
- data/test/res/test_reader_files.7z +0 -0
- data/test/test_seven_zip_reader.rb +187 -0
- data/test/test_seven_zip_writer.rb +184 -0
- metadata +266 -219
- data/.github/workflows/ci.yml +0 -31
- data/ext/C/Types.h +0 -254
- data/ext/CPP/7zip/Archive/IArchive.h +0 -234
- data/ext/CPP/7zip/IDecl.h +0 -15
- data/ext/CPP/7zip/IPassword.h +0 -24
- data/ext/CPP/7zip/IProgress.h +0 -33
- data/ext/CPP/7zip/IStream.h +0 -58
- data/ext/CPP/7zip/PropID.h +0 -76
- data/ext/CPP/Common/MyCom.h +0 -225
- data/ext/CPP/Common/MyGuidDef.h +0 -54
- data/ext/CPP/Common/MyInitGuid.h +0 -22
- data/ext/CPP/Common/MyUnknown.h +0 -13
- data/ext/CPP/Common/MyWindows.h +0 -204
- data/ext/CPP/Common/Types.h +0 -11
- data/ext/CPP/Windows/PropVariant.h +0 -56
- data/ext/CPP/include_windows/basetyps.h +0 -19
- data/ext/CPP/include_windows/tchar.h +0 -89
- data/ext/CPP/include_windows/windows.h +0 -194
- data/ext/p7zip/Asm/x64/7zCrcT8U.asm +0 -103
- data/ext/p7zip/Asm/x86/7zCrcT8U.asm +0 -101
- data/ext/p7zip/C/7zCrcT8.c +0 -43
- data/ext/p7zip/C/Alloc.back3 +0 -238
- data/ext/p7zip/C/Alloc.c.back +0 -243
- data/ext/p7zip/C/Alloc.c.back2 +0 -222
- data/ext/p7zip/C/LzmaUtil/Lzma86Dec.h +0 -51
- data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderOutStream.cpp +0 -149
- data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderOutStream.h +0 -58
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHeader.cpp +0 -24
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHeader.h +0 -28
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Com/ComHandler.cpp +0 -239
- data/ext/p7zip/CPP/7zip/Archive/Com/ComHandler.h +0 -28
- data/ext/p7zip/CPP/7zip/Archive/Com/ComIn.cpp +0 -389
- data/ext/p7zip/CPP/7zip/Archive/Com/ComIn.h +0 -119
- data/ext/p7zip/CPP/7zip/Archive/Com/ComRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2MT.cpp +0 -240
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2MT.h +0 -80
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2ST.cpp +0 -239
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2ST.h +0 -88
- data/ext/p7zip/CPP/7zip/Archive/Common/CrossThreadProgress.cpp +0 -15
- data/ext/p7zip/CPP/7zip/Archive/Common/CrossThreadProgress.h +0 -37
- data/ext/p7zip/CPP/7zip/Archive/DebHandler.cpp +0 -413
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsHandler.cpp +0 -243
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsHandler.h +0 -26
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsIn.cpp +0 -480
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsIn.h +0 -154
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarHeader.cpp +0 -21
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarIn.cpp +0 -478
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarIn.h +0 -123
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarItem.cpp +0 -55
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp +0 -78
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarVolumeInStream.h +0 -49
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHeader.cpp +0 -36
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItemEx.h +0 -34
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7zFM.txt +0 -163
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7zG.txt +0 -131
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7za.txt +0 -253
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_ALL.txt +0 -32
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_Format7zFree.txt +0 -290
- data/ext/p7zip/CPP/7zip/CMAKE/generate.sh +0 -37
- data/ext/p7zip/CPP/7zip/CMAKE/generate_xcode.sh +0 -32
- data/ext/p7zip/CPP/7zip/Common/LockedStream.cpp +0 -23
- data/ext/p7zip/CPP/7zip/Common/LockedStream.h +0 -38
- data/ext/p7zip/CPP/7zip/Compress/ArjDecoder1.cpp +0 -309
- data/ext/p7zip/CPP/7zip/Compress/ArjDecoder1.h +0 -98
- data/ext/p7zip/CPP/7zip/Compress/ArjDecoder2.cpp +0 -90
- data/ext/p7zip/CPP/7zip/Compress/ArjDecoder2.h +0 -59
- data/ext/p7zip/CPP/7zip/Compress/BranchCoder.cpp +0 -19
- data/ext/p7zip/CPP/7zip/Compress/BranchCoder.h +0 -44
- data/ext/p7zip/CPP/7zip/Compress/DllExports.cpp +0 -39
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp +0 -531
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp +0 -1018
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h +0 -48
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp +0 -311
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h +0 -20
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/makefile +0 -173
- data/ext/p7zip/CPP/7zip/Compress/Lzx86Converter.cpp +0 -90
- data/ext/p7zip/CPP/7zip/Compress/Lzx86Converter.h +0 -46
- data/ext/p7zip/CPP/7zip/Compress/RangeCoder.h +0 -205
- data/ext/p7zip/CPP/7zip/Compress/RangeCoderBit.h +0 -114
- data/ext/p7zip/CPP/7zip/Crypto/Sha1.cpp +0 -229
- data/ext/p7zip/CPP/7zip/Crypto/Sha1.h +0 -68
- data/ext/p7zip/CPP/7zip/PREMAKE/generate.sh +0 -18
- data/ext/p7zip/CPP/7zip/PREMAKE/premake4.lua +0 -263
- data/ext/p7zip/CPP/7zip/QMAKE/7ZA/7ZA.pro +0 -228
- data/ext/p7zip/CPP/7zip/QMAKE/7ZA/7ZA_osx.pro +0 -228
- data/ext/p7zip/CPP/7zip/QMAKE/test_emul/test_emul.pro +0 -26
- data/ext/p7zip/CPP/7zip/TEST/TestUI/TestUI.cpp +0 -560
- data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile +0 -33
- data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile.depend +0 -577
- data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile.list +0 -16
- data/ext/p7zip/CPP/Common/Buffer.h +0 -77
- data/ext/p7zip/CPP/Common/Types.h +0 -11
- data/ext/p7zip/CPP/Windows/COM.cpp +0 -37
- data/ext/p7zip/CPP/Windows/COM.h +0 -69
- data/ext/p7zip/CPP/Windows/Clipboard.cpp +0 -160
- data/ext/p7zip/CPP/Windows/Clipboard.h +0 -28
- data/ext/p7zip/CPP/Windows/CommonDialog.h +0 -19
- data/ext/p7zip/CPP/Windows/Control/ComboBox.h +0 -82
- data/ext/p7zip/CPP/Windows/Control/Controls.cpp +0 -515
- data/ext/p7zip/CPP/Windows/Control/Dialog.cpp +0 -560
- data/ext/p7zip/CPP/Windows/Control/Dialog.h +0 -179
- data/ext/p7zip/CPP/Windows/Control/DialogImpl.h +0 -73
- data/ext/p7zip/CPP/Windows/Control/Edit.h +0 -24
- data/ext/p7zip/CPP/Windows/Control/ListView.h +0 -164
- data/ext/p7zip/CPP/Windows/Control/ProgressBar.h +0 -34
- data/ext/p7zip/CPP/Windows/Control/Static.h +0 -23
- data/ext/p7zip/CPP/Windows/Control/StatusBar.h +0 -56
- data/ext/p7zip/CPP/Windows/Control/Window2.cpp +0 -211
- data/ext/p7zip/CPP/Windows/Control/Window2.h +0 -111
- data/ext/p7zip/CPP/Windows/DLL.cpp +0 -193
- data/ext/p7zip/CPP/Windows/DLL.h +0 -48
- data/ext/p7zip/CPP/Windows/Error.cpp +0 -58
- data/ext/p7zip/CPP/Windows/Error.h +0 -33
- data/ext/p7zip/CPP/Windows/Menu.h +0 -4
- data/ext/p7zip/CPP/Windows/PropVariantConversions.cpp +0 -142
- data/ext/p7zip/CPP/Windows/PropVariantConversions.h +0 -14
- data/ext/p7zip/CPP/Windows/Registry.cpp +0 -313
- data/ext/p7zip/CPP/Windows/Registry.h +0 -113
- data/ext/p7zip/CPP/Windows/ResourceString.h +0 -22
- data/ext/p7zip/CPP/Windows/Shell.h +0 -21
- data/ext/p7zip/CPP/Windows/Time.cpp +0 -88
- data/ext/p7zip/CPP/Windows/Time.h +0 -21
- data/ext/p7zip/CPP/Windows/Window.cpp +0 -101
- data/ext/p7zip/CPP/Windows/Window.h +0 -43
- data/ext/p7zip/CPP/myWindows/initguid.h +0 -4
- data/ext/p7zip/CPP/myWindows/makefile +0 -21
- data/ext/p7zip/CPP/myWindows/makefile.depend +0 -32
- data/ext/p7zip/CPP/myWindows/makefile.list +0 -28
- data/ext/p7zip/CPP/myWindows/myAddExeFlag.cpp +0 -20
- data/ext/p7zip/CPP/myWindows/myGetTickCount.cpp +0 -8
- data/ext/p7zip/CPP/myWindows/mySplitCommandLine.cpp +0 -82
- data/ext/p7zip/CPP/myWindows/test_emul.cpp +0 -745
- data/ext/p7zip/CPP/myWindows/wine_GetXXXDefaultLangID.cpp +0 -741
- data/ext/p7zip/DOCS/MANUAL/switches/charset.htm +0 -49
- data/ext/p7zip/DOCS/Methods.txt +0 -152
- data/ext/p7zip/DOCS/lzma.txt +0 -598
- data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/ChangeLog +0 -41
- data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/readme +0 -21
- data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/readme.u7z +0 -30
- data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/u7z +0 -133
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/README +0 -21
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/check/check.sh +0 -117
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/check/files.tar +0 -0
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 +0 -33
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/p7zip +0 -144
- data/ext/p7zip/contrib/qnx630sp3/qnx630sp3-shared +0 -14
- data/ext/p7zip/contrib/qnx630sp3/qnx630sp3-static +0 -10
- data/ext/p7zip/integration_context_menu.txt +0 -51
- data/ext/p7zip/makefile.rules +0 -661
- /data/ext/p7zip/{DOCS → DOC}/7zFormat.txt +0 -0
- /data/ext/p7zip/{DOCS → DOC}/unRarLicense.txt +0 -0
@@ -4,118 +4,1041 @@
|
|
4
4
|
|
5
5
|
#include "CoderMixer2.h"
|
6
6
|
|
7
|
-
|
7
|
+
#ifdef USE_MIXER_ST
|
8
8
|
|
9
|
-
|
10
|
-
_srcBindInfo(srcBindInfo)
|
9
|
+
STDMETHODIMP CSequentialInStreamCalcSize::Read(void *data, UInt32 size, UInt32 *processedSize)
|
11
10
|
{
|
12
|
-
|
11
|
+
UInt32 realProcessed = 0;
|
12
|
+
HRESULT result = S_OK;
|
13
|
+
if (_stream)
|
14
|
+
result = _stream->Read(data, size, &realProcessed);
|
15
|
+
_size += realProcessed;
|
16
|
+
if (size != 0 && realProcessed == 0)
|
17
|
+
_wasFinished = true;
|
18
|
+
if (processedSize)
|
19
|
+
*processedSize = realProcessed;
|
20
|
+
return result;
|
21
|
+
}
|
22
|
+
|
23
|
+
|
24
|
+
STDMETHODIMP COutStreamCalcSize::Write(const void *data, UInt32 size, UInt32 *processedSize)
|
25
|
+
{
|
26
|
+
HRESULT result = S_OK;
|
27
|
+
if (_stream)
|
28
|
+
result = _stream->Write(data, size, &size);
|
29
|
+
_size += size;
|
30
|
+
if (processedSize)
|
31
|
+
*processedSize = size;
|
32
|
+
return result;
|
33
|
+
}
|
34
|
+
|
35
|
+
STDMETHODIMP COutStreamCalcSize::OutStreamFinish()
|
36
|
+
{
|
37
|
+
HRESULT result = S_OK;
|
38
|
+
if (_stream)
|
39
|
+
{
|
40
|
+
CMyComPtr<IOutStreamFinish> outStreamFinish;
|
41
|
+
_stream.QueryInterface(IID_IOutStreamFinish, &outStreamFinish);
|
42
|
+
if (outStreamFinish)
|
43
|
+
result = outStreamFinish->OutStreamFinish();
|
44
|
+
}
|
45
|
+
return result;
|
46
|
+
}
|
47
|
+
|
48
|
+
#endif
|
49
|
+
|
50
|
+
|
51
|
+
|
52
|
+
|
53
|
+
namespace NCoderMixer2 {
|
54
|
+
|
55
|
+
static void BoolVector_Fill_False(CBoolVector &v, unsigned size)
|
56
|
+
{
|
57
|
+
v.ClearAndSetSize(size);
|
58
|
+
bool *p = &v[0];
|
59
|
+
for (unsigned i = 0; i < size; i++)
|
60
|
+
p[i] = false;
|
61
|
+
}
|
62
|
+
|
63
|
+
class CBondsChecks
|
64
|
+
{
|
65
|
+
CBoolVector _coderUsed;
|
66
|
+
|
67
|
+
bool Init();
|
68
|
+
bool CheckCoder(unsigned coderIndex);
|
69
|
+
public:
|
70
|
+
const CBindInfo *BindInfo;
|
71
|
+
|
72
|
+
bool Check();
|
73
|
+
};
|
74
|
+
|
75
|
+
bool CBondsChecks::CheckCoder(unsigned coderIndex)
|
76
|
+
{
|
77
|
+
const CCoderStreamsInfo &coder = BindInfo->Coders[coderIndex];
|
78
|
+
|
79
|
+
if (coderIndex >= _coderUsed.Size() || _coderUsed[coderIndex])
|
80
|
+
return false;
|
81
|
+
_coderUsed[coderIndex] = true;
|
82
|
+
|
83
|
+
UInt32 start = BindInfo->Coder_to_Stream[coderIndex];
|
84
|
+
|
85
|
+
for (unsigned i = 0; i < coder.NumStreams; i++)
|
86
|
+
{
|
87
|
+
UInt32 ind = start + i;
|
88
|
+
|
89
|
+
if (BindInfo->IsStream_in_PackStreams(ind))
|
90
|
+
continue;
|
91
|
+
|
92
|
+
int bond = BindInfo->FindBond_for_PackStream(ind);
|
93
|
+
if (bond < 0)
|
94
|
+
return false;
|
95
|
+
if (!CheckCoder(BindInfo->Bonds[bond].UnpackIndex))
|
96
|
+
return false;
|
97
|
+
}
|
98
|
+
|
99
|
+
return true;
|
100
|
+
}
|
101
|
+
|
102
|
+
bool CBondsChecks::Check()
|
103
|
+
{
|
104
|
+
BoolVector_Fill_False(_coderUsed, BindInfo->Coders.Size());
|
105
|
+
|
106
|
+
if (!CheckCoder(BindInfo->UnpackCoder))
|
107
|
+
return false;
|
108
|
+
|
109
|
+
FOR_VECTOR(i, _coderUsed)
|
110
|
+
if (!_coderUsed[i])
|
111
|
+
return false;
|
112
|
+
|
113
|
+
return true;
|
114
|
+
}
|
115
|
+
|
116
|
+
void CBindInfo::ClearMaps()
|
117
|
+
{
|
118
|
+
Coder_to_Stream.Clear();
|
119
|
+
Stream_to_Coder.Clear();
|
120
|
+
}
|
121
|
+
|
122
|
+
bool CBindInfo::CalcMapsAndCheck()
|
123
|
+
{
|
124
|
+
ClearMaps();
|
125
|
+
|
126
|
+
UInt32 numStreams = 0;
|
127
|
+
|
128
|
+
if (Coders.Size() == 0)
|
129
|
+
return false;
|
130
|
+
if (Coders.Size() - 1 != Bonds.Size())
|
131
|
+
return false;
|
132
|
+
|
133
|
+
FOR_VECTOR(i, Coders)
|
134
|
+
{
|
135
|
+
Coder_to_Stream.Add(numStreams);
|
136
|
+
|
137
|
+
const CCoderStreamsInfo &c = Coders[i];
|
138
|
+
|
139
|
+
for (unsigned j = 0; j < c.NumStreams; j++)
|
140
|
+
Stream_to_Coder.Add(i);
|
141
|
+
|
142
|
+
numStreams += c.NumStreams;
|
143
|
+
}
|
144
|
+
|
145
|
+
if (numStreams != GetNum_Bonds_and_PackStreams())
|
146
|
+
return false;
|
147
|
+
|
148
|
+
CBondsChecks bc;
|
149
|
+
bc.BindInfo = this;
|
150
|
+
return bc.Check();
|
151
|
+
}
|
152
|
+
|
153
|
+
|
154
|
+
void CCoder::SetCoderInfo(const UInt64 *unpackSize, const UInt64 * const *packSizes)
|
155
|
+
{
|
156
|
+
if (unpackSize)
|
157
|
+
{
|
158
|
+
UnpackSize = *unpackSize;
|
159
|
+
UnpackSizePointer = &UnpackSize;
|
160
|
+
}
|
161
|
+
else
|
162
|
+
{
|
163
|
+
UnpackSize = 0;
|
164
|
+
UnpackSizePointer = NULL;
|
165
|
+
}
|
166
|
+
|
167
|
+
PackSizes.ClearAndSetSize((unsigned)NumStreams);
|
168
|
+
PackSizePointers.ClearAndSetSize((unsigned)NumStreams);
|
169
|
+
|
170
|
+
for (unsigned i = 0; i < NumStreams; i++)
|
171
|
+
{
|
172
|
+
if (packSizes && packSizes[i])
|
173
|
+
{
|
174
|
+
PackSizes[i] = *(packSizes[i]);
|
175
|
+
PackSizePointers[i] = &PackSizes[i];
|
176
|
+
}
|
177
|
+
else
|
178
|
+
{
|
179
|
+
PackSizes[i] = 0;
|
180
|
+
PackSizePointers[i] = NULL;
|
181
|
+
}
|
182
|
+
}
|
183
|
+
}
|
184
|
+
|
185
|
+
bool CMixer::Is_UnpackSize_Correct_for_Coder(UInt32 coderIndex)
|
186
|
+
{
|
187
|
+
if (coderIndex == _bi.UnpackCoder)
|
188
|
+
return true;
|
189
|
+
|
190
|
+
int bond = _bi.FindBond_for_UnpackStream(coderIndex);
|
191
|
+
if (bond < 0)
|
192
|
+
throw 20150213;
|
193
|
+
|
194
|
+
/*
|
195
|
+
UInt32 coderIndex, coderStreamIndex;
|
196
|
+
_bi.GetCoder_for_Stream(_bi.Bonds[bond].PackIndex, coderIndex, coderStreamIndex);
|
197
|
+
*/
|
198
|
+
UInt32 nextCoder = _bi.Stream_to_Coder[_bi.Bonds[bond].PackIndex];
|
199
|
+
|
200
|
+
if (!IsFilter_Vector[nextCoder])
|
201
|
+
return false;
|
202
|
+
|
203
|
+
return Is_UnpackSize_Correct_for_Coder(nextCoder);
|
204
|
+
}
|
205
|
+
|
206
|
+
bool CMixer::Is_PackSize_Correct_for_Stream(UInt32 streamIndex)
|
207
|
+
{
|
208
|
+
if (_bi.IsStream_in_PackStreams(streamIndex))
|
209
|
+
return true;
|
210
|
+
|
211
|
+
int bond = _bi.FindBond_for_PackStream(streamIndex);
|
212
|
+
if (bond < 0)
|
213
|
+
throw 20150213;
|
214
|
+
|
215
|
+
UInt32 nextCoder = _bi.Bonds[bond].UnpackIndex;
|
216
|
+
|
217
|
+
if (!IsFilter_Vector[nextCoder])
|
218
|
+
return false;
|
219
|
+
|
220
|
+
return Is_PackSize_Correct_for_Coder(nextCoder);
|
221
|
+
}
|
222
|
+
|
223
|
+
bool CMixer::Is_PackSize_Correct_for_Coder(UInt32 coderIndex)
|
224
|
+
{
|
225
|
+
UInt32 startIndex = _bi.Coder_to_Stream[coderIndex];
|
226
|
+
UInt32 numStreams = _bi.Coders[coderIndex].NumStreams;
|
227
|
+
for (UInt32 i = 0; i < numStreams; i++)
|
228
|
+
if (!Is_PackSize_Correct_for_Stream(startIndex + i))
|
229
|
+
return false;
|
230
|
+
return true;
|
231
|
+
}
|
232
|
+
|
233
|
+
bool CMixer::IsThere_ExternalCoder_in_PackTree(UInt32 coderIndex)
|
234
|
+
{
|
235
|
+
if (IsExternal_Vector[coderIndex])
|
236
|
+
return true;
|
237
|
+
UInt32 startIndex = _bi.Coder_to_Stream[coderIndex];
|
238
|
+
UInt32 numStreams = _bi.Coders[coderIndex].NumStreams;
|
239
|
+
for (UInt32 i = 0; i < numStreams; i++)
|
240
|
+
{
|
241
|
+
UInt32 si = startIndex + i;
|
242
|
+
if (_bi.IsStream_in_PackStreams(si))
|
243
|
+
continue;
|
244
|
+
|
245
|
+
int bond = _bi.FindBond_for_PackStream(si);
|
246
|
+
if (bond < 0)
|
247
|
+
throw 20150213;
|
248
|
+
|
249
|
+
if (IsThere_ExternalCoder_in_PackTree(_bi.Bonds[bond].UnpackIndex))
|
250
|
+
return true;
|
251
|
+
}
|
252
|
+
return false;
|
253
|
+
}
|
254
|
+
|
255
|
+
|
256
|
+
|
257
|
+
|
258
|
+
#ifdef USE_MIXER_ST
|
259
|
+
|
260
|
+
CMixerST::CMixerST(bool encodeMode):
|
261
|
+
CMixer(encodeMode)
|
262
|
+
{}
|
263
|
+
|
264
|
+
CMixerST::~CMixerST() {}
|
13
265
|
|
14
|
-
|
15
|
-
|
266
|
+
void CMixerST::AddCoder(const CCreatedCoder &cod)
|
267
|
+
{
|
268
|
+
IsFilter_Vector.Add(cod.IsFilter);
|
269
|
+
IsExternal_Vector.Add(cod.IsExternal);
|
270
|
+
// const CCoderStreamsInfo &c = _bi.Coders[_coders.Size()];
|
271
|
+
CCoderST &c2 = _coders.AddNew();
|
272
|
+
c2.NumStreams = cod.NumStreams;
|
273
|
+
c2.Coder = cod.Coder;
|
274
|
+
c2.Coder2 = cod.Coder2;
|
275
|
+
|
276
|
+
/*
|
277
|
+
if (isFilter)
|
16
278
|
{
|
17
|
-
|
18
|
-
|
279
|
+
c2.CanRead = true;
|
280
|
+
c2.CanWrite = true;
|
19
281
|
}
|
20
|
-
|
282
|
+
else
|
283
|
+
*/
|
21
284
|
{
|
22
|
-
|
23
|
-
|
285
|
+
IUnknown *unk = (cod.Coder ? (IUnknown *)cod.Coder : (IUnknown *)cod.Coder2);
|
286
|
+
{
|
287
|
+
CMyComPtr<ISequentialInStream> s;
|
288
|
+
unk->QueryInterface(IID_ISequentialInStream, (void**)&s);
|
289
|
+
c2.CanRead = (s != NULL);
|
290
|
+
}
|
291
|
+
{
|
292
|
+
CMyComPtr<ISequentialOutStream> s;
|
293
|
+
unk->QueryInterface(IID_ISequentialOutStream, (void**)&s);
|
294
|
+
c2.CanWrite = (s != NULL);
|
295
|
+
}
|
24
296
|
}
|
297
|
+
}
|
298
|
+
|
299
|
+
CCoder &CMixerST::GetCoder(unsigned index)
|
300
|
+
{
|
301
|
+
return _coders[index];
|
302
|
+
}
|
25
303
|
|
26
|
-
|
27
|
-
UInt32 destOutOffset = 0;
|
28
|
-
UInt32 srcInOffset = NumSrcInStreams;
|
29
|
-
UInt32 srcOutOffset = _numSrcOutStreams;
|
304
|
+
void CMixerST::ReInit() {}
|
30
305
|
|
31
|
-
|
306
|
+
HRESULT CMixerST::GetInStream2(
|
307
|
+
ISequentialInStream * const *inStreams, /* const UInt64 * const *inSizes, */
|
308
|
+
UInt32 outStreamIndex, ISequentialInStream **inStreamRes)
|
309
|
+
{
|
310
|
+
UInt32 coderIndex = outStreamIndex, coderStreamIndex = 0;
|
311
|
+
|
312
|
+
if (EncodeMode)
|
32
313
|
{
|
33
|
-
|
314
|
+
_bi.GetCoder_for_Stream(outStreamIndex, coderIndex, coderStreamIndex);
|
315
|
+
if (coderStreamIndex != 0)
|
316
|
+
return E_NOTIMPL;
|
317
|
+
}
|
318
|
+
|
319
|
+
const CCoder &coder = _coders[coderIndex];
|
320
|
+
|
321
|
+
CMyComPtr<ISequentialInStream> seqInStream;
|
322
|
+
coder.QueryInterface(IID_ISequentialInStream, (void **)&seqInStream);
|
323
|
+
if (!seqInStream)
|
324
|
+
return E_NOTIMPL;
|
325
|
+
|
326
|
+
UInt32 numInStreams = EncodeMode ? 1 : coder.NumStreams;
|
327
|
+
UInt32 startIndex = EncodeMode ? coderIndex : _bi.Coder_to_Stream[coderIndex];
|
34
328
|
|
35
|
-
|
36
|
-
|
329
|
+
bool isSet = false;
|
330
|
+
|
331
|
+
if (numInStreams == 1)
|
332
|
+
{
|
333
|
+
CMyComPtr<ICompressSetInStream> setStream;
|
334
|
+
coder.QueryInterface(IID_ICompressSetInStream, (void **)&setStream);
|
335
|
+
if (setStream)
|
336
|
+
{
|
337
|
+
CMyComPtr<ISequentialInStream> seqInStream2;
|
338
|
+
RINOK(GetInStream(inStreams, /* inSizes, */ startIndex + 0, &seqInStream2));
|
339
|
+
RINOK(setStream->SetInStream(seqInStream2));
|
340
|
+
isSet = true;
|
341
|
+
}
|
342
|
+
}
|
343
|
+
|
344
|
+
if (!isSet && numInStreams != 0)
|
345
|
+
{
|
346
|
+
CMyComPtr<ICompressSetInStream2> setStream2;
|
347
|
+
coder.QueryInterface(IID_ICompressSetInStream2, (void **)&setStream2);
|
348
|
+
if (!setStream2)
|
349
|
+
return E_NOTIMPL;
|
37
350
|
|
38
|
-
UInt32
|
39
|
-
|
351
|
+
for (UInt32 i = 0; i < numInStreams; i++)
|
352
|
+
{
|
353
|
+
CMyComPtr<ISequentialInStream> seqInStream2;
|
354
|
+
RINOK(GetInStream(inStreams, /* inSizes, */ startIndex + i, &seqInStream2));
|
355
|
+
RINOK(setStream2->SetInStream2(i, seqInStream2));
|
356
|
+
}
|
357
|
+
}
|
358
|
+
|
359
|
+
*inStreamRes = seqInStream.Detach();
|
360
|
+
return S_OK;
|
361
|
+
}
|
362
|
+
|
363
|
+
|
364
|
+
HRESULT CMixerST::GetInStream(
|
365
|
+
ISequentialInStream * const *inStreams, /* const UInt64 * const *inSizes, */
|
366
|
+
UInt32 inStreamIndex, ISequentialInStream **inStreamRes)
|
367
|
+
{
|
368
|
+
CMyComPtr<ISequentialInStream> seqInStream;
|
369
|
+
|
370
|
+
{
|
371
|
+
int index = -1;
|
372
|
+
if (EncodeMode)
|
373
|
+
{
|
374
|
+
if (_bi.UnpackCoder == inStreamIndex)
|
375
|
+
index = 0;
|
376
|
+
}
|
377
|
+
else
|
378
|
+
index = _bi.FindStream_in_PackStreams(inStreamIndex);
|
379
|
+
|
380
|
+
if (index >= 0)
|
381
|
+
{
|
382
|
+
seqInStream = inStreams[(unsigned)index];
|
383
|
+
*inStreamRes = seqInStream.Detach();
|
384
|
+
return S_OK;
|
385
|
+
}
|
386
|
+
}
|
387
|
+
|
388
|
+
int bond = FindBond_for_Stream(
|
389
|
+
true, // forInputStream
|
390
|
+
inStreamIndex);
|
391
|
+
if (bond < 0)
|
392
|
+
return E_INVALIDARG;
|
393
|
+
|
394
|
+
RINOK(GetInStream2(inStreams, /* inSizes, */
|
395
|
+
_bi.Bonds[bond].Get_OutIndex(EncodeMode), &seqInStream));
|
396
|
+
|
397
|
+
while (_binderStreams.Size() <= (unsigned)bond)
|
398
|
+
_binderStreams.AddNew();
|
399
|
+
CStBinderStream &bs = _binderStreams[bond];
|
400
|
+
|
401
|
+
if (bs.StreamRef || bs.InStreamSpec)
|
402
|
+
return E_NOTIMPL;
|
403
|
+
|
404
|
+
CSequentialInStreamCalcSize *spec = new CSequentialInStreamCalcSize;
|
405
|
+
bs.StreamRef = spec;
|
406
|
+
bs.InStreamSpec = spec;
|
407
|
+
|
408
|
+
spec->SetStream(seqInStream);
|
409
|
+
spec->Init();
|
410
|
+
|
411
|
+
seqInStream = bs.InStreamSpec;
|
412
|
+
|
413
|
+
*inStreamRes = seqInStream.Detach();
|
414
|
+
return S_OK;
|
415
|
+
}
|
416
|
+
|
417
|
+
|
418
|
+
HRESULT CMixerST::GetOutStream(
|
419
|
+
ISequentialOutStream * const *outStreams, /* const UInt64 * const *outSizes, */
|
420
|
+
UInt32 outStreamIndex, ISequentialOutStream **outStreamRes)
|
421
|
+
{
|
422
|
+
CMyComPtr<ISequentialOutStream> seqOutStream;
|
423
|
+
|
424
|
+
{
|
425
|
+
int index = -1;
|
426
|
+
if (!EncodeMode)
|
427
|
+
{
|
428
|
+
if (_bi.UnpackCoder == outStreamIndex)
|
429
|
+
index = 0;
|
430
|
+
}
|
431
|
+
else
|
432
|
+
index = _bi.FindStream_in_PackStreams(outStreamIndex);
|
433
|
+
|
434
|
+
if (index >= 0)
|
435
|
+
{
|
436
|
+
seqOutStream = outStreams[(unsigned)index];
|
437
|
+
*outStreamRes = seqOutStream.Detach();
|
438
|
+
return S_OK;
|
439
|
+
}
|
440
|
+
}
|
441
|
+
|
442
|
+
int bond = FindBond_for_Stream(
|
443
|
+
false, // forInputStream
|
444
|
+
outStreamIndex);
|
445
|
+
if (bond < 0)
|
446
|
+
return E_INVALIDARG;
|
447
|
+
|
448
|
+
UInt32 inStreamIndex = _bi.Bonds[bond].Get_InIndex(EncodeMode);
|
449
|
+
|
450
|
+
UInt32 coderIndex = inStreamIndex;
|
451
|
+
UInt32 coderStreamIndex = 0;
|
452
|
+
|
453
|
+
if (!EncodeMode)
|
454
|
+
_bi.GetCoder_for_Stream(inStreamIndex, coderIndex, coderStreamIndex);
|
455
|
+
|
456
|
+
CCoder &coder = _coders[coderIndex];
|
457
|
+
|
458
|
+
/*
|
459
|
+
if (!coder.Coder)
|
460
|
+
return E_NOTIMPL;
|
461
|
+
*/
|
462
|
+
|
463
|
+
coder.QueryInterface(IID_ISequentialOutStream, (void **)&seqOutStream);
|
464
|
+
if (!seqOutStream)
|
465
|
+
return E_NOTIMPL;
|
466
|
+
|
467
|
+
UInt32 numOutStreams = EncodeMode ? coder.NumStreams : 1;
|
468
|
+
UInt32 startIndex = EncodeMode ? _bi.Coder_to_Stream[coderIndex]: coderIndex;
|
469
|
+
|
470
|
+
bool isSet = false;
|
471
|
+
|
472
|
+
if (numOutStreams == 1)
|
473
|
+
{
|
474
|
+
CMyComPtr<ICompressSetOutStream> setOutStream;
|
475
|
+
coder.Coder.QueryInterface(IID_ICompressSetOutStream, &setOutStream);
|
476
|
+
if (setOutStream)
|
477
|
+
{
|
478
|
+
CMyComPtr<ISequentialOutStream> seqOutStream2;
|
479
|
+
RINOK(GetOutStream(outStreams, /* outSizes, */ startIndex + 0, &seqOutStream2));
|
480
|
+
RINOK(setOutStream->SetOutStream(seqOutStream2));
|
481
|
+
isSet = true;
|
482
|
+
}
|
483
|
+
}
|
484
|
+
|
485
|
+
if (!isSet && numOutStreams != 0)
|
486
|
+
{
|
487
|
+
return E_NOTIMPL;
|
488
|
+
/*
|
489
|
+
CMyComPtr<ICompressSetOutStream2> setStream2;
|
490
|
+
coder.QueryInterface(IID_ICompressSetOutStream2, (void **)&setStream2);
|
491
|
+
if (!setStream2)
|
492
|
+
return E_NOTIMPL;
|
493
|
+
for (UInt32 i = 0; i < numOutStreams; i++)
|
494
|
+
{
|
495
|
+
CMyComPtr<ISequentialOutStream> seqOutStream2;
|
496
|
+
RINOK(GetOutStream(outStreams, startIndex + i, &seqOutStream2));
|
497
|
+
RINOK(setStream2->SetOutStream2(i, seqOutStream2));
|
498
|
+
}
|
499
|
+
*/
|
500
|
+
}
|
501
|
+
|
502
|
+
while (_binderStreams.Size() <= (unsigned)bond)
|
503
|
+
_binderStreams.AddNew();
|
504
|
+
CStBinderStream &bs = _binderStreams[bond];
|
505
|
+
|
506
|
+
if (bs.StreamRef || bs.OutStreamSpec)
|
507
|
+
return E_NOTIMPL;
|
508
|
+
|
509
|
+
COutStreamCalcSize *spec = new COutStreamCalcSize;
|
510
|
+
bs.StreamRef = (ISequentialOutStream *)spec;
|
511
|
+
bs.OutStreamSpec = spec;
|
512
|
+
|
513
|
+
spec->SetStream(seqOutStream);
|
514
|
+
spec->Init();
|
515
|
+
|
516
|
+
seqOutStream = bs.OutStreamSpec;
|
517
|
+
|
518
|
+
*outStreamRes = seqOutStream.Detach();
|
519
|
+
return S_OK;
|
520
|
+
}
|
521
|
+
|
522
|
+
|
523
|
+
static HRESULT GetError(HRESULT res, HRESULT res2)
|
524
|
+
{
|
525
|
+
if (res == res2)
|
526
|
+
return res;
|
527
|
+
if (res == S_OK)
|
528
|
+
return res2;
|
529
|
+
if (res == k_My_HRESULT_WritingWasCut)
|
530
|
+
{
|
531
|
+
if (res2 != S_OK)
|
532
|
+
return res2;
|
533
|
+
}
|
534
|
+
return res;
|
535
|
+
}
|
536
|
+
|
537
|
+
|
538
|
+
HRESULT CMixerST::FinishStream(UInt32 streamIndex)
|
539
|
+
{
|
540
|
+
{
|
541
|
+
int index = -1;
|
542
|
+
if (!EncodeMode)
|
543
|
+
{
|
544
|
+
if (_bi.UnpackCoder == streamIndex)
|
545
|
+
index = 0;
|
546
|
+
}
|
547
|
+
else
|
548
|
+
index = _bi.FindStream_in_PackStreams(streamIndex);
|
549
|
+
|
550
|
+
if (index >= 0)
|
551
|
+
return S_OK;
|
552
|
+
}
|
553
|
+
|
554
|
+
int bond = FindBond_for_Stream(
|
555
|
+
false, // forInputStream
|
556
|
+
streamIndex);
|
557
|
+
if (bond < 0)
|
558
|
+
return E_INVALIDARG;
|
559
|
+
|
560
|
+
UInt32 inStreamIndex = _bi.Bonds[bond].Get_InIndex(EncodeMode);
|
561
|
+
|
562
|
+
UInt32 coderIndex = inStreamIndex;
|
563
|
+
UInt32 coderStreamIndex = 0;
|
564
|
+
if (!EncodeMode)
|
565
|
+
_bi.GetCoder_for_Stream(inStreamIndex, coderIndex, coderStreamIndex);
|
566
|
+
|
567
|
+
CCoder &coder = _coders[coderIndex];
|
568
|
+
CMyComPtr<IOutStreamFinish> finish;
|
569
|
+
coder.QueryInterface(IID_IOutStreamFinish, (void **)&finish);
|
570
|
+
HRESULT res = S_OK;
|
571
|
+
if (finish)
|
572
|
+
{
|
573
|
+
res = finish->OutStreamFinish();
|
574
|
+
}
|
575
|
+
return GetError(res, FinishCoder(coderIndex));
|
576
|
+
}
|
577
|
+
|
578
|
+
|
579
|
+
HRESULT CMixerST::FinishCoder(UInt32 coderIndex)
|
580
|
+
{
|
581
|
+
CCoder &coder = _coders[coderIndex];
|
582
|
+
|
583
|
+
UInt32 numOutStreams = EncodeMode ? coder.NumStreams : 1;
|
584
|
+
UInt32 startIndex = EncodeMode ? _bi.Coder_to_Stream[coderIndex]: coderIndex;
|
585
|
+
|
586
|
+
HRESULT res = S_OK;
|
587
|
+
for (unsigned i = 0; i < numOutStreams; i++)
|
588
|
+
res = GetError(res, FinishStream(startIndex + i));
|
589
|
+
return res;
|
590
|
+
}
|
591
|
+
|
592
|
+
|
593
|
+
void CMixerST::SelectMainCoder(bool useFirst)
|
594
|
+
{
|
595
|
+
unsigned ci = _bi.UnpackCoder;
|
596
|
+
|
597
|
+
int firstNonFilter = -1;
|
598
|
+
int firstAllowed = ci;
|
599
|
+
|
600
|
+
for (;;)
|
601
|
+
{
|
602
|
+
const CCoderST &coder = _coders[ci];
|
603
|
+
// break;
|
604
|
+
|
605
|
+
if (ci != _bi.UnpackCoder)
|
606
|
+
if (EncodeMode ? !coder.CanWrite : !coder.CanRead)
|
607
|
+
{
|
608
|
+
firstAllowed = ci;
|
609
|
+
firstNonFilter = -2;
|
610
|
+
}
|
611
|
+
|
612
|
+
if (coder.NumStreams != 1)
|
613
|
+
break;
|
614
|
+
|
615
|
+
UInt32 st = _bi.Coder_to_Stream[ci];
|
616
|
+
if (_bi.IsStream_in_PackStreams(st))
|
617
|
+
break;
|
618
|
+
int bond = _bi.FindBond_for_PackStream(st);
|
619
|
+
if (bond < 0)
|
620
|
+
throw 20150213;
|
621
|
+
|
622
|
+
if (EncodeMode ? !coder.CanRead : !coder.CanWrite)
|
623
|
+
break;
|
624
|
+
|
625
|
+
if (firstNonFilter == -1 && !IsFilter_Vector[ci])
|
626
|
+
firstNonFilter = ci;
|
627
|
+
|
628
|
+
ci = _bi.Bonds[bond].UnpackIndex;
|
629
|
+
}
|
630
|
+
|
631
|
+
if (useFirst)
|
632
|
+
ci = firstAllowed;
|
633
|
+
else if (firstNonFilter >= 0)
|
634
|
+
ci = firstNonFilter;
|
635
|
+
|
636
|
+
MainCoderIndex = ci;
|
637
|
+
}
|
638
|
+
|
639
|
+
|
640
|
+
HRESULT CMixerST::Code(
|
641
|
+
ISequentialInStream * const *inStreams,
|
642
|
+
ISequentialOutStream * const *outStreams,
|
643
|
+
ICompressProgressInfo *progress)
|
644
|
+
{
|
645
|
+
_binderStreams.Clear();
|
646
|
+
unsigned ci = MainCoderIndex;
|
647
|
+
|
648
|
+
const CCoder &mainCoder = _coders[MainCoderIndex];
|
649
|
+
|
650
|
+
CObjectVector< CMyComPtr<ISequentialInStream> > seqInStreams;
|
651
|
+
CObjectVector< CMyComPtr<ISequentialOutStream> > seqOutStreams;
|
652
|
+
|
653
|
+
UInt32 numInStreams = EncodeMode ? 1 : mainCoder.NumStreams;
|
654
|
+
UInt32 numOutStreams = !EncodeMode ? 1 : mainCoder.NumStreams;
|
655
|
+
|
656
|
+
UInt32 startInIndex = EncodeMode ? ci : _bi.Coder_to_Stream[ci];
|
657
|
+
UInt32 startOutIndex = !EncodeMode ? ci : _bi.Coder_to_Stream[ci];
|
658
|
+
|
659
|
+
UInt32 i;
|
660
|
+
|
661
|
+
for (i = 0; i < numInStreams; i++)
|
662
|
+
{
|
663
|
+
CMyComPtr<ISequentialInStream> seqInStream;
|
664
|
+
RINOK(GetInStream(inStreams, /* inSizes, */ startInIndex + i, &seqInStream));
|
665
|
+
seqInStreams.Add(seqInStream);
|
666
|
+
}
|
667
|
+
|
668
|
+
for (i = 0; i < numOutStreams; i++)
|
669
|
+
{
|
670
|
+
CMyComPtr<ISequentialOutStream> seqOutStream;
|
671
|
+
RINOK(GetOutStream(outStreams, /* outSizes, */ startOutIndex + i, &seqOutStream));
|
672
|
+
seqOutStreams.Add(seqOutStream);
|
673
|
+
}
|
674
|
+
|
675
|
+
CRecordVector< ISequentialInStream * > seqInStreamsSpec;
|
676
|
+
CRecordVector< ISequentialOutStream * > seqOutStreamsSpec;
|
677
|
+
|
678
|
+
for (i = 0; i < numInStreams; i++)
|
679
|
+
seqInStreamsSpec.Add(seqInStreams[i]);
|
680
|
+
for (i = 0; i < numOutStreams; i++)
|
681
|
+
seqOutStreamsSpec.Add(seqOutStreams[i]);
|
682
|
+
|
683
|
+
for (i = 0; i < _coders.Size(); i++)
|
684
|
+
{
|
685
|
+
if (i == ci)
|
686
|
+
continue;
|
687
|
+
|
688
|
+
CCoder &coder = _coders[i];
|
689
|
+
|
690
|
+
if (EncodeMode)
|
691
|
+
{
|
692
|
+
CMyComPtr<ICompressInitEncoder> initEncoder;
|
693
|
+
coder.QueryInterface(IID_ICompressInitEncoder, (void **)&initEncoder);
|
694
|
+
if (initEncoder)
|
695
|
+
RINOK(initEncoder->InitEncoder());
|
696
|
+
}
|
697
|
+
else
|
40
698
|
{
|
41
|
-
|
42
|
-
|
43
|
-
|
699
|
+
CMyComPtr<ICompressSetOutStreamSize> setOutStreamSize;
|
700
|
+
coder.QueryInterface(IID_ICompressSetOutStreamSize, (void **)&setOutStreamSize);
|
701
|
+
if (setOutStreamSize)
|
702
|
+
RINOK(setOutStreamSize->SetOutStreamSize(
|
703
|
+
EncodeMode ? coder.PackSizePointers[0] : coder.UnpackSizePointer));
|
44
704
|
}
|
45
|
-
|
705
|
+
}
|
706
|
+
|
707
|
+
const UInt64 * const *isSizes2 = EncodeMode ? &mainCoder.UnpackSizePointer : &mainCoder.PackSizePointers.Front();
|
708
|
+
const UInt64 * const *outSizes2 = EncodeMode ? &mainCoder.PackSizePointers.Front() : &mainCoder.UnpackSizePointer;
|
709
|
+
|
710
|
+
HRESULT res;
|
711
|
+
if (mainCoder.Coder)
|
712
|
+
{
|
713
|
+
res = mainCoder.Coder->Code(
|
714
|
+
seqInStreamsSpec[0], seqOutStreamsSpec[0],
|
715
|
+
isSizes2[0], outSizes2[0],
|
716
|
+
progress);
|
717
|
+
}
|
718
|
+
else
|
719
|
+
{
|
720
|
+
res = mainCoder.Coder2->Code(
|
721
|
+
&seqInStreamsSpec.Front(), isSizes2, numInStreams,
|
722
|
+
&seqOutStreamsSpec.Front(), outSizes2, numOutStreams,
|
723
|
+
progress);
|
724
|
+
}
|
725
|
+
|
726
|
+
if (res == k_My_HRESULT_WritingWasCut)
|
727
|
+
res = S_OK;
|
728
|
+
|
729
|
+
if (res == S_OK || res == S_FALSE)
|
730
|
+
{
|
731
|
+
res = GetError(res, FinishCoder(ci));
|
732
|
+
}
|
733
|
+
|
734
|
+
for (i = 0; i < _binderStreams.Size(); i++)
|
735
|
+
{
|
736
|
+
const CStBinderStream &bs = _binderStreams[i];
|
737
|
+
if (bs.InStreamSpec)
|
738
|
+
bs.InStreamSpec->ReleaseStream();
|
739
|
+
else
|
740
|
+
bs.OutStreamSpec->ReleaseStream();
|
741
|
+
}
|
742
|
+
|
743
|
+
if (res == k_My_HRESULT_WritingWasCut)
|
744
|
+
res = S_OK;
|
745
|
+
return res;
|
746
|
+
}
|
747
|
+
|
748
|
+
|
749
|
+
HRESULT CMixerST::GetMainUnpackStream(
|
750
|
+
ISequentialInStream * const *inStreams,
|
751
|
+
ISequentialInStream **inStreamRes)
|
752
|
+
{
|
753
|
+
CMyComPtr<ISequentialInStream> seqInStream;
|
754
|
+
|
755
|
+
RINOK(GetInStream2(inStreams, /* inSizes, */
|
756
|
+
_bi.UnpackCoder, &seqInStream))
|
757
|
+
|
758
|
+
FOR_VECTOR (i, _coders)
|
759
|
+
{
|
760
|
+
CCoder &coder = _coders[i];
|
761
|
+
CMyComPtr<ICompressSetOutStreamSize> setOutStreamSize;
|
762
|
+
coder.QueryInterface(IID_ICompressSetOutStreamSize, (void **)&setOutStreamSize);
|
763
|
+
if (setOutStreamSize)
|
46
764
|
{
|
47
|
-
|
48
|
-
_srcOutToDestInMap[index] = destInOffset;
|
49
|
-
_destInToSrcOutMap[destInOffset] = index;
|
765
|
+
RINOK(setOutStreamSize->SetOutStreamSize(coder.UnpackSizePointer));
|
50
766
|
}
|
51
767
|
}
|
768
|
+
|
769
|
+
*inStreamRes = seqInStream.Detach();
|
770
|
+
return S_OK;
|
52
771
|
}
|
53
772
|
|
54
|
-
|
773
|
+
|
774
|
+
UInt64 CMixerST::GetBondStreamSize(unsigned bondIndex) const
|
55
775
|
{
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
776
|
+
const CStBinderStream &bs = _binderStreams[bondIndex];
|
777
|
+
if (bs.InStreamSpec)
|
778
|
+
return bs.InStreamSpec->GetSize();
|
779
|
+
return bs.OutStreamSpec->GetSize();
|
780
|
+
}
|
781
|
+
|
782
|
+
#endif
|
783
|
+
|
784
|
+
|
785
|
+
|
786
|
+
|
787
|
+
|
60
788
|
|
61
|
-
|
62
|
-
|
789
|
+
#ifdef USE_MIXER_MT
|
790
|
+
|
791
|
+
|
792
|
+
void CCoderMT::Execute()
|
793
|
+
{
|
794
|
+
try
|
795
|
+
{
|
796
|
+
Code(NULL);
|
797
|
+
}
|
798
|
+
catch(...)
|
63
799
|
{
|
64
|
-
|
65
|
-
CCoderStreamsInfo destCoderInfo;
|
66
|
-
destCoderInfo.NumInStreams = srcCoderInfo.NumOutStreams;
|
67
|
-
destCoderInfo.NumOutStreams = srcCoderInfo.NumInStreams;
|
68
|
-
destBindInfo.Coders.Add(destCoderInfo);
|
800
|
+
Result = E_FAIL;
|
69
801
|
}
|
70
|
-
|
802
|
+
}
|
803
|
+
|
804
|
+
void CCoderMT::Code(ICompressProgressInfo *progress)
|
805
|
+
{
|
806
|
+
unsigned numInStreams = EncodeMode ? 1 : NumStreams;
|
807
|
+
unsigned numOutStreams = EncodeMode ? NumStreams : 1;
|
808
|
+
|
809
|
+
InStreamPointers.ClearAndReserve(numInStreams);
|
810
|
+
OutStreamPointers.ClearAndReserve(numOutStreams);
|
811
|
+
|
812
|
+
unsigned i;
|
813
|
+
|
814
|
+
for (i = 0; i < numInStreams; i++)
|
815
|
+
InStreamPointers.AddInReserved((ISequentialInStream *)InStreams[i]);
|
816
|
+
|
817
|
+
for (i = 0; i < numOutStreams; i++)
|
818
|
+
OutStreamPointers.AddInReserved((ISequentialOutStream *)OutStreams[i]);
|
819
|
+
|
820
|
+
// we suppose that UnpackSizePointer and PackSizePointers contain correct pointers.
|
821
|
+
/*
|
822
|
+
if (UnpackSizePointer)
|
823
|
+
UnpackSizePointer = &UnpackSize;
|
824
|
+
for (i = 0; i < NumStreams; i++)
|
825
|
+
if (PackSizePointers[i])
|
826
|
+
PackSizePointers[i] = &PackSizes[i];
|
827
|
+
*/
|
828
|
+
|
829
|
+
CReleaser releaser(*this);
|
830
|
+
|
831
|
+
if (Coder)
|
832
|
+
Result = Coder->Code(InStreamPointers[0], OutStreamPointers[0],
|
833
|
+
EncodeMode ? UnpackSizePointer : PackSizePointers[0],
|
834
|
+
EncodeMode ? PackSizePointers[0] : UnpackSizePointer,
|
835
|
+
progress);
|
836
|
+
else
|
837
|
+
Result = Coder2->Code(
|
838
|
+
&InStreamPointers.Front(), EncodeMode ? &UnpackSizePointer : &PackSizePointers.Front(), numInStreams,
|
839
|
+
&OutStreamPointers.Front(), EncodeMode ? &PackSizePointers.Front(): &UnpackSizePointer, numOutStreams,
|
840
|
+
progress);
|
841
|
+
}
|
842
|
+
|
843
|
+
HRESULT CMixerMT::SetBindInfo(const CBindInfo &bindInfo)
|
844
|
+
{
|
845
|
+
CMixer::SetBindInfo(bindInfo);
|
846
|
+
|
847
|
+
_streamBinders.Clear();
|
848
|
+
FOR_VECTOR (i, _bi.Bonds)
|
71
849
|
{
|
72
|
-
|
73
|
-
CBindPair destBindPair;
|
74
|
-
destBindPair.InIndex = _srcOutToDestInMap[srcBindPair.OutIndex];
|
75
|
-
destBindPair.OutIndex = _srcInToDestOutMap[srcBindPair.InIndex];
|
76
|
-
destBindInfo.BindPairs.Add(destBindPair);
|
850
|
+
RINOK(_streamBinders.AddNew().CreateEvents());
|
77
851
|
}
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
852
|
+
return S_OK;
|
853
|
+
}
|
854
|
+
|
855
|
+
void CMixerMT::AddCoder(const CCreatedCoder &cod)
|
856
|
+
{
|
857
|
+
IsFilter_Vector.Add(cod.IsFilter);
|
858
|
+
IsExternal_Vector.Add(cod.IsExternal);
|
859
|
+
// const CCoderStreamsInfo &c = _bi.Coders[_coders.Size()];
|
860
|
+
CCoderMT &c2 = _coders.AddNew();
|
861
|
+
c2.NumStreams = cod.NumStreams;
|
862
|
+
c2.Coder = cod.Coder;
|
863
|
+
c2.Coder2 = cod.Coder2;
|
864
|
+
c2.EncodeMode = EncodeMode;
|
865
|
+
}
|
866
|
+
|
867
|
+
CCoder &CMixerMT::GetCoder(unsigned index)
|
868
|
+
{
|
869
|
+
return _coders[index];
|
82
870
|
}
|
83
871
|
|
84
|
-
|
85
|
-
NumInStreams(numInStreams),
|
86
|
-
NumOutStreams(numOutStreams)
|
872
|
+
void CMixerMT::ReInit()
|
87
873
|
{
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
874
|
+
FOR_VECTOR (i, _streamBinders)
|
875
|
+
_streamBinders[i].ReInit();
|
876
|
+
}
|
877
|
+
|
878
|
+
void CMixerMT::SelectMainCoder(bool useFirst)
|
879
|
+
{
|
880
|
+
unsigned ci = _bi.UnpackCoder;
|
881
|
+
|
882
|
+
if (!useFirst)
|
883
|
+
for (;;)
|
884
|
+
{
|
885
|
+
if (_coders[ci].NumStreams != 1)
|
886
|
+
break;
|
887
|
+
if (!IsFilter_Vector[ci])
|
888
|
+
break;
|
889
|
+
|
890
|
+
UInt32 st = _bi.Coder_to_Stream[ci];
|
891
|
+
if (_bi.IsStream_in_PackStreams(st))
|
892
|
+
break;
|
893
|
+
int bond = _bi.FindBond_for_PackStream(st);
|
894
|
+
if (bond < 0)
|
895
|
+
throw 20150213;
|
896
|
+
ci = _bi.Bonds[bond].UnpackIndex;
|
897
|
+
}
|
898
|
+
|
899
|
+
MainCoderIndex = ci;
|
92
900
|
}
|
93
901
|
|
94
|
-
|
95
|
-
CRecordVector<const UInt64 *> &sizePointers, UInt32 numItems)
|
902
|
+
HRESULT CMixerMT::Init(ISequentialInStream * const *inStreams, ISequentialOutStream * const *outStreams)
|
96
903
|
{
|
97
|
-
|
98
|
-
|
99
|
-
for(
|
904
|
+
unsigned i;
|
905
|
+
|
906
|
+
for (i = 0; i < _coders.Size(); i++)
|
907
|
+
{
|
908
|
+
CCoderMT &coderInfo = _coders[i];
|
909
|
+
const CCoderStreamsInfo &csi = _bi.Coders[i];
|
910
|
+
|
911
|
+
UInt32 j;
|
912
|
+
|
913
|
+
unsigned numInStreams = EncodeMode ? 1 : csi.NumStreams;
|
914
|
+
unsigned numOutStreams = EncodeMode ? csi.NumStreams : 1;
|
915
|
+
|
916
|
+
coderInfo.InStreams.Clear();
|
917
|
+
for (j = 0; j < numInStreams; j++)
|
918
|
+
coderInfo.InStreams.AddNew();
|
919
|
+
|
920
|
+
coderInfo.OutStreams.Clear();
|
921
|
+
for (j = 0; j < numOutStreams; j++)
|
922
|
+
coderInfo.OutStreams.AddNew();
|
923
|
+
}
|
924
|
+
|
925
|
+
for (i = 0; i < _bi.Bonds.Size(); i++)
|
100
926
|
{
|
101
|
-
|
927
|
+
const CBond &bond = _bi.Bonds[i];
|
928
|
+
|
929
|
+
UInt32 inCoderIndex, inCoderStreamIndex;
|
930
|
+
UInt32 outCoderIndex, outCoderStreamIndex;
|
931
|
+
|
932
|
+
{
|
933
|
+
UInt32 coderIndex, coderStreamIndex;
|
934
|
+
_bi.GetCoder_for_Stream(bond.PackIndex, coderIndex, coderStreamIndex);
|
935
|
+
|
936
|
+
inCoderIndex = EncodeMode ? bond.UnpackIndex : coderIndex;
|
937
|
+
outCoderIndex = EncodeMode ? coderIndex : bond.UnpackIndex;
|
938
|
+
|
939
|
+
inCoderStreamIndex = EncodeMode ? 0 : coderStreamIndex;
|
940
|
+
outCoderStreamIndex = EncodeMode ? coderStreamIndex : 0;
|
941
|
+
}
|
942
|
+
|
943
|
+
_streamBinders[i].CreateStreams(
|
944
|
+
&_coders[inCoderIndex].InStreams[inCoderStreamIndex],
|
945
|
+
&_coders[outCoderIndex].OutStreams[outCoderStreamIndex]);
|
946
|
+
|
947
|
+
CMyComPtr<ICompressSetBufSize> inSetSize, outSetSize;
|
948
|
+
_coders[inCoderIndex].QueryInterface(IID_ICompressSetBufSize, (void **)&inSetSize);
|
949
|
+
_coders[outCoderIndex].QueryInterface(IID_ICompressSetBufSize, (void **)&outSetSize);
|
950
|
+
if (inSetSize && outSetSize)
|
102
951
|
{
|
103
|
-
|
104
|
-
|
952
|
+
const UInt32 kBufSize = 1 << 19;
|
953
|
+
inSetSize->SetInBufSize(inCoderStreamIndex, kBufSize);
|
954
|
+
outSetSize->SetOutBufSize(outCoderStreamIndex, kBufSize);
|
105
955
|
}
|
956
|
+
}
|
957
|
+
|
958
|
+
{
|
959
|
+
CCoderMT &cod = _coders[_bi.UnpackCoder];
|
960
|
+
if (EncodeMode)
|
961
|
+
cod.InStreams[0] = inStreams[0];
|
962
|
+
else
|
963
|
+
cod.OutStreams[0] = outStreams[0];
|
964
|
+
}
|
965
|
+
|
966
|
+
for (i = 0; i < _bi.PackStreams.Size(); i++)
|
967
|
+
{
|
968
|
+
UInt32 coderIndex, coderStreamIndex;
|
969
|
+
_bi.GetCoder_for_Stream(_bi.PackStreams[i], coderIndex, coderStreamIndex);
|
970
|
+
CCoderMT &cod = _coders[coderIndex];
|
971
|
+
if (EncodeMode)
|
972
|
+
cod.OutStreams[coderStreamIndex] = outStreams[i];
|
106
973
|
else
|
974
|
+
cod.InStreams[coderStreamIndex] = inStreams[i];
|
975
|
+
}
|
976
|
+
|
977
|
+
return S_OK;
|
978
|
+
}
|
979
|
+
|
980
|
+
HRESULT CMixerMT::ReturnIfError(HRESULT code)
|
981
|
+
{
|
982
|
+
FOR_VECTOR (i, _coders)
|
983
|
+
if (_coders[i].Result == code)
|
984
|
+
return code;
|
985
|
+
return S_OK;
|
986
|
+
}
|
987
|
+
|
988
|
+
HRESULT CMixerMT::Code(
|
989
|
+
ISequentialInStream * const *inStreams,
|
990
|
+
ISequentialOutStream * const *outStreams,
|
991
|
+
ICompressProgressInfo *progress)
|
992
|
+
{
|
993
|
+
Init(inStreams, outStreams);
|
994
|
+
|
995
|
+
unsigned i;
|
996
|
+
for (i = 0; i < _coders.Size(); i++)
|
997
|
+
if (i != MainCoderIndex)
|
107
998
|
{
|
108
|
-
|
109
|
-
sizePointers.Add(&sizes.Back());
|
999
|
+
RINOK(_coders[i].Create());
|
110
1000
|
}
|
1001
|
+
|
1002
|
+
for (i = 0; i < _coders.Size(); i++)
|
1003
|
+
if (i != MainCoderIndex)
|
1004
|
+
_coders[i].Start();
|
1005
|
+
|
1006
|
+
_coders[MainCoderIndex].Code(progress);
|
1007
|
+
|
1008
|
+
for (i = 0; i < _coders.Size(); i++)
|
1009
|
+
if (i != MainCoderIndex)
|
1010
|
+
_coders[i].WaitExecuteFinish();
|
1011
|
+
|
1012
|
+
RINOK(ReturnIfError(E_ABORT));
|
1013
|
+
RINOK(ReturnIfError(E_OUTOFMEMORY));
|
1014
|
+
|
1015
|
+
for (i = 0; i < _coders.Size(); i++)
|
1016
|
+
{
|
1017
|
+
HRESULT result = _coders[i].Result;
|
1018
|
+
if (result != S_OK
|
1019
|
+
&& result != k_My_HRESULT_WritingWasCut
|
1020
|
+
&& result != S_FALSE
|
1021
|
+
&& result != E_FAIL)
|
1022
|
+
return result;
|
1023
|
+
}
|
1024
|
+
|
1025
|
+
RINOK(ReturnIfError(S_FALSE));
|
1026
|
+
|
1027
|
+
for (i = 0; i < _coders.Size(); i++)
|
1028
|
+
{
|
1029
|
+
HRESULT result = _coders[i].Result;
|
1030
|
+
if (result != S_OK && result != k_My_HRESULT_WritingWasCut)
|
1031
|
+
return result;
|
111
1032
|
}
|
1033
|
+
|
1034
|
+
return S_OK;
|
112
1035
|
}
|
113
1036
|
|
114
|
-
|
115
|
-
const UInt64 **outSizes)
|
1037
|
+
UInt64 CMixerMT::GetBondStreamSize(unsigned bondIndex) const
|
116
1038
|
{
|
117
|
-
|
118
|
-
SetSizes(outSizes, OutSizes, OutSizePointers, NumOutStreams);
|
1039
|
+
return _streamBinders[bondIndex].ProcessedSize;
|
119
1040
|
}
|
120
1041
|
|
1042
|
+
#endif
|
1043
|
+
|
121
1044
|
}
|