PATCH: [ 1215162 ] Merge7zInstaller update

diff --git a/ArchiveSupport/Merge7zInstaller/Files.rc2 b/ArchiveSupport/Merge7zInstaller/Files.rc2
index f9f6341..b3ed9ac 100755 (executable)
--- a/ArchiveSupport/Merge7zInstaller/Files.rc2
+++ b/ArchiveSupport/Merge7zInstaller/Files.rc2
@@ -1,6 +1,6 @@
 #ifndef IMPORT
 #define IMPORT(name) name
-SYSTEMTIME RCDATA {2005,5,0,26,12,0,0,0}
+SYSTEMTIME RCDATA {2005,6,0,22,12,0,0,0}
 #endif
 
 IMPORT(Merge7z311.dll)                 Merge7z "../Build/MergeRelease/Merge7z311.dll"
@@ -35,78 +35,89 @@ IMPORT(Merge7z418.dll)                      Merge7z "../Build/MergeRelease/Merge7z418.dll"
 IMPORT(Merge7z418U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z418U.dll"
 IMPORT(Merge7z419.dll)                 Merge7z "../Build/MergeRelease/Merge7z419.dll"
 IMPORT(Merge7z419U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z419U.dll"
+IMPORT(Merge7z420.dll)                 Merge7z "../Build/MergeRelease/Merge7z420.dll"
+IMPORT(Merge7z420U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z420U.dll"
 
-IMPORT(7zip_pad.xml)                   7-ZIP   "../../../7z313bin/7zip_pad.xml"
+IMPORT(7zip_pad.xml)                   7-ZIP   "../../../7z420bin/7zip_pad.xml"
 
-IMPORT(Codecs/7zAES.dll)               7-ZIP   "../../../7z313bin/Codecs/7zAES.dll"
-IMPORT(Codecs/AES.dll)                 7-ZIP   "../../../7z313bin/Codecs/AES.dll"
-IMPORT(Codecs/Branch.dll)              7-ZIP   "../../../7z313bin/Codecs/Branch.dll"
-IMPORT(Codecs/BZip2.dll)               7-ZIP   "../../../7z313bin/Codecs/BZip2.dll"
-IMPORT(Codecs/Copy.dll)                        7-ZIP   "../../../7z313bin/Codecs/Copy.dll"
-IMPORT(Codecs/Deflate.dll)             7-ZIP   "../../../7z313bin/Codecs/Deflate.dll"
-IMPORT(Codecs/Implode.dll)             7-ZIP   "../../../7z313bin/Codecs/Implode.dll"
-IMPORT(Codecs/LZMA.dll)                        7-ZIP   "../../../7z313bin/Codecs/LZMA.dll"
-IMPORT(Codecs/PPMD.dll)                        7-ZIP   "../../../7z313bin/Codecs/PPMD.dll"
-IMPORT(Codecs/Rar29.dll)               7-ZIP   "../../../7z313bin/Codecs/Rar29.dll"
-IMPORT(Codecs/Swap.dll)                        7-ZIP   "../../../7z313bin/Codecs/Swap.dll"
+IMPORT(Codecs/7zAES.dll)               7-ZIP   "../../../7z420bin/Codecs/7zAES.dll"
+IMPORT(Codecs/AES.dll)                 7-ZIP   "../../../7z420bin/Codecs/AES.dll"
+IMPORT(Codecs/Branch.dll)              7-ZIP   "../../../7z420bin/Codecs/Branch.dll"
+IMPORT(Codecs/BZip2.dll)               7-ZIP   "../../../7z420bin/Codecs/BZip2.dll"
+IMPORT(Codecs/Copy.dll)                        7-ZIP   "../../../7z420bin/Codecs/Copy.dll"
+IMPORT(Codecs/Deflate.dll)             7-ZIP   "../../../7z420bin/Codecs/Deflate.dll"
+//IMPORT(Codecs/Implode.dll)           7-ZIP   "../../../7z420bin/Codecs/Implode.dll"
+IMPORT(Codecs/LZMA.dll)                        7-ZIP   "../../../7z420bin/Codecs/LZMA.dll"
+IMPORT(Codecs/PPMD.dll)                        7-ZIP   "../../../7z420bin/Codecs/PPMD.dll"
+IMPORT(Codecs/Rar29.dll)               7-ZIP   "../../../7z420bin/Codecs/Rar29.dll"
+IMPORT(Codecs/Swap.dll)                        7-ZIP   "../../../7z420bin/Codecs/Swap.dll"
 
-IMPORT(Formats/7z.dll)                 7-ZIP   "../../../7z313bin/Formats/7z.dll"
-IMPORT(Formats/arj.dll)                        7-ZIP   "../../../7z313bin/Formats/arj.dll"
-IMPORT(Formats/bz2.dll)                        7-ZIP   "../../../7z313bin/Formats/bz2.dll"
-IMPORT(Formats/cab.dll)                        7-ZIP   "../../../7z313bin/Formats/cab.dll"
-IMPORT(Formats/cpio.dll)               7-ZIP   "../../../7z313bin/Formats/cpio.dll"
-IMPORT(Formats/deb.dll)                        7-ZIP   "../../../7z313bin/Formats/deb.dll"
-IMPORT(Formats/gz.dll)                 7-ZIP   "../../../7z313bin/Formats/gz.dll"
-IMPORT(Formats/rar.dll)                        7-ZIP   "../../../7z313bin/Formats/rar.dll"
-IMPORT(Formats/rpm.dll)                        7-ZIP   "../../../7z313bin/Formats/rpm.dll"
-IMPORT(Formats/split.dll)              7-ZIP   "../../../7z313bin/Formats/split.dll"
-IMPORT(Formats/tar.dll)                        7-ZIP   "../../../7z313bin/Formats/tar.dll"
-IMPORT(Formats/zip.dll)                        7-ZIP   "../../../7z313bin/Formats/zip.dll"
+IMPORT(Formats/7z.dll)                 7-ZIP   "../../../7z420bin/Formats/7z.dll"
+IMPORT(Formats/arj.dll)                        7-ZIP   "../../../7z420bin/Formats/arj.dll"
+IMPORT(Formats/bz2.dll)                        7-ZIP   "../../../7z420bin/Formats/bz2.dll"
+IMPORT(Formats/cab.dll)                        7-ZIP   "../../../7z420bin/Formats/cab.dll"
+IMPORT(Formats/cpio.dll)               7-ZIP   "../../../7z420bin/Formats/cpio.dll"
+IMPORT(Formats/deb.dll)                        7-ZIP   "../../../7z420bin/Formats/deb.dll"
+IMPORT(Formats/gz.dll)                 7-ZIP   "../../../7z420bin/Formats/gz.dll"
+IMPORT(Formats/rar.dll)                        7-ZIP   "../../../7z420bin/Formats/rar.dll"
+IMPORT(Formats/rpm.dll)                        7-ZIP   "../../../7z420bin/Formats/rpm.dll"
+IMPORT(Formats/split.dll)              7-ZIP   "../../../7z420bin/Formats/split.dll"
+IMPORT(Formats/tar.dll)                        7-ZIP   "../../../7z420bin/Formats/tar.dll"
+IMPORT(Formats/z.dll)                  7-ZIP   "../../../7z420bin/Formats/z.dll"
+IMPORT(Formats/zip.dll)                        7-ZIP   "../../../7z420bin/Formats/zip.dll"
 
-IMPORT(Lang/af.txt)                            7-ZIP   "../../../7z313bin/Lang/af.txt"
-IMPORT(Lang/ar.txt)                            7-ZIP   "../../../7z313bin/Lang/ar.txt"
-IMPORT(Lang/be.txt)                            7-ZIP   "../../../7z313bin/Lang/be.txt"
-IMPORT(Lang/bg.txt)                            7-ZIP   "../../../7z313bin/Lang/bg.txt"
-IMPORT(Lang/ca.txt)                            7-ZIP   "../../../7z313bin/Lang/ca.txt"
-IMPORT(Lang/cs.txt)                            7-ZIP   "../../../7z313bin/Lang/cs.txt"
-IMPORT(Lang/da.txt)                            7-ZIP   "../../../7z313bin/Lang/da.txt"
-IMPORT(Lang/de.txt)                            7-ZIP   "../../../7z313bin/Lang/de.txt"
-IMPORT(Lang/el.txt)                            7-ZIP   "../../../7z313bin/Lang/el.txt"
-IMPORT(Lang/en.ttt)                            7-ZIP   "../../../7z313bin/Lang/en.ttt"
-IMPORT(Lang/eo.txt)                            7-ZIP   "../../../7z313bin/Lang/eo.txt"
-IMPORT(Lang/es.txt)                            7-ZIP   "../../../7z313bin/Lang/es.txt"
-IMPORT(Lang/et.txt)                            7-ZIP   "../../../7z313bin/Lang/et.txt"
-IMPORT(Lang/fi.txt)                            7-ZIP   "../../../7z313bin/Lang/fi.txt"
-IMPORT(Lang/fr.txt)                            7-ZIP   "../../../7z313bin/Lang/fr.txt"
-//IMPORT(Lang/fur.txt)                 7-ZIP   "../../../7z313bin/Lang/fur.txt"
-//IMPORT(Lang/gl.txt)                          7-ZIP   "../../../7z313bin/Lang/gl.txt"
-IMPORT(Lang/he.txt)                            7-ZIP   "../../../7z313bin/Lang/he.txt"
-IMPORT(Lang/hr.txt)                            7-ZIP   "../../../7z313bin/Lang/hr.txt"
-IMPORT(Lang/hu.txt)                            7-ZIP   "../../../7z313bin/Lang/hu.txt"
-IMPORT(Lang/it.txt)                            7-ZIP   "../../../7z313bin/Lang/it.txt"
-IMPORT(Lang/ja.txt)                            7-ZIP   "../../../7z313bin/Lang/ja.txt"
-IMPORT(Lang/ko.txt)                            7-ZIP   "../../../7z313bin/Lang/ko.txt"
-IMPORT(Lang/lt.txt)                            7-ZIP   "../../../7z313bin/Lang/lt.txt"
-IMPORT(Lang/lv.txt)                            7-ZIP   "../../../7z313bin/Lang/lv.txt"
-//IMPORT(Lang/mk.txt)                          7-ZIP   "../../../7z313bin/Lang/mk.txt"
-//IMPORT(Lang/mn.txt)                          7-ZIP   "../../../7z313bin/Lang/mn.txt"
-IMPORT(Lang/nl.txt)                            7-ZIP   "../../../7z313bin/Lang/nl.txt"
-IMPORT(Lang/no.txt)                            7-ZIP   "../../../7z313bin/Lang/no.txt"
-IMPORT(Lang/pl.txt)                            7-ZIP   "../../../7z313bin/Lang/pl.txt"
-IMPORT(Lang/pt-br.txt)                 7-ZIP   "../../../7z313bin/Lang/pt-br.txt"
-IMPORT(Lang/pt.txt)                            7-ZIP   "../../../7z313bin/Lang/pt.txt"
-IMPORT(Lang/ro.txt)                            7-ZIP   "../../../7z313bin/Lang/ro.txt"
-IMPORT(Lang/ru.txt)                            7-ZIP   "../../../7z313bin/Lang/ru.txt"
-IMPORT(Lang/sk.txt)                            7-ZIP   "../../../7z313bin/Lang/sk.txt"
-IMPORT(Lang/sl.txt)                            7-ZIP   "../../../7z313bin/Lang/sl.txt"
-IMPORT(Lang/sr.txt)                            7-ZIP   "../../../7z313bin/Lang/sr.txt"
-IMPORT(Lang/sv.txt)                            7-ZIP   "../../../7z313bin/Lang/sv.txt"
-//IMPORT(Lang/ta.txt)                          7-ZIP   "../../../7z313bin/Lang/ta.txt"
-//IMPORT(Lang/th.txt)                          7-ZIP   "../../../7z313bin/Lang/th.txt"
-IMPORT(Lang/tr.txt)                            7-ZIP   "../../../7z313bin/Lang/tr.txt"
-IMPORT(Lang/uk.txt)                            7-ZIP   "../../../7z313bin/Lang/uk.txt"
-IMPORT(Lang/va.txt)                            7-ZIP   "../../../7z313bin/Lang/va.txt"
-IMPORT(Lang/vi.txt)                            7-ZIP   "../../../7z313bin/Lang/vi.txt"
-IMPORT(Lang/vr.txt)                            7-ZIP   "../../../7z313bin/Lang/vr.txt"
-IMPORT(Lang/zh-cn.txt)                 7-ZIP   "../../../7z313bin/Lang/zh-cn.txt"
-IMPORT(Lang/zh-tw.txt)                 7-ZIP   "../../../7z313bin/Lang/zh-tw.txt"
+IMPORT(Lang/af.txt)                            7-ZIP   "../../../7z420bin/Lang/af.txt"
+IMPORT(Lang/ar.txt)                            7-ZIP   "../../../7z420bin/Lang/ar.txt"
+IMPORT(Lang/ast.txt)                   7-ZIP   "../../../7z420bin/Lang/ast.txt"
+IMPORT(Lang/az.txt)                            7-ZIP   "../../../7z420bin/Lang/az.txt"
+IMPORT(Lang/be.txt)                            7-ZIP   "../../../7z420bin/Lang/be.txt"
+IMPORT(Lang/bg.txt)                            7-ZIP   "../../../7z420bin/Lang/bg.txt"
+IMPORT(Lang/br.txt)                            7-ZIP   "../../../7z420bin/Lang/br.txt"
+IMPORT(Lang/ca.txt)                            7-ZIP   "../../../7z420bin/Lang/ca.txt"
+IMPORT(Lang/cs.txt)                            7-ZIP   "../../../7z420bin/Lang/cs.txt"
+IMPORT(Lang/da.txt)                            7-ZIP   "../../../7z420bin/Lang/da.txt"
+IMPORT(Lang/de.txt)                            7-ZIP   "../../../7z420bin/Lang/de.txt"
+IMPORT(Lang/el.txt)                            7-ZIP   "../../../7z420bin/Lang/el.txt"
+IMPORT(Lang/en.ttt)                            7-ZIP   "../../../7z420bin/Lang/en.ttt"
+IMPORT(Lang/eo.txt)                            7-ZIP   "../../../7z420bin/Lang/eo.txt"
+IMPORT(Lang/es.txt)                            7-ZIP   "../../../7z420bin/Lang/es.txt"
+IMPORT(Lang/et.txt)                            7-ZIP   "../../../7z420bin/Lang/et.txt"
+IMPORT(Lang/fa.txt)                            7-ZIP   "../../../7z420bin/Lang/fa.txt"
+IMPORT(Lang/fi.txt)                            7-ZIP   "../../../7z420bin/Lang/fi.txt"
+IMPORT(Lang/fr.txt)                            7-ZIP   "../../../7z420bin/Lang/fr.txt"
+IMPORT(Lang/fur.txt)                   7-ZIP   "../../../7z420bin/Lang/fur.txt"
+IMPORT(Lang/fy.txt)                            7-ZIP   "../../../7z420bin/Lang/fy.txt"
+IMPORT(Lang/gl.txt)                            7-ZIP   "../../../7z420bin/Lang/gl.txt"
+IMPORT(Lang/he.txt)                            7-ZIP   "../../../7z420bin/Lang/he.txt"
+IMPORT(Lang/hr.txt)                            7-ZIP   "../../../7z420bin/Lang/hr.txt"
+IMPORT(Lang/hu.txt)                            7-ZIP   "../../../7z420bin/Lang/hu.txt"
+IMPORT(Lang/id.txt)                            7-ZIP   "../../../7z420bin/Lang/id.txt"
+IMPORT(Lang/it.txt)                            7-ZIP   "../../../7z420bin/Lang/it.txt"
+IMPORT(Lang/ja.txt)                            7-ZIP   "../../../7z420bin/Lang/ja.txt"
+IMPORT(Lang/ka.txt)                            7-ZIP   "../../../7z420bin/Lang/ka.txt"
+IMPORT(Lang/ko.txt)                            7-ZIP   "../../../7z420bin/Lang/ko.txt"
+IMPORT(Lang/lt.txt)                            7-ZIP   "../../../7z420bin/Lang/lt.txt"
+IMPORT(Lang/lv.txt)                            7-ZIP   "../../../7z420bin/Lang/lv.txt"
+IMPORT(Lang/mk.txt)                            7-ZIP   "../../../7z420bin/Lang/mk.txt"
+IMPORT(Lang/mn.txt)                            7-ZIP   "../../../7z420bin/Lang/mn.txt"
+IMPORT(Lang/nl.txt)                            7-ZIP   "../../../7z420bin/Lang/nl.txt"
+IMPORT(Lang/no.txt)                            7-ZIP   "../../../7z420bin/Lang/no.txt"
+IMPORT(Lang/pl.txt)                            7-ZIP   "../../../7z420bin/Lang/pl.txt"
+IMPORT(Lang/pt.txt)                            7-ZIP   "../../../7z420bin/Lang/pt.txt"
+IMPORT(Lang/pt-br.txt)                 7-ZIP   "../../../7z420bin/Lang/pt-br.txt"
+IMPORT(Lang/ro.txt)                            7-ZIP   "../../../7z420bin/Lang/ro.txt"
+IMPORT(Lang/ru.txt)                            7-ZIP   "../../../7z420bin/Lang/ru.txt"
+IMPORT(Lang/sk.txt)                            7-ZIP   "../../../7z420bin/Lang/sk.txt"
+IMPORT(Lang/sl.txt)                            7-ZIP   "../../../7z420bin/Lang/sl.txt"
+IMPORT(Lang/sr.txt)                            7-ZIP   "../../../7z420bin/Lang/sr.txt"
+IMPORT(Lang/sv.txt)                            7-ZIP   "../../../7z420bin/Lang/sv.txt"
+IMPORT(Lang/ta.txt)                            7-ZIP   "../../../7z420bin/Lang/ta.txt"
+IMPORT(Lang/th.txt)                            7-ZIP   "../../../7z420bin/Lang/th.txt"
+IMPORT(Lang/tr.txt)                            7-ZIP   "../../../7z420bin/Lang/tr.txt"
+IMPORT(Lang/uk.txt)                            7-ZIP   "../../../7z420bin/Lang/uk.txt"
+IMPORT(Lang/uz.txt)                            7-ZIP   "../../../7z420bin/Lang/uz.txt"
+IMPORT(Lang/va.txt)                            7-ZIP   "../../../7z420bin/Lang/va.txt"
+IMPORT(Lang/vi.txt)                            7-ZIP   "../../../7z420bin/Lang/vi.txt"
+IMPORT(Lang/vr.txt)                            7-ZIP   "../../../7z420bin/Lang/vr.txt"
+IMPORT(Lang/zh-cn.txt)                 7-ZIP   "../../../7z420bin/Lang/zh-cn.txt"
+IMPORT(Lang/zh-tw.txt)                 7-ZIP   "../../../7z420bin/Lang/zh-tw.txt"

diff --git a/ArchiveSupport/Merge7zInstaller/Installer.cpp b/ArchiveSupport/Merge7zInstaller/Installer.cpp
index 021c1c2..03dd03e 100755 (executable)
--- a/ArchiveSupport/Merge7zInstaller/Installer.cpp
+++ b/ArchiveSupport/Merge7zInstaller/Installer.cpp
@@ -33,6 +33,7 @@ DATE:         BY:                                     DESCRIPTION:
                                                                Fix empty path issue with GetFileTitle()
                                                                Accept extraction folder on command line
                                                                Batch options: /standalone, /select, /commit
+2005/05/30     Jochen Tucht            Standalone option now based on 7z420
 */
 
 #include <windows.h>
@@ -350,9 +351,13 @@ BOOL CALLBACK DlgMain_EnableStandalone(HWND hWnd)
 {
        if (IsDlgButtonChecked(hWnd, 205))
        {
-               int lower = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)"Merge7z313.dll");
-               int upper = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)"Merge7z313U.dll");
+               int lower = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)"Merge7z420.dll");
+               int upper = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)"Merge7z420U.dll");
                SendDlgItemMessage(hWnd, 100, LB_SELITEMRANGEEX, lower, upper);
+               if (GetFocus() == GetDlgItem(hWnd, 205))
+               {
+                       SendDlgItemMessage(hWnd, 100, LB_SETTOPINDEX, lower, 0);
+               }
        }
        return TRUE;
 }

diff --git a/ArchiveSupport/Merge7zInstaller/Installer.rc b/ArchiveSupport/Merge7zInstaller/Installer.rc
index 1682edd..70d8722 100755 (executable)
--- a/ArchiveSupport/Merge7zInstaller/Installer.rc
+++ b/ArchiveSupport/Merge7zInstaller/Installer.rc
@@ -68,7 +68,7 @@ BEGIN
     EDITTEXT        203,18,126,232,14,ES_AUTOHSCROLL | WS_DISABLED | 
                     WS_GROUP
     PUSHBUTTON      "&Browse",204,252,126,50,14,WS_DISABLED | WS_GROUP
-    CONTROL         "&Enable standalone operation\nThis option adds required components from 7-Zip 3.13 to program directory.",
+    CONTROL         "&Enable standalone operation\nThis option adds required components from 7-Zip 4.20 to program directory.",
                     205,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
                     WS_DISABLED | WS_TABSTOP,18,142,280,18
     DEFPUSHBUTTON   "OK",IDOK,202,168,50,14,WS_GROUP

diff --git a/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.dsp b/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.dsp
index d415f56..fc92c0d 100755 (executable)
--- a/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.dsp
+++ b/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.dsp
@@ -66,6 +66,10 @@ BuildCmds= \
        del Merge7z.7z \
        del Merge7z.zip \
        mkdir Zip \
+       FOR %%A IN (Zip\*.*) DO del %%A \
+       FOR %%A IN (Zip\Codecs\*.*) DO del %%A \
+       FOR %%A IN (Zip\Formats\*.*) DO del %%A \
+       FOR %%A IN (Zip\Lang\*.*) DO del %%A \
        Merge7zInstaller /commit /standalone /select M M Zip \
        cd Zip \
        7za a ..\Merge7z.7z -r * -mx5 \
@@ -104,20 +108,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /nodefaultlib /pdbtype:sept
-# Begin Custom Build
-OutDir=.\Debug
-InputPath=.\Debug\Merge7zInstaller.exe
-SOURCE="$(InputPath)"
-
-"$(OUTDIR)\Merge7z.7z" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       cd $(OUTDIR) 
-       del Merge7z.7z 
-       mkdir Zip 
-       Merge7zInstaller /commit /standalone /select M M Zip 
-       cd Zip 
-       7za a ..\Merge7z.7z -r * 
-       
-# End Custom Build
 
 !ENDIF