libre.patch 19 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486
  1. diff --git a/clean.bat b/clean.bat
  2. index 2979f6a..965b13a 100644
  3. --- a/clean.bat
  4. +++ b/clean.bat
  5. @@ -28,7 +28,6 @@
  6. @del /Q /S plugins\wcx\sevenzip\lib\*.*
  7. @del /Q /S plugins\wcx\torrent\lib\*.*
  8. @del /Q /S plugins\wcx\unbz2\lib\*.*
  9. -@del /Q /S plugins\wcx\unrar\lib\*.*
  10. @del /Q /S plugins\wcx\zip\lib\*.*
  11. @del /Q /S plugins\wdx\deb_wdx\lib\*.*
  12. diff --git a/doublecmd.ext.example b/doublecmd.ext.example
  13. index 24f4f9b..4e4307d 100644
  14. --- a/doublecmd.ext.example
  15. +++ b/doublecmd.ext.example
  16. @@ -236,13 +236,6 @@ View={!VIEWER} <?lharc l %f?>
  17. Extract={!SHELL} lharc x %f '*'
  18. #Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi
  19. -# arj
  20. -[arj]
  21. -Open={!VFS}
  22. -View={!VIEWER} <?unarj l %p?>
  23. -Extract={!SHELL} unarj x %f '*'
  24. -#Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi
  25. -
  26. # ha
  27. [ha]
  28. Open={!VFS}
  29. @@ -250,13 +243,6 @@ View={!VIEWER} <?ha lf %p?>
  30. Extract={!SHELL} ha xy %f '*'
  31. # Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I %f; fi
  32. -# rar
  33. -[rar|r00|r02|r02|r03|r04|r05|r06|r07|r08|r09]
  34. -Open={!VFS}
  35. -View={!VIEWER} <?rar v -c- %p?>
  36. -Extract={!SHELL} rar x -c- %f '*'
  37. -# Extract (with flags)=I=%{Enter any RAR flags:}; if test -n "$I";then rar x $I %f; fi
  38. -
  39. #compress
  40. [Z]
  41. Open={!VFS}
  42. @@ -287,11 +273,6 @@ Open={!VFS}
  43. View={!VIEWER} <?bzip -dc %f 2>/dev/null?>
  44. Uncompress={!SHELL} bunzip %f
  45. -# ace
  46. -[ace]
  47. -Open={!VFS}
  48. -Uncompress={!SHELL} unace e %p
  49. -
  50. # Source RPMs (SuSE uses *.spm, others use *.src.rpm)
  51. [spm|srcm]
  52. Open={!VFS}
  53. diff --git a/install/darwin/install.sh b/install/darwin/install.sh
  54. index e201f94..a03953a 100755
  55. --- a/install/darwin/install.sh
  56. +++ b/install/darwin/install.sh
  57. @@ -17,7 +17,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx
  58. mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio
  59. mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
  60. mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
  61. -mkdir -p $DC_INSTALL_DIR/plugins/wcx/unrar
  62. mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
  63. # WDX plugins directories
  64. mkdir -p $DC_INSTALL_DIR/plugins/wdx
  65. @@ -43,7 +42,6 @@ cp -a multiarc.ini $DC_INSTALL_DIR/
  66. install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/cpio/
  67. install -m 644 plugins/wcx/deb/lib/deb.wcx $DC_INSTALL_DIR/plugins/wcx/deb/
  68. install -m 644 plugins/wcx/rpm/lib/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/
  69. -install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
  70. install -m 644 plugins/wcx/zip/zip.wcx $DC_INSTALL_DIR/plugins/wcx/zip/
  71. # WDX
  72. install -m 644 plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx $DC_INSTALL_DIR/plugins/wdx/rpm_wdx/
  73. diff --git a/install/darwin/lib/readme.txt b/install/darwin/lib/readme.txt
  74. index 5b81e6e..830ba48 100644
  75. --- a/install/darwin/lib/readme.txt
  76. +++ b/install/darwin/lib/readme.txt
  77. @@ -1,2 +1 @@
  78. Before create packages (before run create_packages.mac) copy in this directory third-party libraries:
  79. -- libunrar.dylib - needed for unrar plugin
  80. \ No newline at end of file
  81. diff --git a/install/linux/install.sh b/install/linux/install.sh
  82. index 94a3eba..fbe9001 100755
  83. --- a/install/linux/install.sh
  84. +++ b/install/linux/install.sh
  85. @@ -49,7 +49,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx
  86. mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio
  87. mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
  88. mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
  89. -mkdir -p $DC_INSTALL_DIR/plugins/wcx/unrar
  90. mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
  91. # WDX plugins directories
  92. mkdir -p $DC_INSTALL_DIR/plugins/wdx
  93. @@ -80,7 +79,6 @@ cp -a multiarc.ini $DC_INSTALL_DIR/
  94. install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/cpio/
  95. install -m 644 plugins/wcx/deb/lib/deb.wcx $DC_INSTALL_DIR/plugins/wcx/deb/
  96. install -m 644 plugins/wcx/rpm/lib/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/
  97. -install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
  98. install -m 644 plugins/wcx/zip/zip.wcx $DC_INSTALL_DIR/plugins/wcx/zip/
  99. # WDX
  100. install -m 644 plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx $DC_INSTALL_DIR/plugins/wdx/rpm_wdx/
  101. diff --git a/install/linux/lib/readme.txt b/install/linux/lib/readme.txt
  102. index 901d6b4..54df3a8 100644
  103. --- a/install/linux/lib/readme.txt
  104. +++ b/install/linux/lib/readme.txt
  105. @@ -1,3 +1,2 @@
  106. Before create packages (before run create_packages.sh) copy in this directory third-party libraries:
  107. -- libunrar.so - needed for unrar plugin
  108. -- libqt4intf.so - needed for qt4 version of Double Commander
  109. \ No newline at end of file
  110. +- libqt4intf.so - needed for qt4 version of Double Commander
  111. diff --git a/install/windows/install.bat b/install/windows/install.bat
  112. index f79782f..cbc0842 100644
  113. --- a/install/windows/install.bat
  114. +++ b/install/windows/install.bat
  115. @@ -11,7 +11,6 @@ rem WCX plugins directories
  116. mkdir %DC_INSTALL_DIR%\plugins\wcx
  117. mkdir %DC_INSTALL_DIR%\plugins\wcx\rpm
  118. mkdir %DC_INSTALL_DIR%\plugins\wcx\sevenzip
  119. -mkdir %DC_INSTALL_DIR%\plugins\wcx\unrar
  120. mkdir %DC_INSTALL_DIR%\plugins\wcx\zip
  121. rem WDX plugins directories
  122. mkdir %DC_INSTALL_DIR%\plugins\wdx
  123. @@ -42,7 +41,6 @@ rem copy plugins
  124. rem WCX
  125. copy plugins\wcx\rpm\lib\rpm.wcx %DC_INSTALL_DIR%\plugins\wcx\rpm\
  126. copy plugins\wcx\sevenzip\sevenzip.wcx %DC_INSTALL_DIR%\plugins\wcx\sevenzip\
  127. -copy plugins\wcx\unrar\lib\unrar.wcx %DC_INSTALL_DIR%\plugins\wcx\unrar\
  128. copy plugins\wcx\zip\zip.wcx %DC_INSTALL_DIR%\plugins\wcx\zip\
  129. rem WDX
  130. copy plugins\wdx\rpm_wdx\lib\rpm_wdx.wdx %DC_INSTALL_DIR%\plugins\wdx\rpm_wdx\
  131. diff --git a/install/windows/lib/readme.txt b/install/windows/lib/readme.txt
  132. index 3aa11d8..5223b9d 100644
  133. --- a/install/windows/lib/readme.txt
  134. +++ b/install/windows/lib/readme.txt
  135. @@ -1,2 +1 @@
  136. Before create packages (before run create_packages.bat) copy in this directory third-party libraries:
  137. -- unrar.dll - needed for unrar plugin
  138. \ No newline at end of file
  139. diff --git a/multiarc.ini b/multiarc.ini
  140. index 4b26a72..ba5a916 100644
  141. --- a/multiarc.ini
  142. +++ b/multiarc.ini
  143. @@ -37,89 +37,6 @@ Enabled=0
  144. Output=0
  145. Debug=0
  146. -[ACE]
  147. -Archiver=ace
  148. -Description=ACE v2.0.4
  149. -Extension=ace
  150. -Start=^Date
  151. -End=^listed:
  152. -Format0=dd.tt.yy│hh:mm│ppppppppppp│zzzzzzzzz│ │ n+
  153. -List=%P v -y %AQA
  154. -Extract=%P x -y {-p%W} {%S} %AQA @%LQA
  155. -ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQA
  156. -Test=%P t -y %AQA
  157. -Delete=%P d -y %AQA @%LQA
  158. -Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQA
  159. -AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQA
  160. -Enabled=0
  161. -Output=0
  162. -Debug=0
  163. -
  164. -[ARJ]
  165. -Description=ARJ 3.15 by ARJ Software, Inc.
  166. -Archiver=arj
  167. -ID=60 EA
  168. -IDPos=0
  169. -Extension=arj
  170. -Start=^------------
  171. -End=^------------
  172. -Format0=* nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
  173. -Format1=???????????? zzzzzzzzzz pppppppppp yy-tt-dd hh:mm:ss aaaaaa
  174. -Format2=?
  175. -Format3=?
  176. -List=%P v %AQA
  177. -Extract=%P x -y {-g%W} {%S} %AQA !%LQA
  178. -ExtractWithoutPath=%P e -y {-g%W} {%S} %AQA !%LQA
  179. -Test=%P t -y {%S} %AQA
  180. -Delete=%P d -y {%S} %AQA !%LQA
  181. -Add=%P a -y {-g%W} {-v%V} {%S} %AQA !%LQA
  182. -Enabled=0
  183. -Output=0
  184. -Debug=0
  185. -
  186. -[RAR]
  187. -Description=RAR 4.00 - http://www.rarlab.com
  188. -Extension=rar
  189. -Archiver=rar
  190. -Start=^-----------
  191. -End=^-----------
  192. -Format0=?nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
  193. -Format1=zzzzzzzzzzzzzzzzzzzzzz pppppppp dd-tt-yy hh:mm aaaaaaa
  194. -List=%P v -c- {-p%W} %AQA
  195. -Extract=%P x -y {-p%W} {%S} %AQA @%LQ
  196. -ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQ
  197. -Test=%P t -y {%S} %AQA
  198. -Delete=%P d -y {%S} %AQA @%LQ
  199. -Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQ
  200. -AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQ
  201. -PasswordQuery=Enter password
  202. -Enabled=0
  203. -Output=0
  204. -Debug=0
  205. -
  206. -[RAR (5)]
  207. -Archiver=rar
  208. -Description=RAR 5.x - http://www.rarlab.com
  209. -ID=52 61 72 21
  210. -IDPos=<SeekID>
  211. -IDSeekRange=
  212. -Extension=rar
  213. -Start=^-----------
  214. -End=^-----------
  215. -Format0=?aaaaaaaaaa $z+ yyyy tt dd hh:mm n+
  216. -List=%P l -c- {-p%W} %AQA
  217. -Extract=%P x -y {-p%W} {%S} %AQA @%LQA
  218. -ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQA
  219. -Test=%P t -y {%S} %AQA
  220. -Delete=%P d -y {%S} %AQA @%LQA
  221. -Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQA
  222. -AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQA
  223. -PasswordQuery=Enter password
  224. -FormMode=0
  225. -Enabled=0
  226. -Output=0
  227. -Debug=0
  228. -
  229. [TXZ]
  230. Archiver=tar
  231. Description=Compressed tar file (tar.xz)
  232. diff --git a/plugins/build.bat b/plugins/build.bat
  233. index 2889499..7b9b2ad 100644
  234. --- a/plugins/build.bat
  235. +++ b/plugins/build.bat
  236. @@ -12,7 +12,6 @@ rem WCX plugins
  237. lazbuild wcx\deb\src\deb.lpi %DC_ARCH%
  238. lazbuild wcx\rpm\src\rpm.lpi %DC_ARCH%
  239. lazbuild wcx\sevenzip\src\sevenzipwcx.lpi %DC_ARCH%
  240. -lazbuild wcx\unrar\src\unrar.lpi %DC_ARCH%
  241. lazbuild wcx\zip\src\zip.lpi %DC_ARCH%
  242. rem WDX plugins
  243. diff --git a/plugins/build.sh b/plugins/build.sh
  244. index 4886322..7729101 100755
  245. --- a/plugins/build.sh
  246. +++ b/plugins/build.sh
  247. @@ -15,7 +15,6 @@ cd plugins
  248. $lazbuild wcx/cpio/src/cpio.lpi $DC_ARCH
  249. $lazbuild wcx/deb/src/deb.lpi $DC_ARCH
  250. $lazbuild wcx/rpm/src/rpm.lpi $DC_ARCH
  251. -$lazbuild wcx/unrar/src/unrar.lpi $DC_ARCH
  252. $lazbuild wcx/zip/src/Zip.lpi $DC_ARCH
  253. # WDX plugins
  254. diff --git a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas
  255. index c72b27a..1a8bb43 100644
  256. --- a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas
  257. +++ b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas
  258. @@ -50,10 +50,6 @@ resourcestring
  259. RsCompressionBZip2Name = 'BZIP2 format';
  260. RsCompressionBZip2Extensions = '*.bz2;*.bzip2;*.tbz2;*.tbz';
  261. RsCompressionBZip2SubExtensions = '.tbz2=.tar;.tbz=.tar';
  262. - RsCompressionRarName = 'RAR format';
  263. - RsCompressionRarExtensions = '*.rar;*.r00';
  264. - RsCompressionArjName = 'ARJ format';
  265. - RsCompressionArjExtensions = '*.arj';
  266. RsCompressionZName = 'Z format';
  267. RsCompressionZExtensions = '*.z;*.taz';
  268. RsCompressionZSubExtensions = '.taz=.tar';
  269. diff --git a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
  270. index a43868a..c45c697 100644
  271. --- a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
  272. +++ b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
  273. @@ -122,8 +122,6 @@ uses
  274. | |
  275. | |-- TJclZipDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/
  276. | |-- TJclBZ2DecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/
  277. - | |-- TJclRarDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/
  278. - | |-- TJclArjDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/
  279. | |-- TJclZDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/
  280. | |-- TJclLzhDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/
  281. | |-- TJcl7zDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/
  282. @@ -1492,22 +1490,6 @@ type
  283. procedure SetNumberOfThreads(Value: Cardinal);
  284. end;
  285. - TJclRarDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface)
  286. - public
  287. - class function MultipleItemContainer: Boolean; override;
  288. - class function ArchiveExtensions: string; override;
  289. - class function ArchiveName: string; override;
  290. - class function ArchiveCLSID: TGUID; override;
  291. - end;
  292. -
  293. - TJclArjDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface)
  294. - public
  295. - class function MultipleItemContainer: Boolean; override;
  296. - class function ArchiveExtensions: string; override;
  297. - class function ArchiveName: string; override;
  298. - class function ArchiveCLSID: TGUID; override;
  299. - end;
  300. -
  301. TJclZDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface)
  302. public
  303. class function MultipleItemContainer: Boolean; override;
  304. @@ -4368,8 +4350,6 @@ begin
  305. // register decompression archives
  306. RegisterFormat(TJclZipDecompressArchive);
  307. RegisterFormat(TJclBZ2DecompressArchive);
  308. - RegisterFormat(TJclRarDecompressArchive);
  309. - RegisterFormat(TJclArjDecompressArchive);
  310. RegisterFormat(TJclZDecompressArchive);
  311. RegisterFormat(TJclLzhDecompressArchive);
  312. RegisterFormat(TJcl7zDecompressArchive);
  313. @@ -7984,50 +7964,6 @@ begin
  314. FNumberOfThreads := Value;
  315. end;
  316. -//=== { TJclRarDecompressArchive } ===========================================
  317. -
  318. -class function TJclRarDecompressArchive.ArchiveExtensions: string;
  319. -begin
  320. - Result := LoadResString(@RsCompressionRarExtensions);
  321. -end;
  322. -
  323. -class function TJclRarDecompressArchive.ArchiveName: string;
  324. -begin
  325. - Result := LoadResString(@RsCompressionRarName);
  326. -end;
  327. -
  328. -class function TJclRarDecompressArchive.ArchiveCLSID: TGUID;
  329. -begin
  330. - Result := CLSID_CFormatRar;
  331. -end;
  332. -
  333. -class function TJclRarDecompressArchive.MultipleItemContainer: Boolean;
  334. -begin
  335. - Result := True;
  336. -end;
  337. -
  338. -//=== { TJclArjDecompressArchive } ===========================================
  339. -
  340. -class function TJclArjDecompressArchive.ArchiveExtensions: string;
  341. -begin
  342. - Result := LoadResString(@RsCompressionArjExtensions);
  343. -end;
  344. -
  345. -class function TJclArjDecompressArchive.ArchiveName: string;
  346. -begin
  347. - Result := LoadResString(@RsCompressionArjName);
  348. -end;
  349. -
  350. -class function TJclArjDecompressArchive.ArchiveCLSID: TGUID;
  351. -begin
  352. - Result := CLSID_CFormatArj;
  353. -end;
  354. -
  355. -class function TJclArjDecompressArchive.MultipleItemContainer: Boolean;
  356. -begin
  357. - Result := True;
  358. -end;
  359. -
  360. //=== { TJclZDecompressArchive } =============================================
  361. class function TJclZDecompressArchive.ArchiveExtensions: string;
  362. diff --git a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
  363. index 0853a85..4448860 100644
  364. --- a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
  365. +++ b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
  366. @@ -22,20 +22,6 @@
  367. { library; if not, write to }
  368. { the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA }
  369. { }
  370. -{ unRAR restriction }
  371. -{ ----------------- }
  372. -{ }
  373. -{ The decompression engine for RAR archives was developed using source code of unRAR program. }
  374. -{ All copyrights to original unRAR code are owned by Alexander Roshal. }
  375. -{ }
  376. -{ The license for original unRAR code has the following restriction: }
  377. -{ }
  378. -{ The unRAR sources cannot be used to re-create the RAR compression algorithm, }
  379. -{ which is proprietary. Distribution of modified unRAR sources in separate form }
  380. -{ or as a part of other software is permitted, provided that it is clearly }
  381. -{ stated in the documentation and source comments that the code may }
  382. -{ not be used to develop a RAR (WinRAR) compatible archiver. }
  383. -{ }
  384. {**************************************************************************************************}
  385. { }
  386. { Translation 2007-2008 Florent Ouchet for the JEDI Code Library }
  387. @@ -91,16 +77,11 @@ const
  388. CLSID_CCodecDEFREG : TGUID = '{23170F69-40C1-2790-0801-040000000000}'; // deflate register 040108
  389. CLSID_CCodecLZMA : TGUID = '{23170F69-40C1-2790-0101-030000000000}'; // lzma 030101
  390. CLSID_CCodecPPMD : TGUID = '{23170F69-40C1-2790-0104-030000000000}'; // ppmd 030401
  391. - CLSID_CCodecRAR1 : TGUID = '{23170F69-40C1-2790-0103-040000000000}'; // rar1 040301
  392. - CLSID_CCodecRAR2 : TGUID = '{23170F69-40C1-2790-0203-040000000000}'; // rar2 040302
  393. - CLSID_CCodecRAR3 : TGUID = '{23170F69-40C1-2790-0303-040000000000}'; // rar3 040303
  394. CLSID_CAESCodec : TGUID = '{23170F69-40C1-2790-0107-F10600000000}'; // AES 06F10701
  395. CLSID_CArchiveHandler : TGUID = '{23170F69-40C1-278A-1000-000110000000}';
  396. CLSID_CFormatZip : TGUID = '{23170F69-40C1-278A-1000-000110010000}';
  397. CLSID_CFormatBZ2 : TGUID = '{23170F69-40C1-278A-1000-000110020000}';
  398. - CLSID_CFormatRar : TGUID = '{23170F69-40C1-278A-1000-000110030000}';
  399. - CLSID_CFormatArj : TGUID = '{23170F69-40C1-278A-1000-000110040000}';
  400. CLSID_CFormatZ : TGUID = '{23170F69-40C1-278A-1000-000110050000}';
  401. CLSID_CFormatLzh : TGUID = '{23170F69-40C1-278A-1000-000110060000}';
  402. CLSID_CFormat7z : TGUID = '{23170F69-40C1-278A-1000-000110070000}';
  403. diff --git a/plugins/wcx/zip/src/lzma/Methods.txt b/plugins/wcx/zip/src/lzma/Methods.txt
  404. index 393e1b0..9426718 100644
  405. --- a/plugins/wcx/zip/src/lzma/Methods.txt
  406. +++ b/plugins/wcx/zip/src/lzma/Methods.txt
  407. @@ -73,13 +73,6 @@ List of defined IDs
  408. 12 - BZip2 (not used). Use {04 02 02} instead
  409. 02 - BZip
  410. 02 - BZip2
  411. - 03 - Rar
  412. - 01 - Rar15
  413. - 02 - Rar20
  414. - 03 - Rar29
  415. - 04 - Arj
  416. - 01 - Arj (1,2,3)
  417. - 02 - Arj 4
  418. 05 - Z
  419. 06 - Lzh
  420. 07 - Reserved for 7z
  421. @@ -109,9 +102,6 @@ List of defined IDs
  422. F1 - Misc Ciphers (Combine)
  423. 01 - Zip
  424. 01 - Main Zip crypto algo
  425. - 03 - RAR
  426. - 02 -
  427. - 03 - Rar29 AES-128 + (modified SHA-1)
  428. 07 - 7z
  429. 01 - AES-256 + SHA-256
  430. @@ -126,8 +116,6 @@ List of defined IDs
  431. F0 - Misc Hash
  432. F1 - Misc
  433. - 03 - RAR
  434. - 03 - Rar29 Password Hashing (modified SHA1)
  435. 07 - 7z
  436. 01 - SHA-256 Password Hashing
  437. diff --git a/src/platform/udefaultplugins.pas b/src/platform/udefaultplugins.pas
  438. index b09a728..ee1c29f 100644
  439. --- a/src/platform/udefaultplugins.pas
  440. +++ b/src/platform/udefaultplugins.pas
  441. @@ -192,10 +192,6 @@ begin
  442. gWCXPlugins.FileName[I]:= Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx';
  443. end;
  444. - I:= gWCXPlugins.IndexOfName('arj');
  445. - if I < 0 then
  446. - gWCXPlugins.Add('arj', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx');
  447. -
  448. I:= gWCXPlugins.IndexOfName('cab');
  449. if I < 0 then
  450. gWCXPlugins.Add('cab', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx');
  451. @@ -275,19 +271,6 @@ begin
  452. else
  453. gWCXPlugins.Flags[I]:= 4;
  454. - I:= gWCXPlugins.IndexOfName('rar');
  455. - {$IF DEFINED(MSWINDOWS)}
  456. - if I < 0 then
  457. - gWCXPlugins.Add('rar', 607, Folder + 'unrar' + PathDelim + 'unrar.wcx')
  458. - else
  459. - gWCXPlugins.Flags[I]:= 607;
  460. - {$ELSE}
  461. - if I < 0 then
  462. - gWCXPlugins.Add('rar', 68, Folder + 'unrar' + PathDelim + 'unrar.wcx')
  463. - else
  464. - gWCXPlugins.Flags[I]:= 68;
  465. - {$ENDIF}
  466. -
  467. // Wdx plugins
  468. Folder:= '%commander_path%' + PathDelim + 'plugins' + PathDelim + 'wdx' + PathDelim;