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.
Files changed (887) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +49 -0
  3. data/.github/workflows/release.yml +21 -0
  4. data/README.md +13 -2
  5. data/Rakefile +2 -0
  6. data/ext/p7zip/C/7zBuf.h +4 -8
  7. data/ext/p7zip/C/7zBuf2.c +9 -3
  8. data/ext/p7zip/C/7zCrc.c +84 -32
  9. data/ext/p7zip/C/7zCrc.h +2 -2
  10. data/ext/p7zip/C/7zCrcOpt.c +89 -8
  11. data/ext/p7zip/C/7zStream.c +4 -2
  12. data/ext/p7zip/C/{Types.h → 7zTypes.h} +8 -6
  13. data/ext/p7zip/C/7zVersion.h +21 -6
  14. data/ext/p7zip/C/Aes.c +28 -15
  15. data/ext/p7zip/C/Aes.h +2 -2
  16. data/ext/p7zip/C/Alloc.c +60 -12
  17. data/ext/p7zip/C/Alloc.h +6 -7
  18. data/ext/p7zip/C/Bcj2.c +256 -0
  19. data/ext/p7zip/C/Bcj2.h +146 -0
  20. data/ext/p7zip/C/Bcj2Enc.c +312 -0
  21. data/ext/p7zip/C/Blake2.h +48 -0
  22. data/ext/p7zip/C/Blake2s.c +244 -0
  23. data/ext/p7zip/C/Bra.c +2 -0
  24. data/ext/p7zip/C/Bra.h +4 -8
  25. data/ext/p7zip/C/Bra86.c +48 -51
  26. data/ext/p7zip/C/BraIA64.c +3 -1
  27. data/ext/p7zip/C/BwtSort.c +3 -4
  28. data/ext/p7zip/C/BwtSort.h +4 -8
  29. data/ext/p7zip/C/Compiler.h +32 -0
  30. data/ext/p7zip/C/CpuArch.c +50 -7
  31. data/ext/p7zip/C/CpuArch.h +112 -41
  32. data/ext/p7zip/C/Delta.c +2 -0
  33. data/ext/p7zip/C/Delta.h +4 -8
  34. data/ext/p7zip/C/HuffEnc.c +8 -6
  35. data/ext/p7zip/C/HuffEnc.h +4 -8
  36. data/ext/p7zip/C/LzFind.c +391 -108
  37. data/ext/p7zip/C/LzFind.h +20 -18
  38. data/ext/p7zip/C/LzFindMt.c +100 -90
  39. data/ext/p7zip/C/LzFindMt.h +4 -8
  40. data/ext/p7zip/C/LzHash.h +23 -20
  41. data/ext/p7zip/C/Lzma2Dec.c +48 -26
  42. data/ext/p7zip/C/Lzma2Dec.h +4 -8
  43. data/ext/p7zip/C/Lzma2Enc.c +58 -15
  44. data/ext/p7zip/C/Lzma2Enc.h +3 -7
  45. data/ext/p7zip/C/{LzmaUtil/Lzma86Enc.h → Lzma86.h} +47 -14
  46. data/ext/p7zip/C/{LzmaUtil/Lzma86Dec.c → Lzma86Dec.c} +6 -13
  47. data/ext/p7zip/C/{LzmaUtil/Lzma86Enc.c → Lzma86Enc.c} +8 -15
  48. data/ext/p7zip/C/LzmaDec.c +180 -79
  49. data/ext/p7zip/C/LzmaDec.h +4 -8
  50. data/ext/p7zip/C/LzmaEnc.c +230 -147
  51. data/ext/p7zip/C/LzmaEnc.h +6 -8
  52. data/ext/p7zip/C/MtCoder.c +3 -3
  53. data/ext/p7zip/C/Ppmd.h +5 -5
  54. data/ext/p7zip/C/Ppmd7.c +9 -7
  55. data/ext/p7zip/C/Ppmd7.h +3 -3
  56. data/ext/p7zip/C/Ppmd7Dec.c +2 -0
  57. data/ext/p7zip/C/Ppmd7Enc.c +4 -2
  58. data/ext/p7zip/C/Ppmd8.c +34 -31
  59. data/ext/p7zip/C/Ppmd8.h +5 -1
  60. data/ext/p7zip/C/Ppmd8Dec.c +2 -0
  61. data/ext/p7zip/C/Ppmd8Enc.c +2 -0
  62. data/ext/p7zip/C/Precomp.h +10 -0
  63. data/ext/p7zip/C/RotateDefs.h +11 -1
  64. data/ext/p7zip/C/Sha1.c +340 -0
  65. data/ext/p7zip/C/Sha1.h +38 -0
  66. data/ext/p7zip/C/Sha256.c +107 -63
  67. data/ext/p7zip/C/Sha256.h +2 -2
  68. data/ext/p7zip/C/Sort.c +59 -11
  69. data/ext/p7zip/C/Sort.h +8 -10
  70. data/ext/p7zip/C/Threads.h +1 -1
  71. data/ext/p7zip/C/Xz.c +7 -5
  72. data/ext/p7zip/C/Xz.h +40 -17
  73. data/ext/p7zip/C/XzCrc64.c +69 -16
  74. data/ext/p7zip/C/XzCrc64.h +2 -2
  75. data/ext/p7zip/C/XzCrc64Opt.c +69 -0
  76. data/ext/p7zip/C/XzDec.c +93 -55
  77. data/ext/p7zip/C/XzEnc.c +206 -165
  78. data/ext/p7zip/C/XzEnc.h +23 -9
  79. data/ext/p7zip/C/XzIn.c +50 -43
  80. data/ext/p7zip/CPP/7zip/Archive/7z/7zCompressionMode.h +37 -13
  81. data/ext/p7zip/CPP/7zip/Archive/7z/7zDecode.cpp +392 -181
  82. data/ext/p7zip/CPP/7zip/Archive/7z/7zDecode.h +29 -29
  83. data/ext/p7zip/CPP/7zip/Archive/7z/7zEncode.cpp +424 -212
  84. data/ext/p7zip/CPP/7zip/Archive/7z/7zEncode.h +53 -16
  85. data/ext/p7zip/CPP/7zip/Archive/7z/7zExtract.cpp +312 -174
  86. data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderInStream.cpp +74 -61
  87. data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderInStream.h +22 -19
  88. data/ext/p7zip/CPP/7zip/Archive/7z/7zHandler.cpp +505 -232
  89. data/ext/p7zip/CPP/7zip/Archive/7z/7zHandler.h +70 -16
  90. data/ext/p7zip/CPP/7zip/Archive/7z/7zHandlerOut.cpp +602 -172
  91. data/ext/p7zip/CPP/7zip/Archive/7z/7zHeader.cpp +5 -0
  92. data/ext/p7zip/CPP/7zip/Archive/7z/7zHeader.h +54 -3
  93. data/ext/p7zip/CPP/7zip/Archive/7z/7zIn.cpp +981 -616
  94. data/ext/p7zip/CPP/7zip/Archive/7z/7zIn.h +275 -89
  95. data/ext/p7zip/CPP/7zip/Archive/7z/7zItem.h +77 -162
  96. data/ext/p7zip/CPP/7zip/Archive/7z/7zOut.cpp +288 -238
  97. data/ext/p7zip/CPP/7zip/Archive/7z/7zOut.h +189 -20
  98. data/ext/p7zip/CPP/7zip/Archive/7z/7zProperties.cpp +59 -49
  99. data/ext/p7zip/CPP/7zip/Archive/7z/7zRegister.cpp +12 -9
  100. data/ext/p7zip/CPP/7zip/Archive/7z/7zSpecStream.cpp +4 -6
  101. data/ext/p7zip/CPP/7zip/Archive/7z/7zSpecStream.h +5 -5
  102. data/ext/p7zip/CPP/7zip/Archive/7z/7zUpdate.cpp +1743 -447
  103. data/ext/p7zip/CPP/7zip/Archive/7z/7zUpdate.h +61 -10
  104. data/ext/p7zip/CPP/7zip/Archive/ApmHandler.cpp +84 -120
  105. data/ext/p7zip/CPP/7zip/Archive/ArHandler.cpp +854 -0
  106. data/ext/p7zip/CPP/7zip/Archive/ArchiveExports.cpp +48 -32
  107. data/ext/p7zip/CPP/7zip/Archive/ArjHandler.cpp +519 -340
  108. data/ext/p7zip/CPP/7zip/Archive/Bz2Handler.cpp +223 -203
  109. data/ext/p7zip/CPP/7zip/Archive/Cab/CabBlockInStream.cpp +50 -139
  110. data/ext/p7zip/CPP/7zip/Archive/Cab/CabBlockInStream.h +17 -18
  111. data/ext/p7zip/CPP/7zip/Archive/Cab/CabHandler.cpp +566 -234
  112. data/ext/p7zip/CPP/7zip/Archive/Cab/CabHandler.h +10 -1
  113. data/ext/p7zip/CPP/7zip/Archive/Cab/CabHeader.cpp +2 -2
  114. data/ext/p7zip/CPP/7zip/Archive/Cab/CabHeader.h +12 -15
  115. data/ext/p7zip/CPP/7zip/Archive/Cab/CabIn.cpp +341 -122
  116. data/ext/p7zip/CPP/7zip/Archive/Cab/CabIn.h +81 -66
  117. data/ext/p7zip/CPP/7zip/Archive/Cab/CabItem.h +17 -14
  118. data/ext/p7zip/CPP/7zip/Archive/Cab/CabRegister.cpp +10 -4
  119. data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHandler.cpp +190 -83
  120. data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHandler.h +7 -1
  121. data/ext/p7zip/CPP/7zip/Archive/Chm/ChmIn.cpp +292 -174
  122. data/ext/p7zip/CPP/7zip/Archive/Chm/ChmIn.h +73 -47
  123. data/ext/p7zip/CPP/7zip/Archive/ComHandler.cpp +886 -0
  124. data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2.cpp +994 -71
  125. data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2.h +364 -101
  126. data/ext/p7zip/CPP/7zip/Archive/Common/DummyOutStream.cpp +7 -12
  127. data/ext/p7zip/CPP/7zip/Archive/Common/DummyOutStream.h +4 -3
  128. data/ext/p7zip/CPP/7zip/Archive/Common/FindSignature.cpp +6 -6
  129. data/ext/p7zip/CPP/7zip/Archive/Common/FindSignature.h +2 -2
  130. data/ext/p7zip/CPP/7zip/Archive/Common/HandlerOut.cpp +77 -543
  131. data/ext/p7zip/CPP/7zip/Archive/Common/HandlerOut.h +31 -51
  132. data/ext/p7zip/CPP/7zip/Archive/Common/InStreamWithCRC.cpp +18 -14
  133. data/ext/p7zip/CPP/7zip/Archive/Common/ItemNameUtils.cpp +34 -7
  134. data/ext/p7zip/CPP/7zip/Archive/Common/ItemNameUtils.h +5 -2
  135. data/ext/p7zip/CPP/7zip/Archive/Common/MultiStream.cpp +25 -24
  136. data/ext/p7zip/CPP/7zip/Archive/Common/MultiStream.h +8 -3
  137. data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithCRC.h +1 -0
  138. data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithSha1.cpp +2 -2
  139. data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithSha1.h +5 -5
  140. data/ext/p7zip/CPP/7zip/Archive/Common/ParseProperties.cpp +0 -174
  141. data/ext/p7zip/CPP/7zip/Archive/Common/ParseProperties.h +2 -14
  142. data/ext/p7zip/CPP/7zip/Archive/CpioHandler.cpp +506 -335
  143. data/ext/p7zip/CPP/7zip/Archive/CramfsHandler.cpp +227 -84
  144. data/ext/p7zip/CPP/7zip/Archive/DeflateProps.cpp +0 -115
  145. data/ext/p7zip/CPP/7zip/Archive/DeflateProps.h +0 -29
  146. data/ext/p7zip/CPP/7zip/Archive/DllExports2.cpp +63 -17
  147. data/ext/p7zip/CPP/7zip/Archive/DmgHandler.cpp +1007 -339
  148. data/ext/p7zip/CPP/7zip/Archive/ElfHandler.cpp +618 -177
  149. data/ext/p7zip/CPP/7zip/Archive/ExtHandler.cpp +2867 -0
  150. data/ext/p7zip/CPP/7zip/Archive/FatHandler.cpp +136 -76
  151. data/ext/p7zip/CPP/7zip/Archive/FlvHandler.cpp +132 -150
  152. data/ext/p7zip/CPP/7zip/Archive/GptHandler.cpp +405 -0
  153. data/ext/p7zip/CPP/7zip/Archive/GzHandler.cpp +560 -214
  154. data/ext/p7zip/CPP/7zip/Archive/HandlerCont.cpp +288 -0
  155. data/ext/p7zip/CPP/7zip/Archive/HandlerCont.h +116 -0
  156. data/ext/p7zip/CPP/7zip/Archive/HfsHandler.cpp +1880 -0
  157. data/ext/p7zip/CPP/7zip/Archive/IArchive.h +415 -51
  158. data/ext/p7zip/CPP/7zip/Archive/IhexHandler.cpp +497 -0
  159. data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHandler.cpp +158 -71
  160. data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHandler.h +2 -1
  161. data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHeader.cpp +0 -9
  162. data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHeader.h +8 -5
  163. data/ext/p7zip/CPP/7zip/Archive/Iso/IsoIn.cpp +311 -91
  164. data/ext/p7zip/CPP/7zip/Archive/Iso/IsoIn.h +101 -83
  165. data/ext/p7zip/CPP/7zip/Archive/Iso/IsoItem.h +48 -39
  166. data/ext/p7zip/CPP/7zip/Archive/Iso/IsoRegister.cpp +12 -4
  167. data/ext/p7zip/CPP/7zip/Archive/LzhHandler.cpp +127 -114
  168. data/ext/p7zip/CPP/7zip/Archive/LzmaHandler.cpp +264 -121
  169. data/ext/p7zip/CPP/7zip/Archive/MachoHandler.cpp +402 -242
  170. data/ext/p7zip/CPP/7zip/Archive/MbrHandler.cpp +56 -114
  171. data/ext/p7zip/CPP/7zip/Archive/MslzHandler.cpp +230 -90
  172. data/ext/p7zip/CPP/7zip/Archive/MubHandler.cpp +129 -153
  173. data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisDecode.cpp +179 -58
  174. data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisDecode.h +36 -7
  175. data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisHandler.cpp +407 -237
  176. data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisHandler.h +9 -16
  177. data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisIn.cpp +5535 -1098
  178. data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisIn.h +345 -81
  179. data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisRegister.cpp +11 -4
  180. data/ext/p7zip/CPP/7zip/Archive/NtfsHandler.cpp +1424 -434
  181. data/ext/p7zip/CPP/7zip/Archive/PeHandler.cpp +1831 -521
  182. data/ext/p7zip/CPP/7zip/Archive/PpmdHandler.cpp +50 -35
  183. data/ext/p7zip/CPP/7zip/Archive/QcowHandler.cpp +615 -0
  184. data/ext/p7zip/CPP/7zip/Archive/Rar/Rar5Handler.cpp +2746 -0
  185. data/ext/p7zip/CPP/7zip/Archive/Rar/Rar5Handler.h +411 -0
  186. data/ext/p7zip/CPP/7zip/Archive/Rar/RarHandler.cpp +1241 -355
  187. data/ext/p7zip/CPP/7zip/Archive/Rar/RarHandler.h +70 -20
  188. data/ext/p7zip/CPP/7zip/Archive/Rar/RarHeader.h +38 -34
  189. data/ext/p7zip/CPP/7zip/Archive/Rar/RarItem.h +34 -16
  190. data/ext/p7zip/CPP/7zip/Archive/Rar/RarVol.h +129 -0
  191. data/ext/p7zip/CPP/7zip/Archive/RpmHandler.cpp +641 -194
  192. data/ext/p7zip/CPP/7zip/Archive/SplitHandler.cpp +174 -181
  193. data/ext/p7zip/CPP/7zip/Archive/SquashfsHandler.cpp +237 -174
  194. data/ext/p7zip/CPP/7zip/Archive/SwfHandler.cpp +471 -192
  195. data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandler.cpp +350 -59
  196. data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandler.h +24 -7
  197. data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandlerOut.cpp +79 -27
  198. data/ext/p7zip/CPP/7zip/Archive/Tar/TarHeader.cpp +5 -7
  199. data/ext/p7zip/CPP/7zip/Archive/Tar/TarHeader.h +20 -44
  200. data/ext/p7zip/CPP/7zip/Archive/Tar/TarIn.cpp +279 -64
  201. data/ext/p7zip/CPP/7zip/Archive/Tar/TarIn.h +10 -1
  202. data/ext/p7zip/CPP/7zip/Archive/Tar/TarItem.h +34 -8
  203. data/ext/p7zip/CPP/7zip/Archive/Tar/TarOut.cpp +145 -87
  204. data/ext/p7zip/CPP/7zip/Archive/Tar/TarOut.h +13 -5
  205. data/ext/p7zip/CPP/7zip/Archive/Tar/TarRegister.cpp +14 -9
  206. data/ext/p7zip/CPP/7zip/Archive/Tar/TarUpdate.cpp +154 -27
  207. data/ext/p7zip/CPP/7zip/Archive/Tar/TarUpdate.h +10 -6
  208. data/ext/p7zip/CPP/7zip/Archive/Udf/UdfHandler.cpp +53 -128
  209. data/ext/p7zip/CPP/7zip/Archive/Udf/UdfHandler.h +6 -5
  210. data/ext/p7zip/CPP/7zip/Archive/Udf/UdfIn.cpp +384 -119
  211. data/ext/p7zip/CPP/7zip/Archive/Udf/UdfIn.h +40 -21
  212. data/ext/p7zip/CPP/7zip/Archive/UefiHandler.cpp +1618 -0
  213. data/ext/p7zip/CPP/7zip/Archive/VdiHandler.cpp +362 -0
  214. data/ext/p7zip/CPP/7zip/Archive/VhdHandler.cpp +438 -247
  215. data/ext/p7zip/CPP/7zip/Archive/VmdkHandler.cpp +1518 -0
  216. data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandler.cpp +837 -249
  217. data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandler.h +73 -47
  218. data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandlerOut.cpp +1614 -351
  219. data/ext/p7zip/CPP/7zip/Archive/Wim/WimIn.cpp +1519 -513
  220. data/ext/p7zip/CPP/7zip/Archive/Wim/WimIn.h +498 -139
  221. data/ext/p7zip/CPP/7zip/Archive/Wim/WimRegister.cpp +13 -9
  222. data/ext/p7zip/CPP/7zip/Archive/XarHandler.cpp +272 -128
  223. data/ext/p7zip/CPP/7zip/Archive/XzHandler.cpp +502 -253
  224. data/ext/p7zip/CPP/7zip/Archive/XzHandler.h +65 -0
  225. data/ext/p7zip/CPP/7zip/Archive/ZHandler.cpp +114 -39
  226. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipAddCommon.cpp +118 -134
  227. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipAddCommon.h +6 -0
  228. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipCompressionMode.h +40 -20
  229. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandler.cpp +541 -274
  230. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandler.h +13 -40
  231. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp +165 -254
  232. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHeader.h +70 -178
  233. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipIn.cpp +1934 -550
  234. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipIn.h +294 -63
  235. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItem.cpp +160 -86
  236. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItem.h +139 -110
  237. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipOut.cpp +177 -154
  238. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipOut.h +50 -18
  239. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipRegister.cpp +18 -9
  240. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipUpdate.cpp +367 -201
  241. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipUpdate.h +11 -10
  242. data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile +2 -319
  243. data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile.depend +0 -4962
  244. data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile.list +1004 -259
  245. data/ext/p7zip/CPP/7zip/Common/CWrappers.cpp +26 -22
  246. data/ext/p7zip/CPP/7zip/Common/CWrappers.h +19 -14
  247. data/ext/p7zip/CPP/7zip/Common/CreateCoder.cpp +298 -130
  248. data/ext/p7zip/CPP/7zip/Common/CreateCoder.h +118 -34
  249. data/ext/p7zip/CPP/7zip/Common/FilePathAutoRename.cpp +24 -28
  250. data/ext/p7zip/CPP/7zip/Common/FilePathAutoRename.h +5 -5
  251. data/ext/p7zip/CPP/7zip/Common/FileStreams.cpp +268 -65
  252. data/ext/p7zip/CPP/7zip/Common/FileStreams.h +70 -33
  253. data/ext/p7zip/CPP/7zip/Common/FilterCoder.cpp +302 -131
  254. data/ext/p7zip/CPP/7zip/Common/FilterCoder.h +141 -43
  255. data/ext/p7zip/CPP/7zip/Common/InBuffer.cpp +87 -35
  256. data/ext/p7zip/CPP/7zip/Common/InBuffer.h +54 -45
  257. data/ext/p7zip/CPP/7zip/Common/InOutTempBuffer.cpp +22 -17
  258. data/ext/p7zip/CPP/7zip/Common/InOutTempBuffer.h +5 -5
  259. data/ext/p7zip/CPP/7zip/Common/LimitedStreams.cpp +256 -43
  260. data/ext/p7zip/CPP/7zip/Common/LimitedStreams.h +135 -8
  261. data/ext/p7zip/CPP/7zip/Common/MemBlocks.cpp +5 -5
  262. data/ext/p7zip/CPP/7zip/Common/MemBlocks.h +3 -3
  263. data/ext/p7zip/CPP/7zip/Common/MethodId.cpp +0 -24
  264. data/ext/p7zip/CPP/7zip/Common/MethodId.h +1 -1
  265. data/ext/p7zip/CPP/7zip/Common/MethodProps.cpp +430 -71
  266. data/ext/p7zip/CPP/7zip/Common/MethodProps.h +170 -17
  267. data/ext/p7zip/CPP/7zip/Common/OffsetStream.cpp +8 -4
  268. data/ext/p7zip/CPP/7zip/Common/OffsetStream.h +4 -3
  269. data/ext/p7zip/CPP/7zip/Common/OutBuffer.cpp +26 -31
  270. data/ext/p7zip/CPP/7zip/Common/OutBuffer.h +17 -18
  271. data/ext/p7zip/CPP/7zip/Common/OutMemStream.cpp +5 -5
  272. data/ext/p7zip/CPP/7zip/Common/OutMemStream.h +5 -4
  273. data/ext/p7zip/CPP/7zip/Common/ProgressUtils.cpp +22 -13
  274. data/ext/p7zip/CPP/7zip/Common/ProgressUtils.h +4 -3
  275. data/ext/p7zip/CPP/7zip/Common/PropId.cpp +108 -0
  276. data/ext/p7zip/CPP/7zip/Common/RegisterArc.h +63 -17
  277. data/ext/p7zip/CPP/7zip/Common/RegisterCodec.h +79 -6
  278. data/ext/p7zip/CPP/7zip/Common/StreamBinder.cpp +95 -90
  279. data/ext/p7zip/CPP/7zip/Common/StreamBinder.h +46 -23
  280. data/ext/p7zip/CPP/7zip/Common/StreamObjects.cpp +88 -24
  281. data/ext/p7zip/CPP/7zip/Common/StreamObjects.h +36 -14
  282. data/ext/p7zip/CPP/7zip/Common/StreamUtils.cpp +4 -4
  283. data/ext/p7zip/CPP/7zip/Common/StreamUtils.h +6 -6
  284. data/ext/p7zip/CPP/7zip/Common/UniqBlocks.cpp +57 -0
  285. data/ext/p7zip/CPP/7zip/Common/UniqBlocks.h +26 -0
  286. data/ext/p7zip/CPP/7zip/Common/VirtThread.cpp +8 -6
  287. data/ext/p7zip/CPP/7zip/Common/VirtThread.h +6 -5
  288. data/ext/p7zip/CPP/7zip/Compress/BZip2Const.h +13 -12
  289. data/ext/p7zip/CPP/7zip/Compress/BZip2Crc.h +1 -1
  290. data/ext/p7zip/CPP/7zip/Compress/BZip2Decoder.cpp +198 -147
  291. data/ext/p7zip/CPP/7zip/Compress/BZip2Decoder.h +60 -27
  292. data/ext/p7zip/CPP/7zip/Compress/BZip2Encoder.cpp +111 -116
  293. data/ext/p7zip/CPP/7zip/Compress/BZip2Encoder.h +53 -59
  294. data/ext/p7zip/CPP/7zip/Compress/BZip2Register.cpp +12 -7
  295. data/ext/p7zip/CPP/7zip/Compress/Bcj2Coder.cpp +554 -282
  296. data/ext/p7zip/CPP/7zip/Compress/Bcj2Coder.h +73 -71
  297. data/ext/p7zip/CPP/7zip/Compress/Bcj2Register.cpp +10 -5
  298. data/ext/p7zip/CPP/7zip/Compress/BcjCoder.cpp +13 -4
  299. data/ext/p7zip/CPP/7zip/Compress/BcjCoder.h +17 -5
  300. data/ext/p7zip/CPP/7zip/Compress/BcjRegister.cpp +7 -9
  301. data/ext/p7zip/CPP/7zip/Compress/BitlDecoder.cpp +2 -2
  302. data/ext/p7zip/CPP/7zip/Compress/BitlDecoder.h +58 -61
  303. data/ext/p7zip/CPP/7zip/Compress/BitlEncoder.h +24 -25
  304. data/ext/p7zip/CPP/7zip/Compress/BitmDecoder.h +46 -17
  305. data/ext/p7zip/CPP/7zip/Compress/BitmEncoder.h +18 -19
  306. data/ext/p7zip/CPP/7zip/Compress/BranchMisc.cpp +14 -28
  307. data/ext/p7zip/CPP/7zip/Compress/BranchMisc.h +27 -6
  308. data/ext/p7zip/CPP/7zip/Compress/BranchRegister.cpp +26 -15
  309. data/ext/p7zip/CPP/7zip/Compress/ByteSwap.cpp +45 -26
  310. data/ext/p7zip/CPP/7zip/Compress/CodecExports.cpp +254 -70
  311. data/ext/p7zip/CPP/7zip/Compress/CopyCoder.cpp +65 -17
  312. data/ext/p7zip/CPP/7zip/Compress/CopyCoder.h +15 -3
  313. data/ext/p7zip/CPP/7zip/Compress/CopyRegister.cpp +5 -4
  314. data/ext/p7zip/CPP/7zip/Compress/Deflate64Register.cpp +12 -6
  315. data/ext/p7zip/CPP/7zip/Compress/DeflateConst.h +43 -46
  316. data/ext/p7zip/CPP/7zip/Compress/DeflateDecoder.cpp +145 -81
  317. data/ext/p7zip/CPP/7zip/Compress/DeflateDecoder.h +31 -33
  318. data/ext/p7zip/CPP/7zip/Compress/DeflateEncoder.cpp +179 -162
  319. data/ext/p7zip/CPP/7zip/Compress/DeflateEncoder.h +35 -30
  320. data/ext/p7zip/CPP/7zip/Compress/DeflateRegister.cpp +11 -7
  321. data/ext/p7zip/CPP/7zip/Compress/DeltaFilter.cpp +55 -39
  322. data/ext/p7zip/CPP/7zip/Compress/{DllExports2.cpp → DllExports2Compress.cpp} +8 -8
  323. data/ext/p7zip/CPP/7zip/Compress/DllExportsCompress.cpp +48 -0
  324. data/ext/p7zip/CPP/7zip/Compress/HuffmanDecoder.h +220 -49
  325. data/ext/p7zip/CPP/7zip/Compress/ImplodeDecoder.cpp +14 -9
  326. data/ext/p7zip/CPP/7zip/Compress/ImplodeDecoder.h +2 -3
  327. data/ext/p7zip/CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp +7 -7
  328. data/ext/p7zip/CPP/7zip/Compress/ImplodeHuffmanDecoder.h +1 -1
  329. data/ext/p7zip/CPP/7zip/Compress/LzOutWindow.cpp +1 -1
  330. data/ext/p7zip/CPP/7zip/Compress/LzOutWindow.h +21 -18
  331. data/ext/p7zip/CPP/7zip/Compress/LzhDecoder.cpp +171 -141
  332. data/ext/p7zip/CPP/7zip/Compress/LzhDecoder.h +32 -64
  333. data/ext/p7zip/CPP/7zip/Compress/Lzham/LICENSE +22 -0
  334. data/ext/p7zip/CPP/7zip/Compress/Lzham/LzhamRegister.cpp +783 -0
  335. data/ext/p7zip/CPP/7zip/Compress/Lzham/README.md +211 -0
  336. data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham.h +803 -0
  337. data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_dynamic_lib.h +156 -0
  338. data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_exports.inc +31 -0
  339. data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_static_lib.h +59 -0
  340. data/ext/p7zip/CPP/7zip/Compress/Lzham/include/zlib.h +2 -0
  341. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/CMakeLists.txt +69 -0
  342. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_comp.h +38 -0
  343. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.cpp +244 -0
  344. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.h +46 -0
  345. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp.cpp +750 -0
  346. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.cpp +2240 -0
  347. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.h +503 -0
  348. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_state.cpp +1684 -0
  349. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.cpp +947 -0
  350. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.h +164 -0
  351. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_null_threading.h +98 -0
  352. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.cpp +214 -0
  353. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.h +535 -0
  354. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_threading.h +12 -0
  355. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_win32_threading.cpp +232 -0
  356. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_win32_threading.h +387 -0
  357. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzhamcomp.vcxproj +208 -0
  358. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/CMakeLists.txt +86 -0
  359. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.cpp +80 -0
  360. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.h +58 -0
  361. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.cpp +73 -0
  362. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.h +13 -0
  363. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_config.h +25 -0
  364. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_core.h +303 -0
  365. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_decomp.h +37 -0
  366. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_helpers.h +54 -0
  367. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.cpp +286 -0
  368. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.h +32 -0
  369. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecomp.cpp +1586 -0
  370. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.cpp +131 -0
  371. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.h +89 -0
  372. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_math.h +142 -0
  373. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.cpp +463 -0
  374. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.h +115 -0
  375. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.cpp +159 -0
  376. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.h +284 -0
  377. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.cpp +431 -0
  378. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.h +157 -0
  379. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.cpp +1527 -0
  380. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.h +494 -0
  381. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.cpp +147 -0
  382. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.h +99 -0
  383. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_traits.h +141 -0
  384. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_types.h +72 -0
  385. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_utils.h +58 -0
  386. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.cpp +83 -0
  387. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.h +628 -0
  388. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzhamdecomp.vcxproj +224 -0
  389. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamlib/lzham_lib.cpp +179 -0
  390. data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamlib/lzhamlib.vcxproj +187 -0
  391. data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile +10 -0
  392. data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile.depend +0 -0
  393. data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile.list +129 -0
  394. data/ext/p7zip/CPP/7zip/Compress/Lzma2Decoder.cpp +123 -46
  395. data/ext/p7zip/CPP/7zip/Compress/Lzma2Decoder.h +29 -14
  396. data/ext/p7zip/CPP/7zip/Compress/Lzma2Encoder.cpp +14 -9
  397. data/ext/p7zip/CPP/7zip/Compress/Lzma2Encoder.h +1 -1
  398. data/ext/p7zip/CPP/7zip/Compress/Lzma2Register.cpp +9 -7
  399. data/ext/p7zip/CPP/7zip/Compress/LzmaDecoder.cpp +24 -8
  400. data/ext/p7zip/CPP/7zip/Compress/LzmaDecoder.h +8 -1
  401. data/ext/p7zip/CPP/7zip/Compress/LzmaEncoder.cpp +30 -27
  402. data/ext/p7zip/CPP/7zip/Compress/LzmaEncoder.h +3 -1
  403. data/ext/p7zip/CPP/7zip/Compress/LzmaRegister.cpp +9 -7
  404. data/ext/p7zip/CPP/7zip/Compress/LzmsDecoder.cpp +576 -0
  405. data/ext/p7zip/CPP/7zip/Compress/LzmsDecoder.h +271 -0
  406. data/ext/p7zip/CPP/7zip/Compress/Lzx.h +32 -36
  407. data/ext/p7zip/CPP/7zip/Compress/LzxDecoder.cpp +380 -238
  408. data/ext/p7zip/CPP/7zip/Compress/LzxDecoder.h +170 -83
  409. data/ext/p7zip/CPP/7zip/Compress/Mtf8.h +7 -9
  410. data/ext/p7zip/CPP/7zip/Compress/PpmdDecoder.cpp +1 -5
  411. data/ext/p7zip/CPP/7zip/Compress/PpmdEncoder.cpp +51 -18
  412. data/ext/p7zip/CPP/7zip/Compress/PpmdEncoder.h +18 -8
  413. data/ext/p7zip/CPP/7zip/Compress/PpmdRegister.cpp +9 -8
  414. data/ext/p7zip/CPP/7zip/Compress/PpmdZip.cpp +61 -25
  415. data/ext/p7zip/CPP/7zip/Compress/PpmdZip.h +21 -6
  416. data/ext/p7zip/CPP/7zip/Compress/QuantumDecoder.cpp +122 -102
  417. data/ext/p7zip/CPP/7zip/Compress/QuantumDecoder.h +68 -157
  418. data/ext/p7zip/CPP/7zip/Compress/Rar/makefile +33 -18
  419. data/ext/p7zip/CPP/7zip/Compress/Rar/makefile.depend +0 -158
  420. data/ext/p7zip/CPP/7zip/Compress/Rar/makefile.list +105 -56
  421. data/ext/p7zip/CPP/7zip/Compress/Rar1Decoder.cpp +34 -21
  422. data/ext/p7zip/CPP/7zip/Compress/Rar1Decoder.h +2 -0
  423. data/ext/p7zip/CPP/7zip/Compress/Rar2Decoder.cpp +77 -67
  424. data/ext/p7zip/CPP/7zip/Compress/Rar2Decoder.h +12 -10
  425. data/ext/p7zip/CPP/7zip/Compress/Rar3Decoder.cpp +139 -118
  426. data/ext/p7zip/CPP/7zip/Compress/Rar3Decoder.h +48 -33
  427. data/ext/p7zip/CPP/7zip/Compress/Rar3Vm.cpp +148 -113
  428. data/ext/p7zip/CPP/7zip/Compress/Rar3Vm.h +35 -19
  429. data/ext/p7zip/CPP/7zip/Compress/Rar5Decoder.cpp +961 -0
  430. data/ext/p7zip/CPP/7zip/Compress/Rar5Decoder.h +335 -0
  431. data/ext/p7zip/CPP/7zip/Compress/RarCodecsRegister.cpp +13 -6
  432. data/ext/p7zip/CPP/7zip/Compress/ShrinkDecoder.cpp +91 -71
  433. data/ext/p7zip/CPP/7zip/Compress/ShrinkDecoder.h +2 -4
  434. data/ext/p7zip/CPP/7zip/Compress/XpressDecoder.cpp +129 -0
  435. data/ext/p7zip/CPP/7zip/Compress/XpressDecoder.h +13 -0
  436. data/ext/p7zip/CPP/7zip/Compress/ZDecoder.cpp +98 -20
  437. data/ext/p7zip/CPP/7zip/Compress/ZDecoder.h +19 -7
  438. data/ext/p7zip/CPP/7zip/Compress/ZlibDecoder.cpp +14 -11
  439. data/ext/p7zip/CPP/7zip/Compress/ZlibDecoder.h +32 -1
  440. data/ext/p7zip/CPP/7zip/Crypto/7zAes.cpp +137 -101
  441. data/ext/p7zip/CPP/7zip/Crypto/7zAes.h +31 -30
  442. data/ext/p7zip/CPP/7zip/Crypto/7zAesRegister.cpp +8 -9
  443. data/ext/p7zip/CPP/7zip/Crypto/HmacSha1.cpp +39 -28
  444. data/ext/p7zip/CPP/7zip/Crypto/HmacSha1.h +3 -3
  445. data/ext/p7zip/CPP/7zip/Crypto/HmacSha256.cpp +62 -0
  446. data/ext/p7zip/CPP/7zip/Crypto/HmacSha256.h +27 -0
  447. data/ext/p7zip/CPP/7zip/Crypto/MyAes.cpp +73 -7
  448. data/ext/p7zip/CPP/7zip/Crypto/MyAes.h +25 -8
  449. data/ext/p7zip/CPP/7zip/Crypto/MyAesReg.cpp +16 -0
  450. data/ext/p7zip/CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp +29 -15
  451. data/ext/p7zip/CPP/7zip/Crypto/Pbkdf2HmacSha1.h +2 -1
  452. data/ext/p7zip/CPP/7zip/Crypto/RandGen.cpp +49 -34
  453. data/ext/p7zip/CPP/7zip/Crypto/RandGen.h +2 -2
  454. data/ext/p7zip/CPP/7zip/Crypto/Rar20Crypto.cpp +36 -39
  455. data/ext/p7zip/CPP/7zip/Crypto/Rar20Crypto.h +15 -17
  456. data/ext/p7zip/CPP/7zip/Crypto/Rar5Aes.cpp +257 -0
  457. data/ext/p7zip/CPP/7zip/Crypto/Rar5Aes.h +84 -0
  458. data/ext/p7zip/CPP/7zip/Crypto/RarAes.cpp +70 -71
  459. data/ext/p7zip/CPP/7zip/Crypto/RarAes.h +24 -19
  460. data/ext/p7zip/CPP/7zip/Crypto/Sha1Cls.h +51 -0
  461. data/ext/p7zip/CPP/7zip/Crypto/WzAes.cpp +68 -54
  462. data/ext/p7zip/CPP/7zip/Crypto/WzAes.h +37 -27
  463. data/ext/p7zip/CPP/7zip/Crypto/ZipCrypto.cpp +60 -34
  464. data/ext/p7zip/CPP/7zip/Crypto/ZipCrypto.h +28 -11
  465. data/ext/p7zip/CPP/7zip/Crypto/ZipStrong.cpp +90 -28
  466. data/ext/p7zip/CPP/7zip/Crypto/ZipStrong.h +13 -2
  467. data/ext/p7zip/CPP/7zip/Guid.txt +57 -11
  468. data/ext/p7zip/CPP/7zip/ICoder.h +202 -17
  469. data/ext/p7zip/CPP/7zip/IDecl.h +16 -3
  470. data/ext/p7zip/CPP/7zip/IPassword.h +1 -2
  471. data/ext/p7zip/CPP/7zip/IProgress.h +2 -16
  472. data/ext/p7zip/CPP/7zip/IStream.h +82 -13
  473. data/ext/p7zip/CPP/7zip/MyVersion.h +2 -11
  474. data/ext/p7zip/CPP/7zip/PropID.h +60 -9
  475. data/ext/p7zip/CPP/Common/C_FileIO.cpp +5 -1
  476. data/ext/p7zip/CPP/Common/C_FileIO.h +7 -1
  477. data/ext/p7zip/CPP/Common/CommandLineParser.cpp +122 -148
  478. data/ext/p7zip/CPP/Common/CommandLineParser.h +20 -29
  479. data/ext/p7zip/CPP/Common/Common.h +13 -0
  480. data/ext/p7zip/CPP/Common/CrcReg.cpp +98 -0
  481. data/ext/p7zip/CPP/Common/Defs.h +5 -10
  482. data/ext/p7zip/CPP/Common/DynLimBuf.cpp +93 -0
  483. data/ext/p7zip/CPP/Common/DynLimBuf.h +40 -0
  484. data/ext/p7zip/CPP/Common/DynamicBuffer.h +45 -31
  485. data/ext/p7zip/CPP/Common/IntToString.cpp +109 -40
  486. data/ext/p7zip/CPP/Common/IntToString.h +14 -9
  487. data/ext/p7zip/CPP/Common/Lang.cpp +120 -87
  488. data/ext/p7zip/CPP/Common/Lang.h +10 -15
  489. data/ext/p7zip/CPP/Common/ListFileUtils.cpp +82 -40
  490. data/ext/p7zip/CPP/Common/ListFileUtils.h +7 -4
  491. data/ext/p7zip/CPP/Common/MyBuffer.h +244 -0
  492. data/ext/p7zip/CPP/Common/MyCom.h +65 -28
  493. data/ext/p7zip/CPP/Common/MyGuidDef.h +1 -1
  494. data/ext/p7zip/CPP/Common/MyInitGuid.h +23 -0
  495. data/ext/p7zip/CPP/Common/MyLinux.h +42 -0
  496. data/ext/p7zip/CPP/Common/MyMap.cpp +8 -8
  497. data/ext/p7zip/CPP/Common/MyMap.h +2 -2
  498. data/ext/p7zip/CPP/Common/MyString.cpp +1643 -117
  499. data/ext/p7zip/CPP/Common/MyString.h +677 -486
  500. data/ext/p7zip/CPP/Common/MyTypes.h +38 -0
  501. data/ext/p7zip/CPP/Common/MyUnknown.h +4 -0
  502. data/ext/p7zip/CPP/Common/MyVector.cpp +0 -84
  503. data/ext/p7zip/CPP/Common/MyVector.h +472 -112
  504. data/ext/p7zip/CPP/Common/MyWindows.cpp +18 -1
  505. data/ext/p7zip/CPP/Common/MyWindows.h +8 -0
  506. data/ext/p7zip/CPP/Common/MyXml.cpp +169 -118
  507. data/ext/p7zip/CPP/Common/MyXml.h +14 -11
  508. data/ext/p7zip/CPP/Common/NewHandler.cpp +39 -0
  509. data/ext/p7zip/CPP/Common/NewHandler.h +55 -2
  510. data/ext/p7zip/CPP/Common/Random.h +14 -0
  511. data/ext/p7zip/CPP/Common/Sha1Reg.cpp +40 -0
  512. data/ext/p7zip/CPP/Common/Sha256Reg.cpp +40 -0
  513. data/ext/p7zip/CPP/Common/StdInStream.cpp +46 -27
  514. data/ext/p7zip/CPP/Common/StdInStream.h +11 -10
  515. data/ext/p7zip/CPP/Common/StdOutStream.cpp +48 -35
  516. data/ext/p7zip/CPP/Common/StdOutStream.h +44 -17
  517. data/ext/p7zip/CPP/Common/StringConvert.cpp +56 -17
  518. data/ext/p7zip/CPP/Common/StringConvert.h +7 -3
  519. data/ext/p7zip/CPP/Common/StringToInt.cpp +102 -48
  520. data/ext/p7zip/CPP/Common/StringToInt.h +13 -10
  521. data/ext/p7zip/CPP/Common/TextConfig.cpp +33 -47
  522. data/ext/p7zip/CPP/Common/TextConfig.h +3 -6
  523. data/ext/p7zip/CPP/Common/UTFConvert.cpp +218 -75
  524. data/ext/p7zip/CPP/Common/UTFConvert.h +4 -3
  525. data/ext/p7zip/CPP/Common/Wildcard.cpp +345 -125
  526. data/ext/p7zip/CPP/Common/Wildcard.h +82 -13
  527. data/ext/p7zip/CPP/Common/XzCrc64Reg.cpp +42 -0
  528. data/ext/p7zip/CPP/Windows/FileDir.cpp +427 -475
  529. data/ext/p7zip/CPP/Windows/FileDir.h +94 -72
  530. data/ext/p7zip/CPP/Windows/FileFind.cpp +235 -244
  531. data/ext/p7zip/CPP/Windows/FileFind.h +63 -59
  532. data/ext/p7zip/CPP/Windows/FileIO.cpp +29 -46
  533. data/ext/p7zip/CPP/Windows/FileIO.h +40 -42
  534. data/ext/p7zip/CPP/Windows/FileName.cpp +696 -17
  535. data/ext/p7zip/CPP/Windows/FileName.h +11 -3
  536. data/ext/p7zip/CPP/Windows/NtCheck.h +2 -0
  537. data/ext/p7zip/CPP/Windows/PropVariant.cpp +134 -30
  538. data/ext/p7zip/CPP/Windows/PropVariant.h +80 -24
  539. data/ext/p7zip/CPP/Windows/PropVariantUtils.cpp +89 -18
  540. data/ext/p7zip/CPP/Windows/PropVariantUtils.h +12 -7
  541. data/ext/p7zip/CPP/Windows/System.cpp +20 -15
  542. data/ext/p7zip/CPP/Windows/System.h +3 -2
  543. data/ext/p7zip/CPP/Windows/TimeUtils.cpp +203 -0
  544. data/ext/p7zip/CPP/Windows/TimeUtils.h +24 -0
  545. data/ext/p7zip/CPP/include_windows/basetyps.h +4 -4
  546. data/ext/p7zip/CPP/include_windows/windows.h +17 -11
  547. data/ext/p7zip/CPP/myWindows/StdAfx.h +97 -5
  548. data/ext/p7zip/CPP/myWindows/config.h +20 -5
  549. data/ext/p7zip/CPP/myWindows/myPrivate.h +8 -0
  550. data/ext/p7zip/CPP/myWindows/wine_date_and_time.cpp +34 -0
  551. data/ext/p7zip/ChangeLog +283 -35
  552. data/ext/p7zip/{DOCS → DOC}/7zC.txt +6 -13
  553. data/ext/p7zip/{DOCS → DOC}/License.txt +3 -2
  554. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/add.htm +93 -87
  555. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/bench.htm +88 -79
  556. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/delete.htm +62 -59
  557. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/extract.htm +96 -91
  558. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/extract_full.htm +73 -68
  559. data/ext/p7zip/DOC/MANUAL/cmdline/commands/hash.htm +65 -0
  560. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/index.htm +36 -33
  561. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/list.htm +78 -77
  562. data/ext/p7zip/DOC/MANUAL/cmdline/commands/rename.htm +51 -0
  563. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/style.css +232 -232
  564. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/test.htm +47 -46
  565. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/update.htm +71 -66
  566. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/exit_codes.htm +27 -27
  567. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/index.htm +29 -29
  568. data/ext/p7zip/{DOCS/MANUAL/switches → DOC/MANUAL/cmdline}/style.css +232 -232
  569. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_exclude.htm +56 -56
  570. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_include.htm +80 -83
  571. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_no.htm +52 -52
  572. data/ext/p7zip/DOC/MANUAL/cmdline/switches/bb.htm +61 -0
  573. data/ext/p7zip/DOC/MANUAL/cmdline/switches/bs.htm +67 -0
  574. data/ext/p7zip/DOC/MANUAL/cmdline/switches/charset.htm +61 -0
  575. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/exclude.htm +71 -60
  576. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/include.htm +89 -87
  577. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/index.htm +95 -64
  578. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/large_pages.htm +59 -50
  579. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/list_tech.htm +36 -36
  580. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/method.htm +738 -625
  581. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/output_dir.htm +53 -53
  582. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/overwrite.htm +56 -56
  583. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/password.htm +55 -54
  584. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/recurse.htm +85 -83
  585. data/ext/p7zip/DOC/MANUAL/cmdline/switches/sa.htm +58 -0
  586. data/ext/p7zip/DOC/MANUAL/cmdline/switches/scc.htm +42 -0
  587. data/ext/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm +53 -0
  588. data/ext/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm +39 -0
  589. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/sfx.htm +153 -156
  590. data/ext/p7zip/DOC/MANUAL/cmdline/switches/shared.htm +40 -0
  591. data/ext/p7zip/DOC/MANUAL/cmdline/switches/sni.htm +56 -0
  592. data/ext/p7zip/DOC/MANUAL/cmdline/switches/sns.htm +77 -0
  593. data/ext/p7zip/DOC/MANUAL/cmdline/switches/spf.htm +80 -0
  594. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ssc.htm +50 -50
  595. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stdin.htm +56 -55
  596. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stdout.htm +54 -50
  597. data/ext/p7zip/DOC/MANUAL/cmdline/switches/stl.htm +39 -0
  598. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stop_switch.htm +31 -31
  599. data/ext/p7zip/DOC/MANUAL/cmdline/switches/stx.htm +50 -0
  600. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline/switches}/style.css +232 -232
  601. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/type.htm +121 -83
  602. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/update.htm +177 -176
  603. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/volume.htm +49 -49
  604. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/working_dir.htm +56 -55
  605. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/yes.htm +48 -48
  606. data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/syntax.htm +120 -120
  607. data/ext/p7zip/DOC/MANUAL/fm/about.htm +21 -0
  608. data/ext/p7zip/DOC/MANUAL/fm/benchmark.htm +56 -0
  609. data/ext/p7zip/DOC/MANUAL/fm/index.htm +54 -0
  610. data/ext/p7zip/DOC/MANUAL/fm/menu.htm +154 -0
  611. data/ext/p7zip/DOC/MANUAL/fm/options.htm +152 -0
  612. data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm +311 -0
  613. data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm +78 -0
  614. data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm +63 -0
  615. data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css +232 -0
  616. data/ext/p7zip/DOC/MANUAL/fm/plugins/index.htm +22 -0
  617. data/ext/p7zip/DOC/MANUAL/fm/plugins/style.css +232 -0
  618. data/ext/p7zip/DOC/MANUAL/fm/style.css +232 -0
  619. data/ext/p7zip/DOC/MANUAL/general/7z.htm +117 -0
  620. data/ext/p7zip/DOC/MANUAL/general/faq.htm +125 -0
  621. data/ext/p7zip/DOC/MANUAL/general/formats.htm +100 -0
  622. data/ext/p7zip/DOC/MANUAL/general/index.htm +27 -0
  623. data/ext/p7zip/DOC/MANUAL/general/license.htm +30 -0
  624. data/ext/p7zip/DOC/MANUAL/general/performance.htm +98 -0
  625. data/ext/p7zip/DOC/MANUAL/general/style.css +232 -0
  626. data/ext/p7zip/DOC/MANUAL/general/thanks.htm +43 -0
  627. data/ext/p7zip/DOC/MANUAL/start.htm +37 -0
  628. data/ext/p7zip/DOC/MANUAL/style.css +232 -0
  629. data/ext/p7zip/DOC/Methods.txt +158 -0
  630. data/ext/p7zip/{DOCS → DOC}/copying.txt +9 -11
  631. data/ext/p7zip/DOC/lzma.txt +328 -0
  632. data/ext/p7zip/{DOCS → DOC}/readme.txt +42 -65
  633. data/ext/p7zip/{DOCS/history.txt → DOC/src-history.txt} +88 -2
  634. data/ext/p7zip/README +117 -91
  635. data/ext/p7zip/TODO +0 -2
  636. data/ext/p7zip/install.sh +31 -29
  637. data/ext/p7zip/last_error +1 -0
  638. data/ext/p7zip/makefile +29 -125
  639. data/ext/p7zip/makefile.afl +23 -0
  640. data/ext/p7zip/makefile.aix_gcc +5 -4
  641. data/ext/p7zip/makefile.android_arm +49 -0
  642. data/ext/p7zip/makefile.beos +5 -4
  643. data/ext/p7zip/makefile.common +150 -0
  644. data/ext/p7zip/makefile.crc32 +3 -3
  645. data/ext/p7zip/makefile.cygwin +5 -4
  646. data/ext/p7zip/makefile.cygwin64 +21 -0
  647. data/ext/p7zip/makefile.cygwin64_asm +22 -0
  648. data/ext/p7zip/makefile.cygwin_asm +6 -4
  649. data/ext/p7zip/makefile.cygwin_clang +21 -0
  650. data/ext/p7zip/makefile.cygwin_clang_asm +23 -0
  651. data/ext/p7zip/{makefile.djgpp_old → makefile.djgpp} +5 -4
  652. data/ext/p7zip/makefile.djgpp_watt +7 -5
  653. data/ext/p7zip/makefile.freebsd5 +5 -4
  654. data/ext/p7zip/{makefile.freebsd6 → makefile.freebsd6+} +6 -5
  655. data/ext/p7zip/makefile.glb +27 -18
  656. data/ext/p7zip/makefile.gprof +3 -2
  657. data/ext/p7zip/makefile.haiku +19 -0
  658. data/ext/p7zip/makefile.hpux-acc +3 -2
  659. data/ext/p7zip/makefile.hpux-acc_64 +3 -2
  660. data/ext/p7zip/makefile.hpux-gcc +5 -4
  661. data/ext/p7zip/makefile.linux_amd64 +5 -4
  662. data/ext/p7zip/makefile.linux_amd64_asm +12 -5
  663. data/ext/p7zip/makefile.linux_amd64_asm_icc +5 -3
  664. data/ext/p7zip/makefile.linux_amd64_sanitizer +26 -0
  665. data/ext/p7zip/makefile.linux_any_cpu +5 -4
  666. data/ext/p7zip/makefile.linux_any_cpu_gcc_4.X +7 -4
  667. data/ext/p7zip/makefile.linux_clang_amd64_asm +25 -0
  668. data/ext/p7zip/makefile.linux_clang_amd64_asm_sanitize +27 -0
  669. data/ext/p7zip/makefile.linux_cross_aarch64 +25 -0
  670. data/ext/p7zip/makefile.linux_cross_arm +7 -4
  671. data/ext/p7zip/makefile.linux_cross_djgpp +27 -0
  672. data/ext/p7zip/makefile.linux_cross_m68k +26 -0
  673. data/ext/p7zip/makefile.linux_cross_mipsel +27 -0
  674. data/ext/p7zip/makefile.linux_cross_ppc +25 -0
  675. data/ext/p7zip/makefile.linux_cross_ppc64 +25 -0
  676. data/ext/p7zip/makefile.linux_cross_ppc64le +25 -0
  677. data/ext/p7zip/makefile.linux_cross_s390x +25 -0
  678. data/ext/p7zip/makefile.linux_cross_sparc64 +25 -0
  679. data/ext/p7zip/makefile.linux_gcc6_sanitize +23 -0
  680. data/ext/p7zip/makefile.linux_gcc_2.95_no_need_for_libstdc +6 -4
  681. data/ext/p7zip/makefile.linux_other +6 -5
  682. data/ext/p7zip/makefile.linux_s390x +5 -4
  683. data/ext/p7zip/{makefile.machine_base → makefile.linux_scan-build} +5 -4
  684. data/ext/p7zip/makefile.linux_valgrind +25 -0
  685. data/ext/p7zip/{makefile.linux_clang_amd64 → makefile.linux_x32} +6 -5
  686. data/ext/p7zip/makefile.linux_x86_asm_gcc_4.X +10 -5
  687. data/ext/p7zip/makefile.linux_x86_asm_gcc_4.X_fltk +8 -4
  688. data/ext/p7zip/makefile.linux_x86_asm_gcc_mudflap_4.X +4 -2
  689. data/ext/p7zip/makefile.linux_x86_asm_icc +4 -2
  690. data/ext/p7zip/makefile.linux_x86_icc +3 -2
  691. data/ext/p7zip/makefile.macosx_arm64 +17 -0
  692. data/ext/p7zip/{makefile.macosx_32bits → makefile.macosx_gcc_32bits} +3 -2
  693. data/ext/p7zip/{makefile.macosx_32bits_asm → makefile.macosx_gcc_32bits_asm} +5 -3
  694. data/ext/p7zip/{makefile.macosx_32bits_ppc → makefile.macosx_gcc_32bits_ppc} +3 -2
  695. data/ext/p7zip/{makefile.macosx_64bits → makefile.macosx_gcc_64bits} +3 -2
  696. data/ext/p7zip/makefile.macosx_llvm_64bits +9 -3
  697. data/ext/p7zip/makefile.netbsd +5 -4
  698. data/ext/p7zip/makefile.netware_asm_gcc_3.X +6 -4
  699. data/ext/p7zip/makefile.oldmake +41 -130
  700. data/ext/p7zip/makefile.openbsd +7 -3
  701. data/ext/p7zip/makefile.openbsd_no_port +9 -5
  702. data/ext/p7zip/makefile.qnx_shared.bin +5 -4
  703. data/ext/p7zip/makefile.qnx_static +5 -4
  704. data/ext/p7zip/makefile.solaris_sparc_CC_32 +5 -4
  705. data/ext/p7zip/makefile.solaris_sparc_CC_64 +6 -4
  706. data/ext/p7zip/makefile.solaris_sparc_gcc +7 -6
  707. data/ext/p7zip/makefile.solaris_x86 +5 -4
  708. data/ext/p7zip/makefile.tru64 +5 -4
  709. data/ext/seven_zip_ruby/extconf.rb +92 -6
  710. data/ext/seven_zip_ruby/seven_zip_archive.cpp +40 -17
  711. data/ext/seven_zip_ruby/seven_zip_archive.h +1 -1
  712. data/ext/seven_zip_ruby/utils.cpp +267 -124
  713. data/ext/seven_zip_ruby/utils.h +2 -0
  714. data/lib/seven_zip_ruby/7z.dll +0 -0
  715. data/lib/seven_zip_ruby/7z.sfx +0 -0
  716. data/lib/seven_zip_ruby/7z64.dll +0 -0
  717. data/lib/seven_zip_ruby/7zCon.sfx +0 -0
  718. data/lib/seven_zip_ruby/seven_zip_reader.rb +16 -1
  719. data/lib/seven_zip_ruby/version.rb +1 -1
  720. data/p7zip/.gitignore +7 -0
  721. data/p7zip/README.txt +29 -0
  722. data/p7zip/extract.sh +134 -0
  723. data/spec/seven_zip_ruby_spec.rb +22 -13
  724. data/test/res/The Flying Spaghetti Monster.txt +3 -0
  725. data/test/res/The Three Little Pigs.txt +5 -0
  726. data/test/res/UTF_content.txt +3 -0
  727. data/test/res/test_reader_data.7z +0 -0
  728. data/test/res/test_reader_filename_cp932.7z +0 -0
  729. data/test/res/test_reader_files.7z +0 -0
  730. data/test/test_seven_zip_reader.rb +187 -0
  731. data/test/test_seven_zip_writer.rb +184 -0
  732. metadata +267 -219
  733. data/.github/workflows/test-and-release.yml +0 -43
  734. data/ext/C/Types.h +0 -254
  735. data/ext/CPP/7zip/Archive/IArchive.h +0 -234
  736. data/ext/CPP/7zip/IDecl.h +0 -15
  737. data/ext/CPP/7zip/IPassword.h +0 -24
  738. data/ext/CPP/7zip/IProgress.h +0 -33
  739. data/ext/CPP/7zip/IStream.h +0 -58
  740. data/ext/CPP/7zip/PropID.h +0 -76
  741. data/ext/CPP/Common/MyCom.h +0 -225
  742. data/ext/CPP/Common/MyGuidDef.h +0 -54
  743. data/ext/CPP/Common/MyInitGuid.h +0 -22
  744. data/ext/CPP/Common/MyUnknown.h +0 -13
  745. data/ext/CPP/Common/MyWindows.h +0 -204
  746. data/ext/CPP/Common/Types.h +0 -11
  747. data/ext/CPP/Windows/PropVariant.h +0 -56
  748. data/ext/CPP/include_windows/basetyps.h +0 -19
  749. data/ext/CPP/include_windows/tchar.h +0 -89
  750. data/ext/CPP/include_windows/windows.h +0 -194
  751. data/ext/p7zip/Asm/x64/7zCrcT8U.asm +0 -103
  752. data/ext/p7zip/Asm/x86/7zCrcT8U.asm +0 -101
  753. data/ext/p7zip/C/7zCrcT8.c +0 -43
  754. data/ext/p7zip/C/Alloc.back3 +0 -238
  755. data/ext/p7zip/C/Alloc.c.back +0 -243
  756. data/ext/p7zip/C/Alloc.c.back2 +0 -222
  757. data/ext/p7zip/C/LzmaUtil/Lzma86Dec.h +0 -51
  758. data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderOutStream.cpp +0 -149
  759. data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderOutStream.h +0 -58
  760. data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHeader.cpp +0 -24
  761. data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHeader.h +0 -28
  762. data/ext/p7zip/CPP/7zip/Archive/Chm/ChmRegister.cpp +0 -13
  763. data/ext/p7zip/CPP/7zip/Archive/Com/ComHandler.cpp +0 -239
  764. data/ext/p7zip/CPP/7zip/Archive/Com/ComHandler.h +0 -28
  765. data/ext/p7zip/CPP/7zip/Archive/Com/ComIn.cpp +0 -389
  766. data/ext/p7zip/CPP/7zip/Archive/Com/ComIn.h +0 -119
  767. data/ext/p7zip/CPP/7zip/Archive/Com/ComRegister.cpp +0 -13
  768. data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2MT.cpp +0 -240
  769. data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2MT.h +0 -80
  770. data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2ST.cpp +0 -239
  771. data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2ST.h +0 -88
  772. data/ext/p7zip/CPP/7zip/Archive/Common/CrossThreadProgress.cpp +0 -15
  773. data/ext/p7zip/CPP/7zip/Archive/Common/CrossThreadProgress.h +0 -37
  774. data/ext/p7zip/CPP/7zip/Archive/DebHandler.cpp +0 -413
  775. data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsHandler.cpp +0 -243
  776. data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsHandler.h +0 -26
  777. data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsIn.cpp +0 -480
  778. data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsIn.h +0 -154
  779. data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsRegister.cpp +0 -13
  780. data/ext/p7zip/CPP/7zip/Archive/Rar/RarHeader.cpp +0 -21
  781. data/ext/p7zip/CPP/7zip/Archive/Rar/RarIn.cpp +0 -478
  782. data/ext/p7zip/CPP/7zip/Archive/Rar/RarIn.h +0 -123
  783. data/ext/p7zip/CPP/7zip/Archive/Rar/RarItem.cpp +0 -55
  784. data/ext/p7zip/CPP/7zip/Archive/Rar/RarRegister.cpp +0 -13
  785. data/ext/p7zip/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp +0 -78
  786. data/ext/p7zip/CPP/7zip/Archive/Rar/RarVolumeInStream.h +0 -49
  787. data/ext/p7zip/CPP/7zip/Archive/Udf/UdfRegister.cpp +0 -13
  788. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHeader.cpp +0 -36
  789. data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItemEx.h +0 -34
  790. data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7zFM.txt +0 -163
  791. data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7zG.txt +0 -131
  792. data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7za.txt +0 -253
  793. data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_ALL.txt +0 -32
  794. data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_Format7zFree.txt +0 -290
  795. data/ext/p7zip/CPP/7zip/CMAKE/generate.sh +0 -37
  796. data/ext/p7zip/CPP/7zip/CMAKE/generate_xcode.sh +0 -32
  797. data/ext/p7zip/CPP/7zip/Common/LockedStream.cpp +0 -23
  798. data/ext/p7zip/CPP/7zip/Common/LockedStream.h +0 -38
  799. data/ext/p7zip/CPP/7zip/Compress/ArjDecoder1.cpp +0 -309
  800. data/ext/p7zip/CPP/7zip/Compress/ArjDecoder1.h +0 -98
  801. data/ext/p7zip/CPP/7zip/Compress/ArjDecoder2.cpp +0 -90
  802. data/ext/p7zip/CPP/7zip/Compress/ArjDecoder2.h +0 -59
  803. data/ext/p7zip/CPP/7zip/Compress/BranchCoder.cpp +0 -19
  804. data/ext/p7zip/CPP/7zip/Compress/BranchCoder.h +0 -44
  805. data/ext/p7zip/CPP/7zip/Compress/DllExports.cpp +0 -39
  806. data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp +0 -531
  807. data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp +0 -1018
  808. data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h +0 -48
  809. data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp +0 -311
  810. data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h +0 -20
  811. data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/makefile +0 -173
  812. data/ext/p7zip/CPP/7zip/Compress/Lzx86Converter.cpp +0 -90
  813. data/ext/p7zip/CPP/7zip/Compress/Lzx86Converter.h +0 -46
  814. data/ext/p7zip/CPP/7zip/Compress/RangeCoder.h +0 -205
  815. data/ext/p7zip/CPP/7zip/Compress/RangeCoderBit.h +0 -114
  816. data/ext/p7zip/CPP/7zip/Crypto/Sha1.cpp +0 -229
  817. data/ext/p7zip/CPP/7zip/Crypto/Sha1.h +0 -68
  818. data/ext/p7zip/CPP/7zip/PREMAKE/generate.sh +0 -18
  819. data/ext/p7zip/CPP/7zip/PREMAKE/premake4.lua +0 -263
  820. data/ext/p7zip/CPP/7zip/QMAKE/7ZA/7ZA.pro +0 -228
  821. data/ext/p7zip/CPP/7zip/QMAKE/7ZA/7ZA_osx.pro +0 -228
  822. data/ext/p7zip/CPP/7zip/QMAKE/test_emul/test_emul.pro +0 -26
  823. data/ext/p7zip/CPP/7zip/TEST/TestUI/TestUI.cpp +0 -560
  824. data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile +0 -33
  825. data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile.depend +0 -577
  826. data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile.list +0 -16
  827. data/ext/p7zip/CPP/Common/Buffer.h +0 -77
  828. data/ext/p7zip/CPP/Common/Types.h +0 -11
  829. data/ext/p7zip/CPP/Windows/COM.cpp +0 -37
  830. data/ext/p7zip/CPP/Windows/COM.h +0 -69
  831. data/ext/p7zip/CPP/Windows/Clipboard.cpp +0 -160
  832. data/ext/p7zip/CPP/Windows/Clipboard.h +0 -28
  833. data/ext/p7zip/CPP/Windows/CommonDialog.h +0 -19
  834. data/ext/p7zip/CPP/Windows/Control/ComboBox.h +0 -82
  835. data/ext/p7zip/CPP/Windows/Control/Controls.cpp +0 -515
  836. data/ext/p7zip/CPP/Windows/Control/Dialog.cpp +0 -560
  837. data/ext/p7zip/CPP/Windows/Control/Dialog.h +0 -179
  838. data/ext/p7zip/CPP/Windows/Control/DialogImpl.h +0 -73
  839. data/ext/p7zip/CPP/Windows/Control/Edit.h +0 -24
  840. data/ext/p7zip/CPP/Windows/Control/ListView.h +0 -164
  841. data/ext/p7zip/CPP/Windows/Control/ProgressBar.h +0 -34
  842. data/ext/p7zip/CPP/Windows/Control/Static.h +0 -23
  843. data/ext/p7zip/CPP/Windows/Control/StatusBar.h +0 -56
  844. data/ext/p7zip/CPP/Windows/Control/Window2.cpp +0 -211
  845. data/ext/p7zip/CPP/Windows/Control/Window2.h +0 -111
  846. data/ext/p7zip/CPP/Windows/DLL.cpp +0 -193
  847. data/ext/p7zip/CPP/Windows/DLL.h +0 -48
  848. data/ext/p7zip/CPP/Windows/Error.cpp +0 -58
  849. data/ext/p7zip/CPP/Windows/Error.h +0 -33
  850. data/ext/p7zip/CPP/Windows/Menu.h +0 -4
  851. data/ext/p7zip/CPP/Windows/PropVariantConversions.cpp +0 -142
  852. data/ext/p7zip/CPP/Windows/PropVariantConversions.h +0 -14
  853. data/ext/p7zip/CPP/Windows/Registry.cpp +0 -313
  854. data/ext/p7zip/CPP/Windows/Registry.h +0 -113
  855. data/ext/p7zip/CPP/Windows/ResourceString.h +0 -22
  856. data/ext/p7zip/CPP/Windows/Shell.h +0 -21
  857. data/ext/p7zip/CPP/Windows/Time.cpp +0 -88
  858. data/ext/p7zip/CPP/Windows/Time.h +0 -21
  859. data/ext/p7zip/CPP/Windows/Window.cpp +0 -101
  860. data/ext/p7zip/CPP/Windows/Window.h +0 -43
  861. data/ext/p7zip/CPP/myWindows/initguid.h +0 -4
  862. data/ext/p7zip/CPP/myWindows/makefile +0 -21
  863. data/ext/p7zip/CPP/myWindows/makefile.depend +0 -32
  864. data/ext/p7zip/CPP/myWindows/makefile.list +0 -28
  865. data/ext/p7zip/CPP/myWindows/myAddExeFlag.cpp +0 -20
  866. data/ext/p7zip/CPP/myWindows/myGetTickCount.cpp +0 -8
  867. data/ext/p7zip/CPP/myWindows/mySplitCommandLine.cpp +0 -82
  868. data/ext/p7zip/CPP/myWindows/test_emul.cpp +0 -745
  869. data/ext/p7zip/CPP/myWindows/wine_GetXXXDefaultLangID.cpp +0 -741
  870. data/ext/p7zip/DOCS/MANUAL/switches/charset.htm +0 -49
  871. data/ext/p7zip/DOCS/Methods.txt +0 -152
  872. data/ext/p7zip/DOCS/lzma.txt +0 -598
  873. data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/ChangeLog +0 -41
  874. data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/readme +0 -21
  875. data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/readme.u7z +0 -30
  876. data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/u7z +0 -133
  877. data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/README +0 -21
  878. data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/check/check.sh +0 -117
  879. data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/check/files.tar +0 -0
  880. data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 +0 -33
  881. data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/p7zip +0 -144
  882. data/ext/p7zip/contrib/qnx630sp3/qnx630sp3-shared +0 -14
  883. data/ext/p7zip/contrib/qnx630sp3/qnx630sp3-static +0 -10
  884. data/ext/p7zip/integration_context_menu.txt +0 -51
  885. data/ext/p7zip/makefile.rules +0 -661
  886. /data/ext/p7zip/{DOCS → DOC}/7zFormat.txt +0 -0
  887. /data/ext/p7zip/{DOCS → DOC}/unRarLicense.txt +0 -0
@@ -0,0 +1,1518 @@
1
+ // VmdkHandler.cpp
2
+
3
+ #include "StdAfx.h"
4
+
5
+ // #include <stdio.h>
6
+
7
+ #include "../../../C/CpuArch.h"
8
+
9
+ #include "../../Common/ComTry.h"
10
+ #include "../../Common/IntToString.h"
11
+ #include "../../Common/StringConvert.h"
12
+ #include "../../Common/StringToInt.h"
13
+ #include "../../Common/UTFConvert.h"
14
+
15
+ #include "../../Windows/PropVariant.h"
16
+
17
+ #include "../Common/RegisterArc.h"
18
+ #include "../Common/StreamObjects.h"
19
+ #include "../Common/StreamUtils.h"
20
+
21
+ #include "../Compress/ZlibDecoder.h"
22
+
23
+ #include "HandlerCont.h"
24
+
25
+ using namespace NWindows;
26
+
27
+ namespace NArchive {
28
+ namespace NVmdk {
29
+
30
+ #define Get16(p) GetUi16(p)
31
+ #define Get32(p) GetUi32(p)
32
+ #define Get64(p) GetUi64(p)
33
+
34
+ #define LE_16(offs, dest) dest = Get16(p + (offs));
35
+ #define LE_32(offs, dest) dest = Get32(p + (offs));
36
+ #define LE_64(offs, dest) dest = Get64(p + (offs));
37
+
38
+
39
+ #define SIGNATURE { 'K', 'D', 'M', 'V' }
40
+
41
+ static const Byte k_Signature[] = SIGNATURE;
42
+
43
+ static const UInt32 k_Flags_NL = (UInt32)1 << 0;
44
+ static const UInt32 k_Flags_RGD = (UInt32)1 << 1;
45
+ static const UInt32 k_Flags_ZeroGrain = (UInt32)1 << 2;
46
+ static const UInt32 k_Flags_Compressed = (UInt32)1 << 16;
47
+ static const UInt32 k_Flags_Marker = (UInt32)1 << 17;
48
+
49
+ static const unsigned k_NumMidBits = 9; // num bits for index in Grain Table
50
+
51
+ struct CHeader
52
+ {
53
+ UInt32 flags;
54
+ UInt32 version;
55
+
56
+ UInt64 capacity;
57
+ UInt64 grainSize;
58
+ UInt64 descriptorOffset;
59
+ UInt64 descriptorSize;
60
+
61
+ UInt32 numGTEsPerGT;
62
+ UInt16 algo;
63
+ // Byte uncleanShutdown;
64
+ // UInt64 rgdOffset;
65
+ UInt64 gdOffset;
66
+ UInt64 overHead;
67
+
68
+ bool Is_NL() const { return (flags & k_Flags_NL) != 0; };
69
+ bool Is_ZeroGrain() const { return (flags & k_Flags_ZeroGrain) != 0; };
70
+ bool Is_Compressed() const { return (flags & k_Flags_Compressed) != 0; };
71
+ bool Is_Marker() const { return (flags & k_Flags_Marker) != 0; };
72
+
73
+ bool Parse(const Byte *p);
74
+
75
+ bool IsSameImageFor(const CHeader &h) const
76
+ {
77
+ return flags == h.flags
78
+ && version == h.version
79
+ && capacity == h.capacity
80
+ && grainSize == h.grainSize
81
+ && algo == h.algo;
82
+ }
83
+ };
84
+
85
+ bool CHeader::Parse(const Byte *p)
86
+ {
87
+ if (memcmp(p, k_Signature, sizeof(k_Signature)) != 0)
88
+ return false;
89
+
90
+ LE_32 (0x04, version);
91
+ LE_32 (0x08, flags);
92
+ LE_64 (0x0C, capacity);
93
+ LE_64 (0x14, grainSize);
94
+ LE_64 (0x1C, descriptorOffset);
95
+ LE_64 (0x24, descriptorSize);
96
+ LE_32 (0x2C, numGTEsPerGT);
97
+ // LE_64 (0x30, rgdOffset);
98
+ LE_64 (0x38, gdOffset);
99
+ LE_64 (0x40, overHead);
100
+ // uncleanShutdown = buf[0x48];
101
+ LE_16(0x4D, algo);
102
+
103
+ if (Is_NL() && Get32(p + 0x49) != 0x0A0D200A) // do we need Is_NL() check here?
104
+ return false;
105
+
106
+ return (numGTEsPerGT == (1 << k_NumMidBits)) && (version <= 3);
107
+ }
108
+
109
+
110
+ enum
111
+ {
112
+ k_Marker_END_OF_STREAM = 0,
113
+ k_Marker_GRAIN_TABLE = 1,
114
+ k_Marker_GRAIN_DIR = 2,
115
+ k_Marker_FOOTER = 3
116
+ };
117
+
118
+ struct CMarker
119
+ {
120
+ UInt64 NumSectors;
121
+ UInt32 SpecSize; // = 0 for metadata sectors
122
+ UInt32 Type;
123
+
124
+ void Parse(const Byte *p)
125
+ {
126
+ LE_64 (0, NumSectors);
127
+ LE_32 (8, SpecSize);
128
+ LE_32 (12, Type);
129
+ }
130
+ };
131
+
132
+
133
+ static bool Str_to_ValName(const AString &s, AString &name, AString &val)
134
+ {
135
+ name.Empty();
136
+ val.Empty();
137
+ int qu = s.Find('"');
138
+ int eq = s.Find('=');
139
+ if (eq < 0 || (qu >= 0 && eq > qu))
140
+ return false;
141
+ name = s.Left(eq);
142
+ name.Trim();
143
+ val = s.Ptr(eq + 1);
144
+ val.Trim();
145
+ return true;
146
+ }
147
+
148
+ static inline bool IsSpaceChar(char c)
149
+ {
150
+ return (c == ' ' || c == '\t');
151
+ }
152
+
153
+ static const char *SkipSpaces(const char *s)
154
+ {
155
+ for (;; s++)
156
+ {
157
+ char c = *s;
158
+ if (c == 0 || !IsSpaceChar(c))
159
+ return s;
160
+ }
161
+ }
162
+
163
+ #define SKIP_SPACES(s) s = SkipSpaces(s);
164
+
165
+ static const char *GetNextWord(const char *s, AString &dest)
166
+ {
167
+ dest.Empty();
168
+ SKIP_SPACES(s);
169
+ const char *start = s;
170
+ for (;; s++)
171
+ {
172
+ char c = *s;
173
+ if (c == 0 || IsSpaceChar(c))
174
+ {
175
+ dest.SetFrom(start, (unsigned)(s - start));
176
+ return s;
177
+ }
178
+ }
179
+ }
180
+
181
+ static const char *GetNextNumber(const char *s, UInt64 &val)
182
+ {
183
+ SKIP_SPACES(s);
184
+ if (*s == 0)
185
+ return s;
186
+ const char *end;
187
+ val = ConvertStringToUInt64(s, &end);
188
+ char c = *end;
189
+ if (c != 0 && !IsSpaceChar(c))
190
+ return NULL;
191
+ return end;
192
+ }
193
+
194
+
195
+ struct CExtentInfo
196
+ {
197
+ AString Access; // RW, RDONLY, or NOACCESS
198
+ UInt64 NumSectors; // 512 bytes sectors
199
+ AString Type; // FLAT, SPARSE, ZERO, VMFS, VMFSSPARSE, VMFSRDM, VMFSRAW
200
+ AString FileName;
201
+ UInt64 StartSector; // used for FLAT
202
+
203
+ // for VMWare Player 9:
204
+ // PartitionUUID
205
+ // DeviceIdentifier
206
+
207
+ bool IsType_ZERO() const { return Type == "ZERO"; }
208
+ // bool IsType_FLAT() const { return Type == "FLAT"; }
209
+ bool IsType_Flat() const { return Type == "FLAT" || Type == "VMFS" || Type == "VMFSRAW"; }
210
+
211
+ bool Parse(const char *s);
212
+ };
213
+
214
+ bool CExtentInfo::Parse(const char *s)
215
+ {
216
+ NumSectors = 0;
217
+ StartSector = 0;
218
+ Access.Empty();
219
+ Type.Empty();
220
+ FileName.Empty();
221
+
222
+ s = GetNextWord(s, Access);
223
+ s = GetNextNumber(s, NumSectors);
224
+ if (!s)
225
+ return false;
226
+ s = GetNextWord(s, Type);
227
+
228
+ if (Type.IsEmpty())
229
+ return false;
230
+
231
+ SKIP_SPACES(s);
232
+
233
+ if (IsType_ZERO())
234
+ return (*s == 0);
235
+
236
+ if (*s != '\"')
237
+ return false;
238
+ s++;
239
+ {
240
+ const char *s2 = strchr(s, '\"');
241
+ if (!s2)
242
+ return false;
243
+ FileName.SetFrom(s, (unsigned)(s2 - s));
244
+ s = s2 + 1;
245
+ }
246
+ SKIP_SPACES(s);
247
+ if (*s == 0)
248
+ return true;
249
+
250
+ s = GetNextNumber(s, StartSector);
251
+ if (!s)
252
+ return false;
253
+ return true;
254
+ // SKIP_SPACES(s);
255
+ // return (*s == 0);
256
+ }
257
+
258
+
259
+ struct CDescriptor
260
+ {
261
+ AString CID;
262
+ AString parentCID;
263
+ AString createType;
264
+ // AString encoding; // UTF-8, windows-1252 - default is UTF-8
265
+
266
+ CObjectVector<CExtentInfo> Extents;
267
+
268
+ static void GetUnicodeName(const AString &s, UString &res)
269
+ {
270
+ if (!ConvertUTF8ToUnicode(s, res))
271
+ MultiByteToUnicodeString2(res, s);
272
+ }
273
+
274
+ void Clear()
275
+ {
276
+ CID.Empty();
277
+ parentCID.Empty();
278
+ createType.Empty();
279
+ Extents.Clear();
280
+ }
281
+
282
+ bool IsThere_Parent() const
283
+ {
284
+ return !parentCID.IsEmpty() && !parentCID.IsEqualTo_Ascii_NoCase("ffffffff");
285
+ }
286
+
287
+ bool Parse(const Byte *p, size_t size);
288
+ };
289
+
290
+
291
+ bool CDescriptor::Parse(const Byte *p, size_t size)
292
+ {
293
+ Clear();
294
+
295
+ AString s;
296
+ AString name;
297
+ AString val;
298
+
299
+ for (size_t i = 0;; i++)
300
+ {
301
+ const char c = p[i];
302
+ if (i == size || c == 0 || c == 0xA || c == 0xD)
303
+ {
304
+ if (!s.IsEmpty() && s[0] != '#')
305
+ {
306
+ if (Str_to_ValName(s, name, val))
307
+ {
308
+ if (name.IsEqualTo_Ascii_NoCase("CID"))
309
+ CID = val;
310
+ else if (name.IsEqualTo_Ascii_NoCase("parentCID"))
311
+ parentCID = val;
312
+ else if (name.IsEqualTo_Ascii_NoCase("createType"))
313
+ createType = val;
314
+ }
315
+ else
316
+ {
317
+ CExtentInfo ei;
318
+ if (!ei.Parse(s))
319
+ return false;
320
+ Extents.Add(ei);
321
+ }
322
+ }
323
+
324
+ s.Empty();
325
+ if (c == 0 || i >= size)
326
+ break;
327
+ }
328
+ else
329
+ s += (char)c;
330
+ }
331
+
332
+ return true;
333
+ }
334
+
335
+
336
+ struct CExtent
337
+ {
338
+ bool IsOK;
339
+ bool IsArc;
340
+ bool NeedDeflate;
341
+ bool Unsupported;
342
+ bool IsZero;
343
+ bool IsFlat;
344
+ bool DescriptorOK;
345
+ bool HeadersError;
346
+
347
+ unsigned ClusterBits;
348
+ UInt32 ZeroSector;
349
+
350
+ CObjectVector<CByteBuffer> Tables;
351
+
352
+ CMyComPtr<IInStream> Stream;
353
+ UInt64 PosInArc;
354
+
355
+ UInt64 PhySize;
356
+ UInt64 VirtSize; // from vmdk header of volume
357
+
358
+ UInt64 StartOffset; // virtual offset of this extent
359
+ UInt64 NumBytes; // from main descriptor, if multi-vol
360
+ UInt64 FlatOffset; // in Stream
361
+
362
+ CByteBuffer DescriptorBuf;
363
+ CDescriptor Descriptor;
364
+
365
+ CHeader h;
366
+
367
+ UInt64 GetEndOffset() const { return StartOffset + NumBytes; }
368
+
369
+ bool IsVmdk() const { return !IsZero && !IsFlat; };
370
+ // if (IsOK && IsVmdk()), then VMDK header of this extent was read
371
+
372
+ CExtent():
373
+ IsOK(false),
374
+ IsArc(false),
375
+ NeedDeflate(false),
376
+ Unsupported(false),
377
+ IsZero(false),
378
+ IsFlat(false),
379
+ DescriptorOK(false),
380
+ HeadersError(false),
381
+
382
+ ClusterBits(0),
383
+ ZeroSector(0),
384
+
385
+ PosInArc(0),
386
+
387
+ PhySize(0),
388
+ VirtSize(0),
389
+
390
+ StartOffset(0),
391
+ NumBytes(0),
392
+ FlatOffset(0)
393
+ {}
394
+
395
+
396
+ HRESULT ReadForHeader(IInStream *stream, UInt64 sector, void *data, size_t numSectors);
397
+ HRESULT Open3(IInStream *stream, IArchiveOpenCallback *openCallback,
398
+ unsigned numVols, unsigned volIndex, UInt64 &complexity);
399
+
400
+ HRESULT Seek(UInt64 offset)
401
+ {
402
+ PosInArc = offset;
403
+ return Stream->Seek(offset, STREAM_SEEK_SET, NULL);
404
+ }
405
+
406
+ HRESULT InitAndSeek()
407
+ {
408
+ if (Stream)
409
+ return Seek(0);
410
+ return S_OK;
411
+ }
412
+
413
+ HRESULT Read(void *data, size_t *size)
414
+ {
415
+ HRESULT res = ReadStream(Stream, data, size);
416
+ PosInArc += *size;
417
+ return res;
418
+ }
419
+ };
420
+
421
+
422
+ class CHandler: public CHandlerImg
423
+ {
424
+ bool _isArc;
425
+ bool _unsupported;
426
+ bool _unsupportedSome;
427
+ bool _headerError;
428
+ bool _missingVol;
429
+ bool _isMultiVol;
430
+ bool _needDeflate;
431
+
432
+ UInt64 _cacheCluster;
433
+ unsigned _cacheExtent;
434
+ CByteBuffer _cache;
435
+ CByteBuffer _cacheCompressed;
436
+
437
+ unsigned _clusterBitsMax;
438
+ UInt64 _phySize;
439
+
440
+ CObjectVector<CExtent> _extents;
441
+
442
+ CBufInStream *_bufInStreamSpec;
443
+ CMyComPtr<ISequentialInStream> _bufInStream;
444
+
445
+ CBufPtrSeqOutStream *_bufOutStreamSpec;
446
+ CMyComPtr<ISequentialOutStream> _bufOutStream;
447
+
448
+ NCompress::NZlib::CDecoder *_zlibDecoderSpec;
449
+ CMyComPtr<ICompressCoder> _zlibDecoder;
450
+
451
+ CByteBuffer _descriptorBuf;
452
+ CDescriptor _descriptor;
453
+
454
+ UString _missingVolName;
455
+
456
+ void InitAndSeekMain()
457
+ {
458
+ _virtPos = 0;
459
+ }
460
+
461
+ virtual HRESULT Open2(IInStream *stream, IArchiveOpenCallback *openCallback);
462
+ virtual void CloseAtError();
463
+ public:
464
+ INTERFACE_IInArchive_Img(;)
465
+
466
+ STDMETHOD(GetStream)(UInt32 index, ISequentialInStream **stream);
467
+ STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
468
+ };
469
+
470
+
471
+ STDMETHODIMP CHandler::Read(void *data, UInt32 size, UInt32 *processedSize)
472
+ {
473
+ if (processedSize)
474
+ *processedSize = 0;
475
+ if (_virtPos >= _size)
476
+ return S_OK;
477
+ {
478
+ UInt64 rem = _size - _virtPos;
479
+ if (size > rem)
480
+ size = (UInt32)rem;
481
+ if (size == 0)
482
+ return S_OK;
483
+ }
484
+
485
+ unsigned extentIndex;
486
+ {
487
+ unsigned left = 0, right = _extents.Size();
488
+ for (;;)
489
+ {
490
+ unsigned mid = (left + right) / 2;
491
+ if (mid == left)
492
+ break;
493
+ if (_virtPos < _extents[mid].StartOffset)
494
+ right = mid;
495
+ else
496
+ left = mid;
497
+ }
498
+ extentIndex = left;
499
+ }
500
+
501
+ CExtent &extent = _extents[extentIndex];
502
+
503
+ {
504
+ const UInt64 vir = _virtPos - extent.StartOffset;
505
+ if (vir >= extent.NumBytes)
506
+ {
507
+ return E_FAIL;
508
+ /*
509
+ if (vir > extent.NumBytes)
510
+ _stream_dataError = true;
511
+ memset(data, 0, size);
512
+ _virtPos += size;
513
+ if (processedSize)
514
+ *processedSize = size;
515
+ return S_OK;
516
+ */
517
+ }
518
+
519
+ {
520
+ const UInt64 rem = extent.NumBytes - vir;
521
+ if (size > rem)
522
+ size = (UInt32)rem;
523
+ }
524
+
525
+ if (vir >= extent.VirtSize)
526
+ {
527
+ // if vmdk's VirtSize is smaller than VirtSize from main multi-volume descriptor
528
+ _stream_dataError = true;
529
+ return S_FALSE;
530
+ /*
531
+ memset(data, 0, size);
532
+ _virtPos += size;
533
+ if (processedSize)
534
+ *processedSize = size;
535
+ return S_OK;
536
+ */
537
+ }
538
+
539
+ {
540
+ const UInt64 rem = extent.VirtSize - vir;
541
+ if (size > rem)
542
+ size = (UInt32)rem;
543
+ }
544
+
545
+ if (extent.IsZero || !extent.IsOK || !extent.Stream || extent.Unsupported)
546
+ {
547
+ if (extent.Unsupported)
548
+ {
549
+ _stream_unsupportedMethod = true;
550
+ return S_FALSE;
551
+ }
552
+ if (!extent.IsOK || !extent.Stream)
553
+ {
554
+ _stream_unavailData = true;
555
+ return S_FALSE;
556
+ }
557
+ memset(data, 0, size);
558
+ _virtPos += size;
559
+ if (processedSize)
560
+ *processedSize = size;
561
+ return S_OK;
562
+ }
563
+
564
+ if (extent.IsFlat)
565
+ {
566
+ UInt64 offset = extent.FlatOffset + vir;
567
+ if (offset != extent.PosInArc)
568
+ {
569
+ RINOK(extent.Seek(offset));
570
+ }
571
+ UInt32 size2 = 0;
572
+ HRESULT res = extent.Stream->Read(data, size, &size2);
573
+ if (res == S_OK && size2 == 0)
574
+ {
575
+ _stream_unavailData = true;
576
+ /*
577
+ memset(data, 0, size);
578
+ _virtPos += size;
579
+ if (processedSize)
580
+ *processedSize = size;
581
+ return S_OK;
582
+ */
583
+ }
584
+ // _stream_PackSize += size2;
585
+ extent.PosInArc += size2;
586
+ _virtPos += size2;
587
+ if (processedSize)
588
+ *processedSize = size2;
589
+ return res;
590
+ }
591
+ }
592
+
593
+
594
+ for (;;)
595
+ {
596
+ const UInt64 vir = _virtPos - extent.StartOffset;
597
+ const unsigned clusterBits = extent.ClusterBits;
598
+ const UInt64 cluster = vir >> clusterBits;
599
+ const size_t clusterSize = (size_t)1 << clusterBits;
600
+ const size_t lowBits = (size_t)vir & (clusterSize - 1);
601
+ {
602
+ size_t rem = clusterSize - lowBits;
603
+ if (size > rem)
604
+ size = (UInt32)rem;
605
+ }
606
+
607
+ if (extentIndex == _cacheExtent && cluster == _cacheCluster)
608
+ {
609
+ memcpy(data, _cache + lowBits, size);
610
+ _virtPos += size;
611
+ if (processedSize)
612
+ *processedSize = size;
613
+ return S_OK;
614
+ }
615
+
616
+ const UInt64 high = cluster >> k_NumMidBits;
617
+
618
+ if (high < extent.Tables.Size())
619
+ {
620
+ const CByteBuffer &table = extent.Tables[(unsigned)high];
621
+
622
+ if (table.Size() != 0)
623
+ {
624
+ const size_t midBits = (size_t)cluster & ((1 << k_NumMidBits) - 1);
625
+ const Byte *p = (const Byte *)table + (midBits << 2);
626
+ const UInt32 v = Get32(p);
627
+
628
+ if (v != 0 && v != extent.ZeroSector)
629
+ {
630
+ UInt64 offset = (UInt64)v << 9;
631
+ if (extent.NeedDeflate)
632
+ {
633
+ if (offset != extent.PosInArc)
634
+ {
635
+ // printf("\n%12x %12x\n", (unsigned)offset, (unsigned)(offset - extent.PosInArc));
636
+ RINOK(extent.Seek(offset));
637
+ }
638
+
639
+ const size_t kStartSize = 1 << 9;
640
+ {
641
+ size_t curSize = kStartSize;
642
+ RINOK(extent.Read(_cacheCompressed, &curSize));
643
+ // _stream_PackSize += curSize;
644
+ if (curSize != kStartSize)
645
+ return S_FALSE;
646
+ }
647
+
648
+ if (Get64(_cacheCompressed) != (cluster << (clusterBits - 9)))
649
+ return S_FALSE;
650
+
651
+ UInt32 dataSize = Get32(_cacheCompressed + 8);
652
+ if (dataSize > ((UInt32)1 << 31))
653
+ return S_FALSE;
654
+
655
+ size_t dataSize2 = (size_t)dataSize + 12;
656
+
657
+ if (dataSize2 > kStartSize)
658
+ {
659
+ dataSize2 = (dataSize2 + 511) & ~(size_t)511;
660
+ if (dataSize2 > _cacheCompressed.Size())
661
+ return S_FALSE;
662
+ size_t curSize = dataSize2 - kStartSize;
663
+ const size_t curSize2 = curSize;
664
+ RINOK(extent.Read(_cacheCompressed + kStartSize, &curSize));
665
+ // _stream_PackSize += curSize;
666
+ if (curSize != curSize2)
667
+ return S_FALSE;
668
+ }
669
+
670
+ _bufInStreamSpec->Init(_cacheCompressed + 12, dataSize);
671
+
672
+ _cacheCluster = (UInt64)(Int64)-1;
673
+ _cacheExtent = (unsigned)(int)-1;
674
+
675
+ if (_cache.Size() < clusterSize)
676
+ return E_FAIL;
677
+ _bufOutStreamSpec->Init(_cache, clusterSize);
678
+
679
+ // Do we need to use smaller block than clusterSize for last cluster?
680
+ UInt64 blockSize64 = clusterSize;
681
+ HRESULT res = _zlibDecoderSpec->Code(_bufInStream, _bufOutStream, NULL, &blockSize64, NULL);
682
+
683
+ /*
684
+ if (_bufOutStreamSpec->GetPos() != clusterSize)
685
+ {
686
+ _stream_dataError = true;
687
+ memset(_cache + _bufOutStreamSpec->GetPos(), 0, clusterSize - _bufOutStreamSpec->GetPos());
688
+ }
689
+ */
690
+
691
+ if (_bufOutStreamSpec->GetPos() != clusterSize
692
+ || _zlibDecoderSpec->GetInputProcessedSize() != dataSize)
693
+ {
694
+ _stream_dataError = true;
695
+ if (res == S_OK)
696
+ res = S_FALSE;
697
+ }
698
+
699
+ RINOK(res);
700
+
701
+ _cacheCluster = cluster;
702
+ _cacheExtent = extentIndex;
703
+
704
+ continue;
705
+ /*
706
+ memcpy(data, _cache + lowBits, size);
707
+ _virtPos += size;
708
+ if (processedSize)
709
+ *processedSize = size;
710
+ return S_OK;
711
+ */
712
+ }
713
+ {
714
+ offset += lowBits;
715
+ if (offset != extent.PosInArc)
716
+ {
717
+ // printf("\n%12x %12x\n", (unsigned)offset, (unsigned)(offset - extent.PosInArc));
718
+ RINOK(extent.Seek(offset));
719
+ }
720
+ UInt32 size2 = 0;
721
+ HRESULT res = extent.Stream->Read(data, size, &size2);
722
+ if (res == S_OK && size2 == 0)
723
+ {
724
+ _stream_unavailData = true;
725
+ /*
726
+ memset(data, 0, size);
727
+ _virtPos += size;
728
+ if (processedSize)
729
+ *processedSize = size;
730
+ return S_OK;
731
+ */
732
+ }
733
+ extent.PosInArc += size2;
734
+ // _stream_PackSize += size2;
735
+ _virtPos += size2;
736
+ if (processedSize)
737
+ *processedSize = size2;
738
+ return res;
739
+ }
740
+ }
741
+ }
742
+ }
743
+
744
+ memset(data, 0, size);
745
+ _virtPos += size;
746
+ if (processedSize)
747
+ *processedSize = size;
748
+ return S_OK;
749
+ }
750
+ }
751
+
752
+
753
+ static const Byte kProps[] =
754
+ {
755
+ kpidSize,
756
+ kpidPackSize
757
+ };
758
+
759
+ static const Byte kArcProps[] =
760
+ {
761
+ kpidNumVolumes,
762
+ kpidMethod,
763
+ kpidClusterSize,
764
+ kpidHeadersSize,
765
+ kpidId,
766
+ kpidName,
767
+ kpidComment
768
+ };
769
+
770
+ IMP_IInArchive_Props
771
+ IMP_IInArchive_ArcProps
772
+
773
+
774
+ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value)
775
+ {
776
+ COM_TRY_BEGIN
777
+ NCOM::CPropVariant prop;
778
+
779
+ const CExtent *e = NULL;
780
+ const CDescriptor *desc = NULL;
781
+
782
+ if (_isMultiVol)
783
+ desc = &_descriptor;
784
+ else if (_extents.Size() == 1)
785
+ {
786
+ e = &_extents[0];
787
+ desc = &e->Descriptor;
788
+ }
789
+
790
+ switch (propID)
791
+ {
792
+ case kpidMainSubfile: prop = (UInt32)0; break;
793
+ case kpidPhySize: if (_phySize != 0) prop = _phySize; break;
794
+ case kpidClusterSize: prop = (UInt32)((UInt32)1 << _clusterBitsMax); break;
795
+ case kpidHeadersSize: if (e) prop = (e->h.overHead << 9); break;
796
+ case kpidMethod:
797
+ {
798
+ AString s;
799
+
800
+ if (desc && !desc->createType.IsEmpty())
801
+ s = desc->createType;
802
+
803
+ bool zlib = false;
804
+ bool marker = false;
805
+ int algo = -1;
806
+
807
+ FOR_VECTOR (i, _extents)
808
+ {
809
+ const CExtent &extent = _extents[i];
810
+ if (!extent.IsOK || !extent.IsVmdk())
811
+ continue;
812
+
813
+ const CHeader &h = extent.h;
814
+
815
+ if (h.algo != 0)
816
+ {
817
+ if (h.algo == 1)
818
+ zlib = true;
819
+ else if (algo != (int)h.algo)
820
+ {
821
+ s.Add_Space_if_NotEmpty();
822
+ char temp[16];
823
+ ConvertUInt32ToString(h.algo, temp);
824
+ s += temp;
825
+ algo = h.algo;
826
+ }
827
+ }
828
+
829
+ if (h.Is_Marker())
830
+ marker = true;
831
+ }
832
+
833
+ if (zlib)
834
+ {
835
+ s.Add_Space_if_NotEmpty();
836
+ s += "zlib";
837
+ }
838
+
839
+ if (marker)
840
+ {
841
+ s.Add_Space_if_NotEmpty();
842
+ s += "Marker";
843
+ }
844
+
845
+ if (!s.IsEmpty())
846
+ prop = s;
847
+ break;
848
+ }
849
+
850
+ case kpidComment:
851
+ {
852
+ if (e && e->DescriptorBuf.Size() != 0)
853
+ {
854
+ AString s;
855
+ s.SetFrom_CalcLen((const char *)(const Byte *)e->DescriptorBuf, (unsigned)e->DescriptorBuf.Size());
856
+ if (!s.IsEmpty() && s.Len() <= (1 << 16))
857
+ prop = s;
858
+ }
859
+ break;
860
+ }
861
+
862
+ case kpidId:
863
+ if (desc && !desc->CID.IsEmpty())
864
+ {
865
+ prop = desc->CID;
866
+ break;
867
+ }
868
+
869
+ case kpidName:
870
+ {
871
+ if (!_isMultiVol && desc && desc->Extents.Size() == 1)
872
+ {
873
+ const CExtentInfo &ei = desc->Extents[0];
874
+ if (!ei.FileName.IsEmpty())
875
+ {
876
+ UString u;
877
+ CDescriptor::GetUnicodeName(ei.FileName, u);
878
+ if (!u.IsEmpty())
879
+ prop = u;
880
+ }
881
+ }
882
+ break;
883
+ }
884
+
885
+ case kpidNumVolumes: if (_isMultiVol) prop = (UInt32)_extents.Size(); break;
886
+
887
+ case kpidError:
888
+ {
889
+ if (_missingVol || !_missingVolName.IsEmpty())
890
+ {
891
+ UString s;
892
+ s.SetFromAscii("Missing volume : ");
893
+ if (!_missingVolName.IsEmpty())
894
+ s += _missingVolName;
895
+ prop = s;
896
+ }
897
+ break;
898
+ }
899
+
900
+ case kpidErrorFlags:
901
+ {
902
+ UInt32 v = 0;
903
+ if (!_isArc) v |= kpv_ErrorFlags_IsNotArc;;
904
+ if (_unsupported) v |= kpv_ErrorFlags_UnsupportedMethod;
905
+ if (_unsupportedSome) v |= kpv_ErrorFlags_UnsupportedMethod;
906
+ if (_headerError) v |= kpv_ErrorFlags_HeadersError;
907
+ // if (_missingVol) v |= kpv_ErrorFlags_UnexpectedEnd;
908
+ if (v != 0)
909
+ prop = v;
910
+ break;
911
+ }
912
+ }
913
+
914
+ prop.Detach(value);
915
+ return S_OK;
916
+ COM_TRY_END
917
+ }
918
+
919
+
920
+ STDMETHODIMP CHandler::GetProperty(UInt32 /* index */, PROPID propID, PROPVARIANT *value)
921
+ {
922
+ COM_TRY_BEGIN
923
+ NCOM::CPropVariant prop;
924
+
925
+ switch (propID)
926
+ {
927
+ case kpidSize: prop = _size; break;
928
+ case kpidPackSize:
929
+ {
930
+ UInt64 packSize = 0;
931
+ FOR_VECTOR (i, _extents)
932
+ {
933
+ const CExtent &e = _extents[i];
934
+ if (!e.IsOK)
935
+ continue;
936
+ if (e.IsVmdk() && !_isMultiVol)
937
+ {
938
+ UInt64 ov = (e.h.overHead << 9);
939
+ if (e.PhySize >= ov)
940
+ packSize += e.PhySize - ov;
941
+ }
942
+ else
943
+ packSize += e.PhySize;
944
+ }
945
+ prop = packSize;
946
+ break;
947
+ }
948
+ case kpidExtension: prop = (_imgExt ? _imgExt : "img"); break;
949
+ }
950
+
951
+ prop.Detach(value);
952
+ return S_OK;
953
+ COM_TRY_END
954
+ }
955
+
956
+
957
+ static int inline GetLog(UInt64 num)
958
+ {
959
+ for (int i = 0; i < 64; i++)
960
+ if (((UInt64)1 << i) == num)
961
+ return i;
962
+ return -1;
963
+ }
964
+
965
+
966
+ HRESULT CExtent::ReadForHeader(IInStream *stream, UInt64 sector, void *data, size_t numSectors)
967
+ {
968
+ sector <<= 9;
969
+ RINOK(stream->Seek(sector, STREAM_SEEK_SET, NULL));
970
+ size_t size = numSectors << 9;
971
+ RINOK(ReadStream_FALSE(stream, data, size));
972
+ UInt64 end = sector + size;
973
+ if (PhySize < end)
974
+ PhySize = end;
975
+ return S_OK;
976
+ }
977
+
978
+
979
+ void CHandler::CloseAtError()
980
+ {
981
+ _extents.Clear();
982
+ CHandlerImg::CloseAtError();
983
+ }
984
+
985
+
986
+ HRESULT CHandler::Open2(IInStream *stream, IArchiveOpenCallback *openCallback)
987
+ {
988
+ const unsigned kSectoreSize = 512;
989
+ Byte buf[kSectoreSize];
990
+ size_t headerSize = kSectoreSize;
991
+ RINOK(ReadStream(stream, buf, &headerSize));
992
+
993
+ if (headerSize < sizeof(k_Signature))
994
+ return S_FALSE;
995
+
996
+ CMyComPtr<IArchiveOpenVolumeCallback> volumeCallback;
997
+
998
+ if (memcmp(buf, k_Signature, sizeof(k_Signature)) != 0)
999
+ {
1000
+ const char *kSignature_Descriptor = "# Disk DescriptorFile";
1001
+ const size_t k_SigDesc_Size = strlen(kSignature_Descriptor);
1002
+ if (headerSize < k_SigDesc_Size)
1003
+ return S_FALSE;
1004
+ if (memcmp(buf, kSignature_Descriptor, k_SigDesc_Size) != 0)
1005
+ return S_FALSE;
1006
+
1007
+ UInt64 endPos;
1008
+ RINOK(stream->Seek(0, STREAM_SEEK_END, &endPos));
1009
+ if (endPos > (1 << 20))
1010
+ return S_FALSE;
1011
+ const size_t numBytes = (size_t)endPos;
1012
+ _descriptorBuf.Alloc(numBytes);
1013
+ RINOK(stream->Seek(0, STREAM_SEEK_SET, NULL));
1014
+ RINOK(ReadStream_FALSE(stream, _descriptorBuf, numBytes));
1015
+
1016
+ if (!_descriptor.Parse(_descriptorBuf, _descriptorBuf.Size()))
1017
+ return S_FALSE;
1018
+ _isMultiVol = true;
1019
+ _isArc = true;
1020
+ _phySize = numBytes;
1021
+ if (_descriptor.IsThere_Parent())
1022
+ _unsupported = true;
1023
+
1024
+ if (openCallback)
1025
+ {
1026
+ openCallback->QueryInterface(IID_IArchiveOpenVolumeCallback, (void **)&volumeCallback);
1027
+ }
1028
+ if (!volumeCallback)
1029
+ {
1030
+ _unsupported = true;
1031
+ return E_NOTIMPL;
1032
+ }
1033
+
1034
+ /*
1035
+ UInt64 totalVirtSize = 0;
1036
+ FOR_VECTOR (i, _descriptor.Extents)
1037
+ {
1038
+ const CExtentInfo &ei = _descriptor.Extents[i];
1039
+ if (ei.NumSectors >= ((UInt64)1 << (63 - 9)))
1040
+ return S_FALSE;
1041
+ totalVirtSize += ei.NumSectors;
1042
+ if (totalVirtSize >= ((UInt64)1 << (63 - 9)))
1043
+ return S_FALSE;
1044
+ }
1045
+ totalVirtSize <<= 9;
1046
+ */
1047
+
1048
+ if (_descriptor.Extents.Size() > 1)
1049
+ {
1050
+ const UInt64 numFiles = _descriptor.Extents.Size();
1051
+ RINOK(openCallback->SetTotal(&numFiles, NULL));
1052
+ }
1053
+ }
1054
+
1055
+ UInt64 complexity = 0;
1056
+
1057
+ for (;;)
1058
+ {
1059
+ CExtent *e = NULL;
1060
+ CMyComPtr<IInStream> nextStream;
1061
+
1062
+ if (_isMultiVol)
1063
+ {
1064
+ const unsigned extentIndex = _extents.Size();
1065
+ if (extentIndex >= _descriptor.Extents.Size())
1066
+ break;
1067
+ const CExtentInfo &ei = _descriptor.Extents[extentIndex];
1068
+ e = &_extents.AddNew();
1069
+ e->StartOffset = 0;
1070
+ if (ei.NumSectors >= ((UInt64)1 << (62 - 9)) ||
1071
+ ei.StartSector >= ((UInt64)1 << (62 - 9)))
1072
+ return S_FALSE;
1073
+ e->NumBytes = ei.NumSectors << 9;
1074
+ e->IsZero = ei.IsType_ZERO();
1075
+ if (extentIndex != 0)
1076
+ e->StartOffset = _extents[extentIndex - 1].GetEndOffset();
1077
+ if (e->GetEndOffset() < e->StartOffset)
1078
+ return S_FALSE;
1079
+
1080
+ e->VirtSize = e->NumBytes;
1081
+ if (e->IsZero)
1082
+ {
1083
+ e->IsOK = true;
1084
+ continue;
1085
+ }
1086
+
1087
+ e->IsFlat = ei.IsType_Flat();
1088
+ e->FlatOffset = ei.StartSector << 9;
1089
+
1090
+ UString u;
1091
+ CDescriptor::GetUnicodeName(ei.FileName, u);
1092
+ if (u.IsEmpty())
1093
+ {
1094
+ _missingVol = true;
1095
+ continue;
1096
+ }
1097
+
1098
+ HRESULT result = volumeCallback->GetStream(u, &nextStream);
1099
+
1100
+ if (result != S_OK && result != S_FALSE)
1101
+ return result;
1102
+
1103
+ if (!nextStream || result != S_OK)
1104
+ {
1105
+ if (_missingVolName.IsEmpty())
1106
+ _missingVolName = u;
1107
+ _missingVol = true;
1108
+ continue;
1109
+ }
1110
+
1111
+ if (e->IsFlat)
1112
+ {
1113
+ e->IsOK = true;
1114
+ e->Stream = nextStream;
1115
+ e->PhySize = e->NumBytes;
1116
+ continue;
1117
+ }
1118
+
1119
+ stream = nextStream;
1120
+
1121
+ headerSize = kSectoreSize;
1122
+ RINOK(ReadStream(stream, buf, &headerSize));
1123
+
1124
+ if (headerSize != kSectoreSize)
1125
+ continue;
1126
+ if (memcmp(buf, k_Signature, sizeof(k_Signature)) != 0)
1127
+ continue;
1128
+ }
1129
+ else
1130
+ {
1131
+ if (headerSize != kSectoreSize)
1132
+ return S_FALSE;
1133
+ e = &_extents.AddNew();
1134
+ e->StartOffset = 0;
1135
+ }
1136
+
1137
+ HRESULT res = S_FALSE;
1138
+ if (e->h.Parse(buf))
1139
+ res = e->Open3(stream, openCallback, _isMultiVol ? _descriptor.Extents.Size() : 1, _extents.Size() - 1, complexity);
1140
+
1141
+ if (!_isMultiVol)
1142
+ {
1143
+ _isArc = e->IsArc;
1144
+ _phySize = e->PhySize;
1145
+ _unsupported = e->Unsupported;
1146
+ }
1147
+
1148
+ if (e->Unsupported)
1149
+ _unsupportedSome = true;
1150
+ if (e->HeadersError)
1151
+ _headerError = true;
1152
+
1153
+ if (res != S_OK)
1154
+ {
1155
+ if (res != S_FALSE)
1156
+ return res;
1157
+ if (!_isMultiVol)
1158
+ return res;
1159
+ continue;
1160
+ }
1161
+
1162
+ e->Stream = stream;
1163
+ e->IsOK = true;
1164
+
1165
+ if (!_isMultiVol)
1166
+ {
1167
+ e->NumBytes = e->VirtSize;
1168
+ break;
1169
+ }
1170
+
1171
+ if (e->NumBytes != e->VirtSize)
1172
+ _headerError = true;
1173
+ }
1174
+
1175
+ if (!_extents.IsEmpty())
1176
+ _size = _extents.Back().GetEndOffset();
1177
+
1178
+ _needDeflate = false;
1179
+ _clusterBitsMax = 0;
1180
+
1181
+ unsigned numOKs = 0;
1182
+ unsigned numUnsupported = 0;
1183
+
1184
+ FOR_VECTOR (i, _extents)
1185
+ {
1186
+ const CExtent &e = _extents[i];
1187
+ if (e.Unsupported)
1188
+ numUnsupported++;
1189
+ if (!e.IsOK)
1190
+ continue;
1191
+ numOKs++;
1192
+ if (e.IsVmdk())
1193
+ {
1194
+ if (e.NeedDeflate)
1195
+ _needDeflate = true;
1196
+ if (_clusterBitsMax < e.ClusterBits)
1197
+ _clusterBitsMax = e.ClusterBits;
1198
+ }
1199
+ }
1200
+
1201
+ if (numUnsupported != 0 && numUnsupported == _extents.Size())
1202
+ _unsupported = true;
1203
+
1204
+ return S_OK;
1205
+ }
1206
+
1207
+
1208
+ HRESULT CExtent::Open3(IInStream *stream, IArchiveOpenCallback *openCallback,
1209
+ unsigned numVols, unsigned volIndex, UInt64 &complexity)
1210
+ {
1211
+ if (h.descriptorSize != 0)
1212
+ {
1213
+ if (h.descriptorOffset == 0 ||
1214
+ h.descriptorSize > (1 << 10))
1215
+ return S_FALSE;
1216
+ DescriptorBuf.Alloc((size_t)h.descriptorSize << 9);
1217
+ RINOK(ReadForHeader(stream, h.descriptorOffset, DescriptorBuf, (size_t)h.descriptorSize));
1218
+ if (h.descriptorOffset == 1 && h.Is_Marker() && Get64(DescriptorBuf) == 0)
1219
+ {
1220
+ // We check data as end marker.
1221
+ // and if probably it's footer's copy of header, we don't want to open it.
1222
+ return S_FALSE;
1223
+ }
1224
+
1225
+ DescriptorOK = Descriptor.Parse(DescriptorBuf, DescriptorBuf.Size());
1226
+ if (!DescriptorOK)
1227
+ HeadersError = true;
1228
+ if (Descriptor.IsThere_Parent())
1229
+ Unsupported = true;
1230
+ }
1231
+
1232
+ if (h.gdOffset == (UInt64)(Int64)-1)
1233
+ {
1234
+ // Grain Dir is at end of file
1235
+ UInt64 endPos;
1236
+ RINOK(stream->Seek(0, STREAM_SEEK_END, &endPos));
1237
+ if ((endPos & 511) != 0)
1238
+ return S_FALSE;
1239
+
1240
+ const size_t kEndSize = 512 * 3;
1241
+ Byte buf2[kEndSize];
1242
+ if (endPos < kEndSize)
1243
+ return S_FALSE;
1244
+ RINOK(stream->Seek(endPos - kEndSize, STREAM_SEEK_SET, NULL));
1245
+ RINOK(ReadStream_FALSE(stream, buf2, kEndSize));
1246
+
1247
+ CHeader h2;
1248
+ if (!h2.Parse(buf2 + 512))
1249
+ return S_FALSE;
1250
+ if (!h.IsSameImageFor(h2))
1251
+ return S_FALSE;
1252
+
1253
+ h = h2;
1254
+
1255
+ CMarker m;
1256
+ m.Parse(buf2);
1257
+ if (m.NumSectors != 1 || m.SpecSize != 0 || m.Type != k_Marker_FOOTER)
1258
+ return S_FALSE;
1259
+ m.Parse(buf2 + 512 * 2);
1260
+ if (m.NumSectors != 0 || m.SpecSize != 0 || m.Type != k_Marker_END_OF_STREAM)
1261
+ return S_FALSE;
1262
+ PhySize = endPos;
1263
+ }
1264
+
1265
+ int grainSize_Log = GetLog(h.grainSize);
1266
+ if (grainSize_Log < 3 || grainSize_Log > 30 - 9) // grain size must be >= 4 KB
1267
+ return S_FALSE;
1268
+ if (h.capacity >= ((UInt64)1 << (63 - 9)))
1269
+ return S_FALSE;
1270
+ if (h.overHead >= ((UInt64)1 << (63 - 9)))
1271
+ return S_FALSE;
1272
+
1273
+ IsArc = true;
1274
+ ClusterBits = (9 + grainSize_Log);
1275
+ VirtSize = h.capacity << 9;
1276
+ NeedDeflate = (h.algo >= 1);
1277
+
1278
+ if (h.Is_Compressed() ? (h.algo > 1 || !h.Is_Marker()) : (h.algo != 0))
1279
+ {
1280
+ Unsupported = true;
1281
+ PhySize = 0;
1282
+ return S_FALSE;
1283
+ }
1284
+
1285
+ {
1286
+ UInt64 overHeadBytes = h.overHead << 9;
1287
+ if (PhySize < overHeadBytes)
1288
+ PhySize = overHeadBytes;
1289
+ }
1290
+
1291
+ ZeroSector = 0;
1292
+ if (h.Is_ZeroGrain())
1293
+ ZeroSector = 1;
1294
+
1295
+ const UInt64 numSectorsPerGde = (UInt64)1 << (grainSize_Log + k_NumMidBits);
1296
+ const UInt64 numGdeEntries = (h.capacity + numSectorsPerGde - 1) >> (grainSize_Log + k_NumMidBits);
1297
+ CByteBuffer table;
1298
+
1299
+ if (numGdeEntries != 0)
1300
+ {
1301
+ if (h.gdOffset == 0)
1302
+ return S_FALSE;
1303
+
1304
+ size_t numSectors = (size_t)((numGdeEntries + ((1 << (9 - 2)) - 1)) >> (9 - 2));
1305
+ size_t t1SizeBytes = numSectors << 9;
1306
+ if ((t1SizeBytes >> 2) < numGdeEntries)
1307
+ return S_FALSE;
1308
+ table.Alloc(t1SizeBytes);
1309
+
1310
+ if (h.Is_Marker())
1311
+ {
1312
+ Byte buf2[1 << 9];
1313
+ if (ReadForHeader(stream, h.gdOffset - 1, buf2, 1) != S_OK)
1314
+ return S_FALSE;
1315
+ {
1316
+ CMarker m;
1317
+ m.Parse(buf2);
1318
+ if (m.Type != k_Marker_GRAIN_DIR
1319
+ || m.NumSectors != numSectors
1320
+ || m.SpecSize != 0)
1321
+ return S_FALSE;
1322
+ }
1323
+ }
1324
+
1325
+ RINOK(ReadForHeader(stream, h.gdOffset, table, numSectors));
1326
+ }
1327
+
1328
+ const size_t clusterSize = (size_t)1 << ClusterBits;
1329
+
1330
+ const UInt64 complexityStart = complexity;
1331
+
1332
+ if (openCallback)
1333
+ {
1334
+ complexity += (UInt64)numGdeEntries << (k_NumMidBits + 2);
1335
+ {
1336
+ const UInt64 numVols2 = numVols;
1337
+ RINOK(openCallback->SetTotal((numVols == 1) ? NULL : &numVols2, &complexity));
1338
+ }
1339
+ if (numVols != 1)
1340
+ {
1341
+ const UInt64 volIndex2 = volIndex;
1342
+ RINOK(openCallback->SetCompleted(numVols == 1 ? NULL : &volIndex2, &complexityStart));
1343
+ }
1344
+ }
1345
+
1346
+ UInt64 lastSector = 0;
1347
+ UInt64 lastVirtCluster = 0;
1348
+ size_t numProcessed_Prev = 0;
1349
+
1350
+ for (size_t i = 0; i < numGdeEntries; i++)
1351
+ {
1352
+ const size_t k_NumSectors = (size_t)1 << (k_NumMidBits - 9 + 2);
1353
+ const size_t k_NumMidItems = (size_t)1 << k_NumMidBits;
1354
+
1355
+ CByteBuffer &buf = Tables.AddNew();
1356
+
1357
+ {
1358
+ const UInt32 v = Get32((const Byte *)table + (size_t)i * 4);
1359
+ if (v == 0 || v == ZeroSector)
1360
+ continue;
1361
+ if (openCallback && (i - numProcessed_Prev) >= 1024)
1362
+ {
1363
+ const UInt64 comp = complexityStart + ((UInt64)i << (k_NumMidBits + 2));
1364
+ const UInt64 volIndex2 = volIndex;
1365
+ RINOK(openCallback->SetCompleted(numVols == 1 ? NULL : &volIndex2, &comp));
1366
+ numProcessed_Prev = i;
1367
+ }
1368
+
1369
+ if (h.Is_Marker())
1370
+ {
1371
+ Byte buf2[1 << 9];
1372
+ if (ReadForHeader(stream, v - 1, buf2, 1) != S_OK)
1373
+ return S_FALSE;
1374
+ {
1375
+ CMarker m;
1376
+ m.Parse(buf2);
1377
+ if (m.Type != k_Marker_GRAIN_TABLE
1378
+ || m.NumSectors != k_NumSectors
1379
+ || m.SpecSize != 0)
1380
+ return S_FALSE;
1381
+ }
1382
+ }
1383
+
1384
+ buf.Alloc(k_NumMidItems * 4);
1385
+ RINOK(ReadForHeader(stream, v, buf, k_NumSectors));
1386
+ }
1387
+
1388
+ for (size_t k = 0; k < k_NumMidItems; k++)
1389
+ {
1390
+ const UInt32 v = Get32((const Byte *)buf + (size_t)k * 4);
1391
+ if (v == 0 || v == ZeroSector)
1392
+ continue;
1393
+ if (v < h.overHead)
1394
+ return S_FALSE;
1395
+ if (lastSector < v)
1396
+ {
1397
+ lastSector = v;
1398
+ if (NeedDeflate)
1399
+ lastVirtCluster = ((UInt64)i << k_NumMidBits) + k;
1400
+ }
1401
+ }
1402
+ }
1403
+
1404
+ if (!NeedDeflate)
1405
+ {
1406
+ UInt64 end = ((UInt64)lastSector << 9) + clusterSize;
1407
+ if (PhySize < end)
1408
+ PhySize = end;
1409
+ }
1410
+ else if (lastSector != 0)
1411
+ {
1412
+ Byte buf[1 << 9];
1413
+ if (ReadForHeader(stream, lastSector, buf, 1) == S_OK)
1414
+ {
1415
+ UInt64 lba = Get64(buf);
1416
+ if (lba == (lastVirtCluster << (ClusterBits - 9)))
1417
+ {
1418
+ UInt32 dataSize = Get32(buf + 8);
1419
+ size_t dataSize2 = (size_t)dataSize + 12;
1420
+ dataSize2 = (dataSize2 + 511) & ~(size_t)511;
1421
+ UInt64 end = ((UInt64)lastSector << 9) + dataSize2;
1422
+ if (PhySize < end)
1423
+ PhySize = end;
1424
+ }
1425
+ }
1426
+ }
1427
+
1428
+ return S_OK;
1429
+ }
1430
+
1431
+
1432
+ STDMETHODIMP CHandler::Close()
1433
+ {
1434
+ _phySize = 0;
1435
+ _size = 0;
1436
+
1437
+ _cacheCluster = (UInt64)(Int64)-1;
1438
+ _cacheExtent = (unsigned)(int)-1;
1439
+
1440
+ _clusterBitsMax = 0;
1441
+
1442
+ _isArc = false;
1443
+ _unsupported = false;
1444
+ _unsupportedSome = false;
1445
+ _headerError = false;
1446
+ _missingVol = false;
1447
+ _isMultiVol = false;
1448
+ _needDeflate = false;
1449
+
1450
+ _missingVolName.Empty();
1451
+
1452
+ _descriptorBuf.Free();
1453
+ _descriptor.Clear();
1454
+
1455
+ _imgExt = NULL;
1456
+ Stream.Release(); // Stream vriable is unused
1457
+ _extents.Clear();
1458
+ return S_OK;
1459
+ }
1460
+
1461
+
1462
+ STDMETHODIMP CHandler::GetStream(UInt32 /* index */, ISequentialInStream **stream)
1463
+ {
1464
+ COM_TRY_BEGIN
1465
+ *stream = 0;
1466
+
1467
+ if (_unsupported)
1468
+ return S_FALSE;
1469
+
1470
+ ClearStreamVars();
1471
+ // _stream_UsePackSize = true;
1472
+
1473
+ if (_needDeflate)
1474
+ {
1475
+ if (!_bufInStream)
1476
+ {
1477
+ _bufInStreamSpec = new CBufInStream;
1478
+ _bufInStream = _bufInStreamSpec;
1479
+ }
1480
+
1481
+ if (!_bufOutStream)
1482
+ {
1483
+ _bufOutStreamSpec = new CBufPtrSeqOutStream();
1484
+ _bufOutStream = _bufOutStreamSpec;
1485
+ }
1486
+
1487
+ if (!_zlibDecoder)
1488
+ {
1489
+ _zlibDecoderSpec = new NCompress::NZlib::CDecoder;
1490
+ _zlibDecoder = _zlibDecoderSpec;
1491
+ }
1492
+
1493
+ const size_t clusterSize = (size_t)1 << _clusterBitsMax;
1494
+ _cache.AllocAtLeast(clusterSize);
1495
+ _cacheCompressed.AllocAtLeast(clusterSize * 2);
1496
+ }
1497
+
1498
+ FOR_VECTOR (i, _extents)
1499
+ {
1500
+ RINOK(_extents[i].InitAndSeek());
1501
+ }
1502
+
1503
+ CMyComPtr<ISequentialInStream> streamTemp = this;
1504
+ InitAndSeekMain();
1505
+ *stream = streamTemp.Detach();
1506
+ return S_OK;
1507
+ COM_TRY_END
1508
+ }
1509
+
1510
+
1511
+ REGISTER_ARC_I(
1512
+ "VMDK", "vmdk", NULL, 0xC8,
1513
+ k_Signature,
1514
+ 0,
1515
+ 0,
1516
+ NULL)
1517
+
1518
+ }}