seven-zip 1.4.2 → 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 +21 -0
- data/README.md +13 -2
- 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 +40 -17
- 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 +267 -219
- data/.github/workflows/test-and-release.yml +0 -43
- 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
@@ -0,0 +1,886 @@
|
|
1
|
+
// ComHandler.cpp
|
2
|
+
|
3
|
+
#include "StdAfx.h"
|
4
|
+
|
5
|
+
#include "../../../C/Alloc.h"
|
6
|
+
#include "../../../C/CpuArch.h"
|
7
|
+
|
8
|
+
#include "../../Common/IntToString.h"
|
9
|
+
#include "../../Common/ComTry.h"
|
10
|
+
#include "../../Common/MyCom.h"
|
11
|
+
#include "../../Common/MyBuffer.h"
|
12
|
+
#include "../../Common/MyString.h"
|
13
|
+
|
14
|
+
#include "../../Windows/PropVariant.h"
|
15
|
+
|
16
|
+
#include "../Common/LimitedStreams.h"
|
17
|
+
#include "../Common/ProgressUtils.h"
|
18
|
+
#include "../Common/RegisterArc.h"
|
19
|
+
#include "../Common/StreamUtils.h"
|
20
|
+
|
21
|
+
#include "../Compress/CopyCoder.h"
|
22
|
+
|
23
|
+
#define Get16(p) GetUi16(p)
|
24
|
+
#define Get32(p) GetUi32(p)
|
25
|
+
|
26
|
+
namespace NArchive {
|
27
|
+
namespace NCom {
|
28
|
+
|
29
|
+
#define SIGNATURE { 0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1 }
|
30
|
+
static const Byte kSignature[] = SIGNATURE;
|
31
|
+
|
32
|
+
enum EType
|
33
|
+
{
|
34
|
+
k_Type_Common,
|
35
|
+
k_Type_Msi,
|
36
|
+
k_Type_Msp,
|
37
|
+
k_Type_Doc,
|
38
|
+
k_Type_Ppt,
|
39
|
+
k_Type_Xls,
|
40
|
+
};
|
41
|
+
|
42
|
+
static const char * const kExtensions[] =
|
43
|
+
{
|
44
|
+
"compound"
|
45
|
+
, "msi"
|
46
|
+
, "msp"
|
47
|
+
, "doc"
|
48
|
+
, "ppt"
|
49
|
+
, "xls"
|
50
|
+
};
|
51
|
+
|
52
|
+
namespace NFatID
|
53
|
+
{
|
54
|
+
static const UInt32 kFree = 0xFFFFFFFF;
|
55
|
+
static const UInt32 kEndOfChain = 0xFFFFFFFE;
|
56
|
+
static const UInt32 kFatSector = 0xFFFFFFFD;
|
57
|
+
static const UInt32 kMatSector = 0xFFFFFFFC;
|
58
|
+
static const UInt32 kMaxValue = 0xFFFFFFFA;
|
59
|
+
}
|
60
|
+
|
61
|
+
namespace NItemType
|
62
|
+
{
|
63
|
+
static const Byte kEmpty = 0;
|
64
|
+
static const Byte kStorage = 1;
|
65
|
+
static const Byte kStream = 2;
|
66
|
+
static const Byte kLockBytes = 3;
|
67
|
+
static const Byte kProperty = 4;
|
68
|
+
static const Byte kRootStorage = 5;
|
69
|
+
}
|
70
|
+
|
71
|
+
static const UInt32 kNameSizeMax = 64;
|
72
|
+
|
73
|
+
struct CItem
|
74
|
+
{
|
75
|
+
Byte Name[kNameSizeMax];
|
76
|
+
// UInt16 NameSize;
|
77
|
+
// UInt32 Flags;
|
78
|
+
FILETIME CTime;
|
79
|
+
FILETIME MTime;
|
80
|
+
UInt64 Size;
|
81
|
+
UInt32 LeftDid;
|
82
|
+
UInt32 RightDid;
|
83
|
+
UInt32 SonDid;
|
84
|
+
UInt32 Sid;
|
85
|
+
Byte Type;
|
86
|
+
|
87
|
+
bool IsEmpty() const { return Type == NItemType::kEmpty; }
|
88
|
+
bool IsDir() const { return Type == NItemType::kStorage || Type == NItemType::kRootStorage; }
|
89
|
+
|
90
|
+
void Parse(const Byte *p, bool mode64bit);
|
91
|
+
};
|
92
|
+
|
93
|
+
struct CRef
|
94
|
+
{
|
95
|
+
int Parent;
|
96
|
+
UInt32 Did;
|
97
|
+
};
|
98
|
+
|
99
|
+
class CDatabase
|
100
|
+
{
|
101
|
+
UInt32 NumSectorsInMiniStream;
|
102
|
+
CObjArray<UInt32> MiniSids;
|
103
|
+
|
104
|
+
HRESULT AddNode(int parent, UInt32 did);
|
105
|
+
public:
|
106
|
+
|
107
|
+
CObjArray<UInt32> Fat;
|
108
|
+
UInt32 FatSize;
|
109
|
+
|
110
|
+
CObjArray<UInt32> Mat;
|
111
|
+
UInt32 MatSize;
|
112
|
+
|
113
|
+
CObjectVector<CItem> Items;
|
114
|
+
CRecordVector<CRef> Refs;
|
115
|
+
|
116
|
+
UInt32 LongStreamMinSize;
|
117
|
+
unsigned SectorSizeBits;
|
118
|
+
unsigned MiniSectorSizeBits;
|
119
|
+
|
120
|
+
Int32 MainSubfile;
|
121
|
+
|
122
|
+
UInt64 PhySize;
|
123
|
+
EType Type;
|
124
|
+
|
125
|
+
bool IsNotArcType() const
|
126
|
+
{
|
127
|
+
return
|
128
|
+
Type != k_Type_Msi &&
|
129
|
+
Type != k_Type_Msp;
|
130
|
+
}
|
131
|
+
|
132
|
+
void UpdatePhySize(UInt64 val)
|
133
|
+
{
|
134
|
+
if (PhySize < val)
|
135
|
+
PhySize = val;
|
136
|
+
}
|
137
|
+
HRESULT ReadSector(IInStream *inStream, Byte *buf, unsigned sectorSizeBits, UInt32 sid);
|
138
|
+
HRESULT ReadIDs(IInStream *inStream, Byte *buf, unsigned sectorSizeBits, UInt32 sid, UInt32 *dest);
|
139
|
+
|
140
|
+
HRESULT Update_PhySize_WithItem(unsigned index);
|
141
|
+
|
142
|
+
void Clear();
|
143
|
+
bool IsLargeStream(UInt64 size) const { return size >= LongStreamMinSize; }
|
144
|
+
UString GetItemPath(UInt32 index) const;
|
145
|
+
|
146
|
+
UInt64 GetItemPackSize(UInt64 size) const
|
147
|
+
{
|
148
|
+
UInt64 mask = ((UInt64)1 << (IsLargeStream(size) ? SectorSizeBits : MiniSectorSizeBits)) - 1;
|
149
|
+
return (size + mask) & ~mask;
|
150
|
+
}
|
151
|
+
|
152
|
+
bool GetMiniCluster(UInt32 sid, UInt64 &res) const
|
153
|
+
{
|
154
|
+
unsigned subBits = SectorSizeBits - MiniSectorSizeBits;
|
155
|
+
UInt32 fid = sid >> subBits;
|
156
|
+
if (fid >= NumSectorsInMiniStream)
|
157
|
+
return false;
|
158
|
+
res = (((UInt64)MiniSids[fid] + 1) << subBits) + (sid & ((1 << subBits) - 1));
|
159
|
+
return true;
|
160
|
+
}
|
161
|
+
|
162
|
+
HRESULT Open(IInStream *inStream);
|
163
|
+
};
|
164
|
+
|
165
|
+
|
166
|
+
HRESULT CDatabase::ReadSector(IInStream *inStream, Byte *buf, unsigned sectorSizeBits, UInt32 sid)
|
167
|
+
{
|
168
|
+
UpdatePhySize(((UInt64)sid + 2) << sectorSizeBits);
|
169
|
+
RINOK(inStream->Seek((((UInt64)sid + 1) << sectorSizeBits), STREAM_SEEK_SET, NULL));
|
170
|
+
return ReadStream_FALSE(inStream, buf, (size_t)1 << sectorSizeBits);
|
171
|
+
}
|
172
|
+
|
173
|
+
HRESULT CDatabase::ReadIDs(IInStream *inStream, Byte *buf, unsigned sectorSizeBits, UInt32 sid, UInt32 *dest)
|
174
|
+
{
|
175
|
+
RINOK(ReadSector(inStream, buf, sectorSizeBits, sid));
|
176
|
+
UInt32 sectorSize = (UInt32)1 << sectorSizeBits;
|
177
|
+
for (UInt32 t = 0; t < sectorSize; t += 4)
|
178
|
+
*dest++ = Get32(buf + t);
|
179
|
+
return S_OK;
|
180
|
+
}
|
181
|
+
|
182
|
+
static void GetFileTimeFromMem(const Byte *p, FILETIME *ft)
|
183
|
+
{
|
184
|
+
ft->dwLowDateTime = Get32(p);
|
185
|
+
ft->dwHighDateTime = Get32(p + 4);
|
186
|
+
}
|
187
|
+
|
188
|
+
void CItem::Parse(const Byte *p, bool mode64bit)
|
189
|
+
{
|
190
|
+
memcpy(Name, p, kNameSizeMax);
|
191
|
+
// NameSize = Get16(p + 64);
|
192
|
+
Type = p[66];
|
193
|
+
LeftDid = Get32(p + 68);
|
194
|
+
RightDid = Get32(p + 72);
|
195
|
+
SonDid = Get32(p + 76);
|
196
|
+
// Flags = Get32(p + 96);
|
197
|
+
GetFileTimeFromMem(p + 100, &CTime);
|
198
|
+
GetFileTimeFromMem(p + 108, &MTime);
|
199
|
+
Sid = Get32(p + 116);
|
200
|
+
Size = Get32(p + 120);
|
201
|
+
if (mode64bit)
|
202
|
+
Size |= ((UInt64)Get32(p + 124) << 32);
|
203
|
+
}
|
204
|
+
|
205
|
+
void CDatabase::Clear()
|
206
|
+
{
|
207
|
+
PhySize = 0;
|
208
|
+
|
209
|
+
Fat.Free();
|
210
|
+
MiniSids.Free();
|
211
|
+
Mat.Free();
|
212
|
+
Items.Clear();
|
213
|
+
Refs.Clear();
|
214
|
+
}
|
215
|
+
|
216
|
+
static const UInt32 kNoDid = 0xFFFFFFFF;
|
217
|
+
|
218
|
+
HRESULT CDatabase::AddNode(int parent, UInt32 did)
|
219
|
+
{
|
220
|
+
if (did == kNoDid)
|
221
|
+
return S_OK;
|
222
|
+
if (did >= (UInt32)Items.Size())
|
223
|
+
return S_FALSE;
|
224
|
+
const CItem &item = Items[did];
|
225
|
+
if (item.IsEmpty())
|
226
|
+
return S_FALSE;
|
227
|
+
CRef ref;
|
228
|
+
ref.Parent = parent;
|
229
|
+
ref.Did = did;
|
230
|
+
int index = Refs.Add(ref);
|
231
|
+
if (Refs.Size() > Items.Size())
|
232
|
+
return S_FALSE;
|
233
|
+
RINOK(AddNode(parent, item.LeftDid));
|
234
|
+
RINOK(AddNode(parent, item.RightDid));
|
235
|
+
if (item.IsDir())
|
236
|
+
{
|
237
|
+
RINOK(AddNode(index, item.SonDid));
|
238
|
+
}
|
239
|
+
return S_OK;
|
240
|
+
}
|
241
|
+
|
242
|
+
static const wchar_t kCharOpenBracket = L'[';
|
243
|
+
static const wchar_t kCharCloseBracket = L']';
|
244
|
+
|
245
|
+
static UString CompoundNameToFileName(const UString &s)
|
246
|
+
{
|
247
|
+
UString res;
|
248
|
+
for (unsigned i = 0; i < s.Len(); i++)
|
249
|
+
{
|
250
|
+
wchar_t c = s[i];
|
251
|
+
if (c < 0x20)
|
252
|
+
{
|
253
|
+
res += kCharOpenBracket;
|
254
|
+
wchar_t buf[32];
|
255
|
+
ConvertUInt32ToString(c, buf);
|
256
|
+
res += buf;
|
257
|
+
res += kCharCloseBracket;
|
258
|
+
}
|
259
|
+
else
|
260
|
+
res += c;
|
261
|
+
}
|
262
|
+
return res;
|
263
|
+
}
|
264
|
+
|
265
|
+
static const char k_Msi_Chars[] =
|
266
|
+
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz._";
|
267
|
+
|
268
|
+
// static const char *k_Msi_ID = ""; // "{msi}";
|
269
|
+
static const wchar_t k_Msi_SpecChar = L'!';
|
270
|
+
|
271
|
+
static const unsigned k_Msi_NumBits = 6;
|
272
|
+
static const unsigned k_Msi_NumChars = 1 << k_Msi_NumBits;
|
273
|
+
static const unsigned k_Msi_CharMask = k_Msi_NumChars - 1;
|
274
|
+
static const unsigned k_Msi_StartUnicodeChar = 0x3800;
|
275
|
+
static const unsigned k_Msi_UnicodeRange = k_Msi_NumChars * (k_Msi_NumChars + 1);
|
276
|
+
|
277
|
+
|
278
|
+
static bool IsMsiName(const Byte *p)
|
279
|
+
{
|
280
|
+
UInt32 c = Get16(p);
|
281
|
+
return
|
282
|
+
c >= k_Msi_StartUnicodeChar &&
|
283
|
+
c <= k_Msi_StartUnicodeChar + k_Msi_UnicodeRange;
|
284
|
+
}
|
285
|
+
|
286
|
+
static bool AreEqualNames(const Byte *rawName, const char *asciiName)
|
287
|
+
{
|
288
|
+
for (unsigned i = 0; i < kNameSizeMax / 2; i++)
|
289
|
+
{
|
290
|
+
wchar_t c = Get16(rawName + i * 2);
|
291
|
+
wchar_t c2 = (Byte)asciiName[i];
|
292
|
+
if (c != c2)
|
293
|
+
return false;
|
294
|
+
if (c == 0)
|
295
|
+
return true;
|
296
|
+
}
|
297
|
+
return false;
|
298
|
+
}
|
299
|
+
|
300
|
+
static bool CompoundMsiNameToFileName(const UString &name, UString &res)
|
301
|
+
{
|
302
|
+
res.Empty();
|
303
|
+
for (unsigned i = 0; i < name.Len(); i++)
|
304
|
+
{
|
305
|
+
wchar_t c = name[i];
|
306
|
+
if (c < k_Msi_StartUnicodeChar || c > k_Msi_StartUnicodeChar + k_Msi_UnicodeRange)
|
307
|
+
return false;
|
308
|
+
/*
|
309
|
+
if (i == 0)
|
310
|
+
res += k_Msi_ID;
|
311
|
+
*/
|
312
|
+
c -= k_Msi_StartUnicodeChar;
|
313
|
+
|
314
|
+
unsigned c0 = (unsigned)c & k_Msi_CharMask;
|
315
|
+
unsigned c1 = (unsigned)c >> k_Msi_NumBits;
|
316
|
+
|
317
|
+
if (c1 <= k_Msi_NumChars)
|
318
|
+
{
|
319
|
+
res += (wchar_t)(Byte)k_Msi_Chars[c0];
|
320
|
+
if (c1 == k_Msi_NumChars)
|
321
|
+
break;
|
322
|
+
res += (wchar_t)(Byte)k_Msi_Chars[c1];
|
323
|
+
}
|
324
|
+
else
|
325
|
+
res += k_Msi_SpecChar;
|
326
|
+
}
|
327
|
+
return true;
|
328
|
+
}
|
329
|
+
|
330
|
+
static UString ConvertName(const Byte *p, bool &isMsi)
|
331
|
+
{
|
332
|
+
isMsi = false;
|
333
|
+
UString s;
|
334
|
+
|
335
|
+
for (unsigned i = 0; i < kNameSizeMax; i += 2)
|
336
|
+
{
|
337
|
+
wchar_t c = Get16(p + i);
|
338
|
+
if (c == 0)
|
339
|
+
break;
|
340
|
+
s += c;
|
341
|
+
}
|
342
|
+
|
343
|
+
UString msiName;
|
344
|
+
if (CompoundMsiNameToFileName(s, msiName))
|
345
|
+
{
|
346
|
+
isMsi = true;
|
347
|
+
return msiName;
|
348
|
+
}
|
349
|
+
return CompoundNameToFileName(s);
|
350
|
+
}
|
351
|
+
|
352
|
+
static UString ConvertName(const Byte *p)
|
353
|
+
{
|
354
|
+
bool isMsi;
|
355
|
+
return ConvertName(p, isMsi);
|
356
|
+
}
|
357
|
+
|
358
|
+
UString CDatabase::GetItemPath(UInt32 index) const
|
359
|
+
{
|
360
|
+
UString s;
|
361
|
+
while (index != kNoDid)
|
362
|
+
{
|
363
|
+
const CRef &ref = Refs[index];
|
364
|
+
const CItem &item = Items[ref.Did];
|
365
|
+
if (!s.IsEmpty())
|
366
|
+
s.InsertAtFront(WCHAR_PATH_SEPARATOR);
|
367
|
+
s.Insert(0, ConvertName(item.Name));
|
368
|
+
index = ref.Parent;
|
369
|
+
}
|
370
|
+
return s;
|
371
|
+
}
|
372
|
+
|
373
|
+
HRESULT CDatabase::Update_PhySize_WithItem(unsigned index)
|
374
|
+
{
|
375
|
+
const CItem &item = Items[index];
|
376
|
+
bool isLargeStream = (index == 0 || IsLargeStream(item.Size));
|
377
|
+
if (!isLargeStream)
|
378
|
+
return S_OK;
|
379
|
+
unsigned bsLog = isLargeStream ? SectorSizeBits : MiniSectorSizeBits;
|
380
|
+
// streamSpec->Size = item.Size;
|
381
|
+
|
382
|
+
UInt32 clusterSize = (UInt32)1 << bsLog;
|
383
|
+
UInt64 numClusters64 = (item.Size + clusterSize - 1) >> bsLog;
|
384
|
+
if (numClusters64 >= ((UInt32)1 << 31))
|
385
|
+
return S_FALSE;
|
386
|
+
UInt32 sid = item.Sid;
|
387
|
+
UInt64 size = item.Size;
|
388
|
+
|
389
|
+
if (size != 0)
|
390
|
+
{
|
391
|
+
for (;; size -= clusterSize)
|
392
|
+
{
|
393
|
+
// if (isLargeStream)
|
394
|
+
{
|
395
|
+
if (sid >= FatSize)
|
396
|
+
return S_FALSE;
|
397
|
+
UpdatePhySize(((UInt64)sid + 2) << bsLog);
|
398
|
+
sid = Fat[sid];
|
399
|
+
}
|
400
|
+
if (size <= clusterSize)
|
401
|
+
break;
|
402
|
+
}
|
403
|
+
}
|
404
|
+
if (sid != NFatID::kEndOfChain)
|
405
|
+
return S_FALSE;
|
406
|
+
return S_OK;
|
407
|
+
}
|
408
|
+
|
409
|
+
// There is name "[!]MsiPatchSequence" in msp files
|
410
|
+
static const unsigned kMspSequence_Size = 18;
|
411
|
+
static const Byte kMspSequence[kMspSequence_Size] =
|
412
|
+
{ 0x40, 0x48, 0x96, 0x45, 0x6C, 0x3E, 0xE4, 0x45,
|
413
|
+
0xE6, 0x42, 0x16, 0x42, 0x37, 0x41, 0x27, 0x41,
|
414
|
+
0x37, 0x41 };
|
415
|
+
|
416
|
+
HRESULT CDatabase::Open(IInStream *inStream)
|
417
|
+
{
|
418
|
+
MainSubfile = -1;
|
419
|
+
Type = k_Type_Common;
|
420
|
+
const UInt32 kHeaderSize = 512;
|
421
|
+
Byte p[kHeaderSize];
|
422
|
+
PhySize = kHeaderSize;
|
423
|
+
RINOK(ReadStream_FALSE(inStream, p, kHeaderSize));
|
424
|
+
if (memcmp(p, kSignature, ARRAY_SIZE(kSignature)) != 0)
|
425
|
+
return S_FALSE;
|
426
|
+
if (Get16(p + 0x1A) > 4) // majorVer
|
427
|
+
return S_FALSE;
|
428
|
+
if (Get16(p + 0x1C) != 0xFFFE) // Little-endian
|
429
|
+
return S_FALSE;
|
430
|
+
unsigned sectorSizeBits = Get16(p + 0x1E);
|
431
|
+
bool mode64bit = (sectorSizeBits >= 12);
|
432
|
+
unsigned miniSectorSizeBits = Get16(p + 0x20);
|
433
|
+
SectorSizeBits = sectorSizeBits;
|
434
|
+
MiniSectorSizeBits = miniSectorSizeBits;
|
435
|
+
|
436
|
+
if (sectorSizeBits > 24 ||
|
437
|
+
sectorSizeBits < 7 ||
|
438
|
+
miniSectorSizeBits > 24 ||
|
439
|
+
miniSectorSizeBits < 2 ||
|
440
|
+
miniSectorSizeBits > sectorSizeBits)
|
441
|
+
return S_FALSE;
|
442
|
+
UInt32 numSectorsForFAT = Get32(p + 0x2C); // SAT
|
443
|
+
LongStreamMinSize = Get32(p + 0x38);
|
444
|
+
|
445
|
+
UInt32 sectSize = (UInt32)1 << sectorSizeBits;
|
446
|
+
|
447
|
+
CByteBuffer sect(sectSize);
|
448
|
+
|
449
|
+
unsigned ssb2 = sectorSizeBits - 2;
|
450
|
+
UInt32 numSidsInSec = (UInt32)1 << ssb2;
|
451
|
+
UInt32 numFatItems = numSectorsForFAT << ssb2;
|
452
|
+
if ((numFatItems >> ssb2) != numSectorsForFAT)
|
453
|
+
return S_FALSE;
|
454
|
+
FatSize = numFatItems;
|
455
|
+
|
456
|
+
{
|
457
|
+
UInt32 numSectorsForBat = Get32(p + 0x48); // master sector allocation table
|
458
|
+
const UInt32 kNumHeaderBatItems = 109;
|
459
|
+
UInt32 numBatItems = kNumHeaderBatItems + (numSectorsForBat << ssb2);
|
460
|
+
if (numBatItems < kNumHeaderBatItems || ((numBatItems - kNumHeaderBatItems) >> ssb2) != numSectorsForBat)
|
461
|
+
return S_FALSE;
|
462
|
+
CObjArray<UInt32> bat(numBatItems);
|
463
|
+
UInt32 i;
|
464
|
+
for (i = 0; i < kNumHeaderBatItems; i++)
|
465
|
+
bat[i] = Get32(p + 0x4c + i * 4);
|
466
|
+
UInt32 sid = Get32(p + 0x44);
|
467
|
+
for (UInt32 s = 0; s < numSectorsForBat; s++)
|
468
|
+
{
|
469
|
+
RINOK(ReadIDs(inStream, sect, sectorSizeBits, sid, bat + i));
|
470
|
+
i += numSidsInSec - 1;
|
471
|
+
sid = bat[i];
|
472
|
+
}
|
473
|
+
numBatItems = i;
|
474
|
+
|
475
|
+
Fat.Alloc(numFatItems);
|
476
|
+
UInt32 j = 0;
|
477
|
+
|
478
|
+
for (i = 0; i < numFatItems; j++, i += numSidsInSec)
|
479
|
+
{
|
480
|
+
if (j >= numBatItems)
|
481
|
+
return S_FALSE;
|
482
|
+
RINOK(ReadIDs(inStream, sect, sectorSizeBits, bat[j], Fat + i));
|
483
|
+
}
|
484
|
+
FatSize = numFatItems = i;
|
485
|
+
}
|
486
|
+
|
487
|
+
UInt32 numMatItems;
|
488
|
+
{
|
489
|
+
UInt32 numSectorsForMat = Get32(p + 0x40);
|
490
|
+
numMatItems = (UInt32)numSectorsForMat << ssb2;
|
491
|
+
if ((numMatItems >> ssb2) != numSectorsForMat)
|
492
|
+
return S_FALSE;
|
493
|
+
Mat.Alloc(numMatItems);
|
494
|
+
UInt32 i;
|
495
|
+
UInt32 sid = Get32(p + 0x3C); // short-sector table SID
|
496
|
+
for (i = 0; i < numMatItems; i += numSidsInSec)
|
497
|
+
{
|
498
|
+
RINOK(ReadIDs(inStream, sect, sectorSizeBits, sid, Mat + i));
|
499
|
+
if (sid >= numFatItems)
|
500
|
+
return S_FALSE;
|
501
|
+
sid = Fat[sid];
|
502
|
+
}
|
503
|
+
if (sid != NFatID::kEndOfChain)
|
504
|
+
return S_FALSE;
|
505
|
+
}
|
506
|
+
|
507
|
+
{
|
508
|
+
CByteBuffer used(numFatItems);
|
509
|
+
for (UInt32 i = 0; i < numFatItems; i++)
|
510
|
+
used[i] = 0;
|
511
|
+
UInt32 sid = Get32(p + 0x30); // directory stream SID
|
512
|
+
for (;;)
|
513
|
+
{
|
514
|
+
if (sid >= numFatItems)
|
515
|
+
return S_FALSE;
|
516
|
+
if (used[sid])
|
517
|
+
return S_FALSE;
|
518
|
+
used[sid] = 1;
|
519
|
+
RINOK(ReadSector(inStream, sect, sectorSizeBits, sid));
|
520
|
+
for (UInt32 i = 0; i < sectSize; i += 128)
|
521
|
+
{
|
522
|
+
CItem item;
|
523
|
+
item.Parse(sect + i, mode64bit);
|
524
|
+
Items.Add(item);
|
525
|
+
}
|
526
|
+
sid = Fat[sid];
|
527
|
+
if (sid == NFatID::kEndOfChain)
|
528
|
+
break;
|
529
|
+
}
|
530
|
+
}
|
531
|
+
|
532
|
+
const CItem &root = Items[0];
|
533
|
+
|
534
|
+
{
|
535
|
+
UInt32 numSectorsInMiniStream;
|
536
|
+
{
|
537
|
+
UInt64 numSatSects64 = (root.Size + sectSize - 1) >> sectorSizeBits;
|
538
|
+
if (numSatSects64 > NFatID::kMaxValue)
|
539
|
+
return S_FALSE;
|
540
|
+
numSectorsInMiniStream = (UInt32)numSatSects64;
|
541
|
+
}
|
542
|
+
NumSectorsInMiniStream = numSectorsInMiniStream;
|
543
|
+
MiniSids.Alloc(numSectorsInMiniStream);
|
544
|
+
{
|
545
|
+
UInt64 matSize64 = (root.Size + ((UInt64)1 << miniSectorSizeBits) - 1) >> miniSectorSizeBits;
|
546
|
+
if (matSize64 > NFatID::kMaxValue)
|
547
|
+
return S_FALSE;
|
548
|
+
MatSize = (UInt32)matSize64;
|
549
|
+
if (numMatItems < MatSize)
|
550
|
+
return S_FALSE;
|
551
|
+
}
|
552
|
+
|
553
|
+
UInt32 sid = root.Sid;
|
554
|
+
for (UInt32 i = 0; ; i++)
|
555
|
+
{
|
556
|
+
if (sid == NFatID::kEndOfChain)
|
557
|
+
{
|
558
|
+
if (i != numSectorsInMiniStream)
|
559
|
+
return S_FALSE;
|
560
|
+
break;
|
561
|
+
}
|
562
|
+
if (i >= numSectorsInMiniStream)
|
563
|
+
return S_FALSE;
|
564
|
+
MiniSids[i] = sid;
|
565
|
+
if (sid >= numFatItems)
|
566
|
+
return S_FALSE;
|
567
|
+
sid = Fat[sid];
|
568
|
+
}
|
569
|
+
}
|
570
|
+
|
571
|
+
RINOK(AddNode(-1, root.SonDid));
|
572
|
+
|
573
|
+
unsigned numCabs = 0;
|
574
|
+
|
575
|
+
FOR_VECTOR (i, Refs)
|
576
|
+
{
|
577
|
+
const CItem &item = Items[Refs[i].Did];
|
578
|
+
if (item.IsDir() || numCabs > 1)
|
579
|
+
continue;
|
580
|
+
bool isMsiName;
|
581
|
+
const UString msiName = ConvertName(item.Name, isMsiName);
|
582
|
+
if (isMsiName && !msiName.IsEmpty())
|
583
|
+
{
|
584
|
+
// bool isThereExt = (msiName.Find(L'.') >= 0);
|
585
|
+
bool isMsiSpec = (msiName[0] == k_Msi_SpecChar);
|
586
|
+
if (msiName.Len() >= 4 && StringsAreEqualNoCase_Ascii(msiName.RightPtr(4), ".cab")
|
587
|
+
|| !isMsiSpec && msiName.Len() >= 3 && StringsAreEqualNoCase_Ascii(msiName.RightPtr(3), "exe")
|
588
|
+
// || !isMsiSpec && !isThereExt
|
589
|
+
)
|
590
|
+
|
591
|
+
{
|
592
|
+
numCabs++;
|
593
|
+
MainSubfile = i;
|
594
|
+
}
|
595
|
+
}
|
596
|
+
}
|
597
|
+
|
598
|
+
if (numCabs > 1)
|
599
|
+
MainSubfile = -1;
|
600
|
+
|
601
|
+
{
|
602
|
+
FOR_VECTOR (t, Items)
|
603
|
+
{
|
604
|
+
Update_PhySize_WithItem(t);
|
605
|
+
}
|
606
|
+
}
|
607
|
+
{
|
608
|
+
FOR_VECTOR (t, Items)
|
609
|
+
{
|
610
|
+
const CItem &item = Items[t];
|
611
|
+
|
612
|
+
if (IsMsiName(item.Name))
|
613
|
+
{
|
614
|
+
Type = k_Type_Msi;
|
615
|
+
if (memcmp(item.Name, kMspSequence, kMspSequence_Size) == 0)
|
616
|
+
{
|
617
|
+
Type = k_Type_Msp;
|
618
|
+
break;
|
619
|
+
}
|
620
|
+
continue;
|
621
|
+
}
|
622
|
+
if (AreEqualNames(item.Name, "WordDocument"))
|
623
|
+
{
|
624
|
+
Type = k_Type_Doc;
|
625
|
+
break;
|
626
|
+
}
|
627
|
+
if (AreEqualNames(item.Name, "PowerPoint Document"))
|
628
|
+
{
|
629
|
+
Type = k_Type_Ppt;
|
630
|
+
break;
|
631
|
+
}
|
632
|
+
if (AreEqualNames(item.Name, "Workbook"))
|
633
|
+
{
|
634
|
+
Type = k_Type_Xls;
|
635
|
+
break;
|
636
|
+
}
|
637
|
+
}
|
638
|
+
}
|
639
|
+
|
640
|
+
return S_OK;
|
641
|
+
}
|
642
|
+
|
643
|
+
class CHandler:
|
644
|
+
public IInArchive,
|
645
|
+
public IInArchiveGetStream,
|
646
|
+
public CMyUnknownImp
|
647
|
+
{
|
648
|
+
CMyComPtr<IInStream> _stream;
|
649
|
+
CDatabase _db;
|
650
|
+
public:
|
651
|
+
MY_UNKNOWN_IMP2(IInArchive, IInArchiveGetStream)
|
652
|
+
INTERFACE_IInArchive(;)
|
653
|
+
STDMETHOD(GetStream)(UInt32 index, ISequentialInStream **stream);
|
654
|
+
};
|
655
|
+
|
656
|
+
static const Byte kProps[] =
|
657
|
+
{
|
658
|
+
kpidPath,
|
659
|
+
kpidSize,
|
660
|
+
kpidPackSize,
|
661
|
+
kpidCTime,
|
662
|
+
kpidMTime
|
663
|
+
};
|
664
|
+
|
665
|
+
static const Byte kArcProps[] =
|
666
|
+
{
|
667
|
+
kpidExtension,
|
668
|
+
kpidClusterSize,
|
669
|
+
kpidSectorSize
|
670
|
+
};
|
671
|
+
|
672
|
+
IMP_IInArchive_Props
|
673
|
+
IMP_IInArchive_ArcProps
|
674
|
+
|
675
|
+
STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value)
|
676
|
+
{
|
677
|
+
COM_TRY_BEGIN
|
678
|
+
NWindows::NCOM::CPropVariant prop;
|
679
|
+
switch (propID)
|
680
|
+
{
|
681
|
+
case kpidExtension: prop = kExtensions[(unsigned)_db.Type]; break;
|
682
|
+
case kpidPhySize: prop = _db.PhySize; break;
|
683
|
+
case kpidClusterSize: prop = (UInt32)1 << _db.SectorSizeBits; break;
|
684
|
+
case kpidSectorSize: prop = (UInt32)1 << _db.MiniSectorSizeBits; break;
|
685
|
+
case kpidMainSubfile: if (_db.MainSubfile >= 0) prop = (UInt32)_db.MainSubfile; break;
|
686
|
+
case kpidIsNotArcType: if (_db.IsNotArcType()) prop = true; break;
|
687
|
+
}
|
688
|
+
prop.Detach(value);
|
689
|
+
return S_OK;
|
690
|
+
COM_TRY_END
|
691
|
+
}
|
692
|
+
|
693
|
+
STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value)
|
694
|
+
{
|
695
|
+
COM_TRY_BEGIN
|
696
|
+
NWindows::NCOM::CPropVariant prop;
|
697
|
+
const CRef &ref = _db.Refs[index];
|
698
|
+
const CItem &item = _db.Items[ref.Did];
|
699
|
+
|
700
|
+
switch (propID)
|
701
|
+
{
|
702
|
+
case kpidPath: prop = _db.GetItemPath(index); break;
|
703
|
+
case kpidIsDir: prop = item.IsDir(); break;
|
704
|
+
case kpidCTime: prop = item.CTime; break;
|
705
|
+
case kpidMTime: prop = item.MTime; break;
|
706
|
+
case kpidPackSize: if (!item.IsDir()) prop = _db.GetItemPackSize(item.Size); break;
|
707
|
+
case kpidSize: if (!item.IsDir()) prop = item.Size; break;
|
708
|
+
}
|
709
|
+
prop.Detach(value);
|
710
|
+
return S_OK;
|
711
|
+
COM_TRY_END
|
712
|
+
}
|
713
|
+
|
714
|
+
STDMETHODIMP CHandler::Open(IInStream *inStream,
|
715
|
+
const UInt64 * /* maxCheckStartPosition */,
|
716
|
+
IArchiveOpenCallback * /* openArchiveCallback */)
|
717
|
+
{
|
718
|
+
COM_TRY_BEGIN
|
719
|
+
Close();
|
720
|
+
try
|
721
|
+
{
|
722
|
+
if (_db.Open(inStream) != S_OK)
|
723
|
+
return S_FALSE;
|
724
|
+
_stream = inStream;
|
725
|
+
}
|
726
|
+
catch(...) { return S_FALSE; }
|
727
|
+
return S_OK;
|
728
|
+
COM_TRY_END
|
729
|
+
}
|
730
|
+
|
731
|
+
STDMETHODIMP CHandler::Close()
|
732
|
+
{
|
733
|
+
_db.Clear();
|
734
|
+
_stream.Release();
|
735
|
+
return S_OK;
|
736
|
+
}
|
737
|
+
|
738
|
+
STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems,
|
739
|
+
Int32 testMode, IArchiveExtractCallback *extractCallback)
|
740
|
+
{
|
741
|
+
COM_TRY_BEGIN
|
742
|
+
bool allFilesMode = (numItems == (UInt32)(Int32)-1);
|
743
|
+
if (allFilesMode)
|
744
|
+
numItems = _db.Refs.Size();
|
745
|
+
if (numItems == 0)
|
746
|
+
return S_OK;
|
747
|
+
UInt32 i;
|
748
|
+
UInt64 totalSize = 0;
|
749
|
+
for (i = 0; i < numItems; i++)
|
750
|
+
{
|
751
|
+
const CItem &item = _db.Items[_db.Refs[allFilesMode ? i : indices[i]].Did];
|
752
|
+
if (!item.IsDir())
|
753
|
+
totalSize += item.Size;
|
754
|
+
}
|
755
|
+
RINOK(extractCallback->SetTotal(totalSize));
|
756
|
+
|
757
|
+
UInt64 totalPackSize;
|
758
|
+
totalSize = totalPackSize = 0;
|
759
|
+
|
760
|
+
NCompress::CCopyCoder *copyCoderSpec = new NCompress::CCopyCoder();
|
761
|
+
CMyComPtr<ICompressCoder> copyCoder = copyCoderSpec;
|
762
|
+
|
763
|
+
CLocalProgress *lps = new CLocalProgress;
|
764
|
+
CMyComPtr<ICompressProgressInfo> progress = lps;
|
765
|
+
lps->Init(extractCallback, false);
|
766
|
+
|
767
|
+
for (i = 0; i < numItems; i++)
|
768
|
+
{
|
769
|
+
lps->InSize = totalPackSize;
|
770
|
+
lps->OutSize = totalSize;
|
771
|
+
RINOK(lps->SetCur());
|
772
|
+
Int32 index = allFilesMode ? i : indices[i];
|
773
|
+
const CItem &item = _db.Items[_db.Refs[index].Did];
|
774
|
+
|
775
|
+
CMyComPtr<ISequentialOutStream> outStream;
|
776
|
+
Int32 askMode = testMode ?
|
777
|
+
NExtract::NAskMode::kTest :
|
778
|
+
NExtract::NAskMode::kExtract;
|
779
|
+
RINOK(extractCallback->GetStream(index, &outStream, askMode));
|
780
|
+
|
781
|
+
if (item.IsDir())
|
782
|
+
{
|
783
|
+
RINOK(extractCallback->PrepareOperation(askMode));
|
784
|
+
RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kOK));
|
785
|
+
continue;
|
786
|
+
}
|
787
|
+
|
788
|
+
totalPackSize += _db.GetItemPackSize(item.Size);
|
789
|
+
totalSize += item.Size;
|
790
|
+
|
791
|
+
if (!testMode && !outStream)
|
792
|
+
continue;
|
793
|
+
RINOK(extractCallback->PrepareOperation(askMode));
|
794
|
+
Int32 res = NExtract::NOperationResult::kDataError;
|
795
|
+
CMyComPtr<ISequentialInStream> inStream;
|
796
|
+
HRESULT hres = GetStream(index, &inStream);
|
797
|
+
if (hres == S_FALSE)
|
798
|
+
res = NExtract::NOperationResult::kDataError;
|
799
|
+
else if (hres == E_NOTIMPL)
|
800
|
+
res = NExtract::NOperationResult::kUnsupportedMethod;
|
801
|
+
else
|
802
|
+
{
|
803
|
+
RINOK(hres);
|
804
|
+
if (inStream)
|
805
|
+
{
|
806
|
+
RINOK(copyCoder->Code(inStream, outStream, NULL, NULL, progress));
|
807
|
+
if (copyCoderSpec->TotalSize == item.Size)
|
808
|
+
res = NExtract::NOperationResult::kOK;
|
809
|
+
}
|
810
|
+
}
|
811
|
+
outStream.Release();
|
812
|
+
RINOK(extractCallback->SetOperationResult(res));
|
813
|
+
}
|
814
|
+
return S_OK;
|
815
|
+
COM_TRY_END
|
816
|
+
}
|
817
|
+
|
818
|
+
STDMETHODIMP CHandler::GetNumberOfItems(UInt32 *numItems)
|
819
|
+
{
|
820
|
+
*numItems = _db.Refs.Size();
|
821
|
+
return S_OK;
|
822
|
+
}
|
823
|
+
|
824
|
+
STDMETHODIMP CHandler::GetStream(UInt32 index, ISequentialInStream **stream)
|
825
|
+
{
|
826
|
+
COM_TRY_BEGIN
|
827
|
+
*stream = 0;
|
828
|
+
UInt32 itemIndex = _db.Refs[index].Did;
|
829
|
+
const CItem &item = _db.Items[itemIndex];
|
830
|
+
CClusterInStream *streamSpec = new CClusterInStream;
|
831
|
+
CMyComPtr<ISequentialInStream> streamTemp = streamSpec;
|
832
|
+
streamSpec->Stream = _stream;
|
833
|
+
streamSpec->StartOffset = 0;
|
834
|
+
|
835
|
+
bool isLargeStream = (itemIndex == 0 || _db.IsLargeStream(item.Size));
|
836
|
+
int bsLog = isLargeStream ? _db.SectorSizeBits : _db.MiniSectorSizeBits;
|
837
|
+
streamSpec->BlockSizeLog = bsLog;
|
838
|
+
streamSpec->Size = item.Size;
|
839
|
+
|
840
|
+
UInt32 clusterSize = (UInt32)1 << bsLog;
|
841
|
+
UInt64 numClusters64 = (item.Size + clusterSize - 1) >> bsLog;
|
842
|
+
if (numClusters64 >= ((UInt32)1 << 31))
|
843
|
+
return E_NOTIMPL;
|
844
|
+
streamSpec->Vector.ClearAndReserve((unsigned)numClusters64);
|
845
|
+
UInt32 sid = item.Sid;
|
846
|
+
UInt64 size = item.Size;
|
847
|
+
|
848
|
+
if (size != 0)
|
849
|
+
{
|
850
|
+
for (;; size -= clusterSize)
|
851
|
+
{
|
852
|
+
if (isLargeStream)
|
853
|
+
{
|
854
|
+
if (sid >= _db.FatSize)
|
855
|
+
return S_FALSE;
|
856
|
+
streamSpec->Vector.AddInReserved(sid + 1);
|
857
|
+
sid = _db.Fat[sid];
|
858
|
+
}
|
859
|
+
else
|
860
|
+
{
|
861
|
+
UInt64 val = 0;
|
862
|
+
if (sid >= _db.MatSize || !_db.GetMiniCluster(sid, val) || val >= (UInt64)1 << 32)
|
863
|
+
return S_FALSE;
|
864
|
+
streamSpec->Vector.AddInReserved((UInt32)val);
|
865
|
+
sid = _db.Mat[sid];
|
866
|
+
}
|
867
|
+
if (size <= clusterSize)
|
868
|
+
break;
|
869
|
+
}
|
870
|
+
}
|
871
|
+
if (sid != NFatID::kEndOfChain)
|
872
|
+
return S_FALSE;
|
873
|
+
RINOK(streamSpec->InitAndSeek());
|
874
|
+
*stream = streamTemp.Detach();
|
875
|
+
return S_OK;
|
876
|
+
COM_TRY_END
|
877
|
+
}
|
878
|
+
|
879
|
+
REGISTER_ARC_I(
|
880
|
+
"Compound", "msi msp doc xls ppt", 0, 0xE5,
|
881
|
+
kSignature,
|
882
|
+
0,
|
883
|
+
0,
|
884
|
+
NULL)
|
885
|
+
|
886
|
+
}}
|