diff --git a/clean.bat b/clean.bat index 2979f6a..965b13a 100644 --- a/clean.bat +++ b/clean.bat @@ -28,7 +28,6 @@ @del /Q /S plugins\wcx\sevenzip\lib\*.* @del /Q /S plugins\wcx\torrent\lib\*.* @del /Q /S plugins\wcx\unbz2\lib\*.* -@del /Q /S plugins\wcx\unrar\lib\*.* @del /Q /S plugins\wcx\zip\lib\*.* @del /Q /S plugins\wdx\deb_wdx\lib\*.* diff --git a/doublecmd.ext.example b/doublecmd.ext.example index 24f4f9b..4e4307d 100644 --- a/doublecmd.ext.example +++ b/doublecmd.ext.example @@ -236,13 +236,6 @@ View={!VIEWER} Extract={!SHELL} lharc x %f '*' #Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi -# arj -[arj] -Open={!VFS} -View={!VIEWER} -Extract={!SHELL} unarj x %f '*' -#Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi - # ha [ha] Open={!VFS} @@ -250,13 +243,6 @@ View={!VIEWER} Extract={!SHELL} ha xy %f '*' # Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I %f; fi -# rar -[rar|r00|r02|r02|r03|r04|r05|r06|r07|r08|r09] -Open={!VFS} -View={!VIEWER} -Extract={!SHELL} rar x -c- %f '*' -# Extract (with flags)=I=%{Enter any RAR flags:}; if test -n "$I";then rar x $I %f; fi - #compress [Z] Open={!VFS} @@ -287,11 +273,6 @@ Open={!VFS} View={!VIEWER} /dev/null?> Uncompress={!SHELL} bunzip %f -# ace -[ace] -Open={!VFS} -Uncompress={!SHELL} unace e %p - # Source RPMs (SuSE uses *.spm, others use *.src.rpm) [spm|srcm] Open={!VFS} diff --git a/install/darwin/install.sh b/install/darwin/install.sh index e201f94..a03953a 100755 --- a/install/darwin/install.sh +++ b/install/darwin/install.sh @@ -17,7 +17,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm -mkdir -p $DC_INSTALL_DIR/plugins/wcx/unrar mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip # WDX plugins directories mkdir -p $DC_INSTALL_DIR/plugins/wdx @@ -43,7 +42,6 @@ cp -a multiarc.ini $DC_INSTALL_DIR/ install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/cpio/ install -m 644 plugins/wcx/deb/lib/deb.wcx $DC_INSTALL_DIR/plugins/wcx/deb/ install -m 644 plugins/wcx/rpm/lib/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/ -install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/ install -m 644 plugins/wcx/zip/zip.wcx $DC_INSTALL_DIR/plugins/wcx/zip/ # WDX install -m 644 plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx $DC_INSTALL_DIR/plugins/wdx/rpm_wdx/ diff --git a/install/darwin/lib/readme.txt b/install/darwin/lib/readme.txt index 5b81e6e..830ba48 100644 --- a/install/darwin/lib/readme.txt +++ b/install/darwin/lib/readme.txt @@ -1,2 +1 @@ Before create packages (before run create_packages.mac) copy in this directory third-party libraries: -- libunrar.dylib - needed for unrar plugin \ No newline at end of file diff --git a/install/linux/install.sh b/install/linux/install.sh index 94a3eba..fbe9001 100755 --- a/install/linux/install.sh +++ b/install/linux/install.sh @@ -49,7 +49,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm -mkdir -p $DC_INSTALL_DIR/plugins/wcx/unrar mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip # WDX plugins directories mkdir -p $DC_INSTALL_DIR/plugins/wdx @@ -80,7 +79,6 @@ cp -a multiarc.ini $DC_INSTALL_DIR/ install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/cpio/ install -m 644 plugins/wcx/deb/lib/deb.wcx $DC_INSTALL_DIR/plugins/wcx/deb/ install -m 644 plugins/wcx/rpm/lib/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/ -install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/ install -m 644 plugins/wcx/zip/zip.wcx $DC_INSTALL_DIR/plugins/wcx/zip/ # WDX install -m 644 plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx $DC_INSTALL_DIR/plugins/wdx/rpm_wdx/ diff --git a/install/linux/lib/readme.txt b/install/linux/lib/readme.txt index 901d6b4..54df3a8 100644 --- a/install/linux/lib/readme.txt +++ b/install/linux/lib/readme.txt @@ -1,3 +1,2 @@ Before create packages (before run create_packages.sh) copy in this directory third-party libraries: -- libunrar.so - needed for unrar plugin -- libqt4intf.so - needed for qt4 version of Double Commander \ No newline at end of file +- libqt4intf.so - needed for qt4 version of Double Commander diff --git a/install/windows/install.bat b/install/windows/install.bat index f79782f..cbc0842 100644 --- a/install/windows/install.bat +++ b/install/windows/install.bat @@ -11,7 +11,6 @@ rem WCX plugins directories mkdir %DC_INSTALL_DIR%\plugins\wcx mkdir %DC_INSTALL_DIR%\plugins\wcx\rpm mkdir %DC_INSTALL_DIR%\plugins\wcx\sevenzip -mkdir %DC_INSTALL_DIR%\plugins\wcx\unrar mkdir %DC_INSTALL_DIR%\plugins\wcx\zip rem WDX plugins directories mkdir %DC_INSTALL_DIR%\plugins\wdx @@ -42,7 +41,6 @@ rem copy plugins rem WCX copy plugins\wcx\rpm\lib\rpm.wcx %DC_INSTALL_DIR%\plugins\wcx\rpm\ copy plugins\wcx\sevenzip\sevenzip.wcx %DC_INSTALL_DIR%\plugins\wcx\sevenzip\ -copy plugins\wcx\unrar\lib\unrar.wcx %DC_INSTALL_DIR%\plugins\wcx\unrar\ copy plugins\wcx\zip\zip.wcx %DC_INSTALL_DIR%\plugins\wcx\zip\ rem WDX copy plugins\wdx\rpm_wdx\lib\rpm_wdx.wdx %DC_INSTALL_DIR%\plugins\wdx\rpm_wdx\ diff --git a/install/windows/lib/readme.txt b/install/windows/lib/readme.txt index 3aa11d8..5223b9d 100644 --- a/install/windows/lib/readme.txt +++ b/install/windows/lib/readme.txt @@ -1,2 +1 @@ Before create packages (before run create_packages.bat) copy in this directory third-party libraries: -- unrar.dll - needed for unrar plugin \ No newline at end of file diff --git a/multiarc.ini b/multiarc.ini index 4b26a72..ba5a916 100644 --- a/multiarc.ini +++ b/multiarc.ini @@ -37,89 +37,6 @@ Enabled=0 Output=0 Debug=0 -[ACE] -Archiver=ace -Description=ACE v2.0.4 -Extension=ace -Start=^Date -End=^listed: -Format0=dd.tt.yy│hh:mm│ppppppppppp│zzzzzzzzz│ │ n+ -List=%P v -y %AQA -Extract=%P x -y {-p%W} {%S} %AQA @%LQA -ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQA -Test=%P t -y %AQA -Delete=%P d -y %AQA @%LQA -Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQA -AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQA -Enabled=0 -Output=0 -Debug=0 - -[ARJ] -Description=ARJ 3.15 by ARJ Software, Inc. -Archiver=arj -ID=60 EA -IDPos=0 -Extension=arj -Start=^------------ -End=^------------ -Format0=* nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn -Format1=???????????? zzzzzzzzzz pppppppppp yy-tt-dd hh:mm:ss aaaaaa -Format2=? -Format3=? -List=%P v %AQA -Extract=%P x -y {-g%W} {%S} %AQA !%LQA -ExtractWithoutPath=%P e -y {-g%W} {%S} %AQA !%LQA -Test=%P t -y {%S} %AQA -Delete=%P d -y {%S} %AQA !%LQA -Add=%P a -y {-g%W} {-v%V} {%S} %AQA !%LQA -Enabled=0 -Output=0 -Debug=0 - -[RAR] -Description=RAR 4.00 - http://www.rarlab.com -Extension=rar -Archiver=rar -Start=^----------- -End=^----------- -Format0=?nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn -Format1=zzzzzzzzzzzzzzzzzzzzzz pppppppp dd-tt-yy hh:mm aaaaaaa -List=%P v -c- {-p%W} %AQA -Extract=%P x -y {-p%W} {%S} %AQA @%LQ -ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQ -Test=%P t -y {%S} %AQA -Delete=%P d -y {%S} %AQA @%LQ -Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQ -AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQ -PasswordQuery=Enter password -Enabled=0 -Output=0 -Debug=0 - -[RAR (5)] -Archiver=rar -Description=RAR 5.x - http://www.rarlab.com -ID=52 61 72 21 -IDPos= -IDSeekRange= -Extension=rar -Start=^----------- -End=^----------- -Format0=?aaaaaaaaaa $z+ yyyy tt dd hh:mm n+ -List=%P l -c- {-p%W} %AQA -Extract=%P x -y {-p%W} {%S} %AQA @%LQA -ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQA -Test=%P t -y {%S} %AQA -Delete=%P d -y {%S} %AQA @%LQA -Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQA -AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQA -PasswordQuery=Enter password -FormMode=0 -Enabled=0 -Output=0 -Debug=0 - [TXZ] Archiver=tar Description=Compressed tar file (tar.xz) diff --git a/plugins/build.bat b/plugins/build.bat index 2889499..7b9b2ad 100644 --- a/plugins/build.bat +++ b/plugins/build.bat @@ -12,7 +12,6 @@ rem WCX plugins lazbuild wcx\deb\src\deb.lpi %DC_ARCH% lazbuild wcx\rpm\src\rpm.lpi %DC_ARCH% lazbuild wcx\sevenzip\src\sevenzipwcx.lpi %DC_ARCH% -lazbuild wcx\unrar\src\unrar.lpi %DC_ARCH% lazbuild wcx\zip\src\zip.lpi %DC_ARCH% rem WDX plugins diff --git a/plugins/build.sh b/plugins/build.sh index 4886322..7729101 100755 --- a/plugins/build.sh +++ b/plugins/build.sh @@ -15,7 +15,6 @@ cd plugins $lazbuild wcx/cpio/src/cpio.lpi $DC_ARCH $lazbuild wcx/deb/src/deb.lpi $DC_ARCH $lazbuild wcx/rpm/src/rpm.lpi $DC_ARCH -$lazbuild wcx/unrar/src/unrar.lpi $DC_ARCH $lazbuild wcx/zip/src/Zip.lpi $DC_ARCH # WDX plugins diff --git a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas index c72b27a..1a8bb43 100644 --- a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas +++ b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas @@ -50,10 +50,6 @@ resourcestring RsCompressionBZip2Name = 'BZIP2 format'; RsCompressionBZip2Extensions = '*.bz2;*.bzip2;*.tbz2;*.tbz'; RsCompressionBZip2SubExtensions = '.tbz2=.tar;.tbz=.tar'; - RsCompressionRarName = 'RAR format'; - RsCompressionRarExtensions = '*.rar;*.r00'; - RsCompressionArjName = 'ARJ format'; - RsCompressionArjExtensions = '*.arj'; RsCompressionZName = 'Z format'; RsCompressionZExtensions = '*.z;*.taz'; RsCompressionZSubExtensions = '.taz=.tar'; diff --git a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas index a43868a..c45c697 100644 --- a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas +++ b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas @@ -122,8 +122,6 @@ uses | | | |-- TJclZipDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ | |-- TJclBZ2DecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ - | |-- TJclRarDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ - | |-- TJclArjDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ | |-- TJclZDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ | |-- TJclLzhDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ | |-- TJcl7zDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ @@ -1492,22 +1490,6 @@ type procedure SetNumberOfThreads(Value: Cardinal); end; - TJclRarDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface) - public - class function MultipleItemContainer: Boolean; override; - class function ArchiveExtensions: string; override; - class function ArchiveName: string; override; - class function ArchiveCLSID: TGUID; override; - end; - - TJclArjDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface) - public - class function MultipleItemContainer: Boolean; override; - class function ArchiveExtensions: string; override; - class function ArchiveName: string; override; - class function ArchiveCLSID: TGUID; override; - end; - TJclZDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface) public class function MultipleItemContainer: Boolean; override; @@ -4368,8 +4350,6 @@ begin // register decompression archives RegisterFormat(TJclZipDecompressArchive); RegisterFormat(TJclBZ2DecompressArchive); - RegisterFormat(TJclRarDecompressArchive); - RegisterFormat(TJclArjDecompressArchive); RegisterFormat(TJclZDecompressArchive); RegisterFormat(TJclLzhDecompressArchive); RegisterFormat(TJcl7zDecompressArchive); @@ -7984,50 +7964,6 @@ begin FNumberOfThreads := Value; end; -//=== { TJclRarDecompressArchive } =========================================== - -class function TJclRarDecompressArchive.ArchiveExtensions: string; -begin - Result := LoadResString(@RsCompressionRarExtensions); -end; - -class function TJclRarDecompressArchive.ArchiveName: string; -begin - Result := LoadResString(@RsCompressionRarName); -end; - -class function TJclRarDecompressArchive.ArchiveCLSID: TGUID; -begin - Result := CLSID_CFormatRar; -end; - -class function TJclRarDecompressArchive.MultipleItemContainer: Boolean; -begin - Result := True; -end; - -//=== { TJclArjDecompressArchive } =========================================== - -class function TJclArjDecompressArchive.ArchiveExtensions: string; -begin - Result := LoadResString(@RsCompressionArjExtensions); -end; - -class function TJclArjDecompressArchive.ArchiveName: string; -begin - Result := LoadResString(@RsCompressionArjName); -end; - -class function TJclArjDecompressArchive.ArchiveCLSID: TGUID; -begin - Result := CLSID_CFormatArj; -end; - -class function TJclArjDecompressArchive.MultipleItemContainer: Boolean; -begin - Result := True; -end; - //=== { TJclZDecompressArchive } ============================================= class function TJclZDecompressArchive.ArchiveExtensions: string; diff --git a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas index 0853a85..4448860 100644 --- a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas +++ b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas @@ -22,20 +22,6 @@ { library; if not, write to } { the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } { } -{ unRAR restriction } -{ ----------------- } -{ } -{ The decompression engine for RAR archives was developed using source code of unRAR program. } -{ All copyrights to original unRAR code are owned by Alexander Roshal. } -{ } -{ The license for original unRAR code has the following restriction: } -{ } -{ The unRAR sources cannot be used to re-create the RAR compression algorithm, } -{ which is proprietary. Distribution of modified unRAR sources in separate form } -{ or as a part of other software is permitted, provided that it is clearly } -{ stated in the documentation and source comments that the code may } -{ not be used to develop a RAR (WinRAR) compatible archiver. } -{ } {**************************************************************************************************} { } { Translation 2007-2008 Florent Ouchet for the JEDI Code Library } @@ -91,16 +77,11 @@ const CLSID_CCodecDEFREG : TGUID = '{23170F69-40C1-2790-0801-040000000000}'; // deflate register 040108 CLSID_CCodecLZMA : TGUID = '{23170F69-40C1-2790-0101-030000000000}'; // lzma 030101 CLSID_CCodecPPMD : TGUID = '{23170F69-40C1-2790-0104-030000000000}'; // ppmd 030401 - CLSID_CCodecRAR1 : TGUID = '{23170F69-40C1-2790-0103-040000000000}'; // rar1 040301 - CLSID_CCodecRAR2 : TGUID = '{23170F69-40C1-2790-0203-040000000000}'; // rar2 040302 - CLSID_CCodecRAR3 : TGUID = '{23170F69-40C1-2790-0303-040000000000}'; // rar3 040303 CLSID_CAESCodec : TGUID = '{23170F69-40C1-2790-0107-F10600000000}'; // AES 06F10701 CLSID_CArchiveHandler : TGUID = '{23170F69-40C1-278A-1000-000110000000}'; CLSID_CFormatZip : TGUID = '{23170F69-40C1-278A-1000-000110010000}'; CLSID_CFormatBZ2 : TGUID = '{23170F69-40C1-278A-1000-000110020000}'; - CLSID_CFormatRar : TGUID = '{23170F69-40C1-278A-1000-000110030000}'; - CLSID_CFormatArj : TGUID = '{23170F69-40C1-278A-1000-000110040000}'; CLSID_CFormatZ : TGUID = '{23170F69-40C1-278A-1000-000110050000}'; CLSID_CFormatLzh : TGUID = '{23170F69-40C1-278A-1000-000110060000}'; CLSID_CFormat7z : TGUID = '{23170F69-40C1-278A-1000-000110070000}'; diff --git a/plugins/wcx/zip/src/lzma/Methods.txt b/plugins/wcx/zip/src/lzma/Methods.txt index 393e1b0..9426718 100644 --- a/plugins/wcx/zip/src/lzma/Methods.txt +++ b/plugins/wcx/zip/src/lzma/Methods.txt @@ -73,13 +73,6 @@ List of defined IDs 12 - BZip2 (not used). Use {04 02 02} instead 02 - BZip 02 - BZip2 - 03 - Rar - 01 - Rar15 - 02 - Rar20 - 03 - Rar29 - 04 - Arj - 01 - Arj (1,2,3) - 02 - Arj 4 05 - Z 06 - Lzh 07 - Reserved for 7z @@ -109,9 +102,6 @@ List of defined IDs F1 - Misc Ciphers (Combine) 01 - Zip 01 - Main Zip crypto algo - 03 - RAR - 02 - - 03 - Rar29 AES-128 + (modified SHA-1) 07 - 7z 01 - AES-256 + SHA-256 @@ -126,8 +116,6 @@ List of defined IDs F0 - Misc Hash F1 - Misc - 03 - RAR - 03 - Rar29 Password Hashing (modified SHA1) 07 - 7z 01 - SHA-256 Password Hashing diff --git a/src/platform/udefaultplugins.pas b/src/platform/udefaultplugins.pas index b09a728..ee1c29f 100644 --- a/src/platform/udefaultplugins.pas +++ b/src/platform/udefaultplugins.pas @@ -192,10 +192,6 @@ begin gWCXPlugins.FileName[I]:= Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx'; end; - I:= gWCXPlugins.IndexOfName('arj'); - if I < 0 then - gWCXPlugins.Add('arj', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx'); - I:= gWCXPlugins.IndexOfName('cab'); if I < 0 then gWCXPlugins.Add('cab', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx'); @@ -275,19 +271,6 @@ begin else gWCXPlugins.Flags[I]:= 4; - I:= gWCXPlugins.IndexOfName('rar'); - {$IF DEFINED(MSWINDOWS)} - if I < 0 then - gWCXPlugins.Add('rar', 607, Folder + 'unrar' + PathDelim + 'unrar.wcx') - else - gWCXPlugins.Flags[I]:= 607; - {$ELSE} - if I < 0 then - gWCXPlugins.Add('rar', 68, Folder + 'unrar' + PathDelim + 'unrar.wcx') - else - gWCXPlugins.Flags[I]:= 68; - {$ENDIF} - // Wdx plugins Folder:= '%commander_path%' + PathDelim + 'plugins' + PathDelim + 'wdx' + PathDelim;