Add versions 7z918 through 7z920 to Merge7zInstaller, and base application specific...

diff --git a/ArchiveSupport/Merge7zInstaller/Files.rc2 b/ArchiveSupport/Merge7zInstaller/Files.rc2
index 1e0c18a..543de3f 100755 (executable)
--- a/ArchiveSupport/Merge7zInstaller/Files.rc2
+++ b/ArchiveSupport/Merge7zInstaller/Files.rc2
@@ -1,7 +1,7 @@
 Files.rc2 RCDATA Files.rc2
 
 #define SHARPEN($) #$
-#define VIIZIP($) $ 7-ZIP SHARPEN(/7z465bin/$)
+#define VIIZIP($) $ 7-ZIP SHARPEN(/7z920bin/$)
 #define MERGE7Z($) $ Merge7z SHARPEN(../../Build/MergeRelease/$)
 #define MERGE7ZU($) $ Merge7z SHARPEN(../../Build/MergeUnicodeRelease/$)
 
@@ -27,6 +27,12 @@ MERGE7Z(Merge7z916.dll)
 MERGE7ZU(Merge7z916U.dll)
 MERGE7Z(Merge7z917.dll)
 MERGE7ZU(Merge7z917U.dll)
+MERGE7Z(Merge7z918.dll)
+MERGE7ZU(Merge7z918U.dll)
+MERGE7Z(Merge7z919.dll)
+MERGE7ZU(Merge7z919U.dll)
+MERGE7Z(Merge7z920.dll)
+MERGE7ZU(Merge7z920U.dll)
 
 VIIZIP(7zip_pad.xml)
 VIIZIP(7z.dll)
@@ -57,7 +63,9 @@ VIIZIP(Lang/fr.txt)
 VIIZIP(Lang/fur.txt)
 VIIZIP(Lang/fy.txt)
 VIIZIP(Lang/gl.txt)
+VIIZIP(Lang/gu.txt)
 VIIZIP(Lang/he.txt)
+VIIZIP(Lang/hi.txt)
 VIIZIP(Lang/hr.txt)
 VIIZIP(Lang/hu.txt)
 VIIZIP(Lang/hy.txt)
@@ -67,6 +75,7 @@ VIIZIP(Lang/is.txt)
 VIIZIP(Lang/it.txt)
 VIIZIP(Lang/ja.txt)
 VIIZIP(Lang/ka.txt)
+VIIZIP(Lang/kk.txt)
 VIIZIP(Lang/ko.txt)
 VIIZIP(Lang/ku.txt)
 VIIZIP(Lang/ku-ckb.txt)
@@ -87,6 +96,7 @@ VIIZIP(Lang/pt.txt)
 VIIZIP(Lang/pt-br.txt)
 VIIZIP(Lang/ro.txt)
 VIIZIP(Lang/ru.txt)
+VIIZIP(Lang/sa.txt)
 VIIZIP(Lang/si.txt)
 VIIZIP(Lang/sk.txt)
 VIIZIP(Lang/sl.txt)
@@ -98,6 +108,7 @@ VIIZIP(Lang/ta.txt)
 VIIZIP(Lang/th.txt)
 VIIZIP(Lang/tr.txt)
 VIIZIP(Lang/tt.txt)
+VIIZIP(Lang/ug.txt)
 VIIZIP(Lang/uk.txt)
 VIIZIP(Lang/uz.txt)
 VIIZIP(Lang/va.txt)

diff --git a/ArchiveSupport/Merge7zInstaller/Installer.cpp b/ArchiveSupport/Merge7zInstaller/Installer.cpp
index 89ba139..ecc995c 100755 (executable)
--- a/ArchiveSupport/Merge7zInstaller/Installer.cpp
+++ b/ArchiveSupport/Merge7zInstaller/Installer.cpp
@@ -34,11 +34,12 @@ DATE:               BY:                                     DESCRIPTION:
                                                                Accept extraction folder on command line
                                                                Batch options: /standalone, /select, /commit
 2010-05-13     Jochen Neubeck          Base application specific installation on 7z465
+2010-12-25     Jochen Neubeck          Base application specific installation on 7z920
 */
 
 #include <windows.h>
 
-#define VERSION7Z 4.65
+#define VERSION7Z 9.20
 
 #define SHARPEN(X) #X
 #define SHARPEN2(X) SHARPEN(X)
@@ -265,11 +266,6 @@ BOOL CALLBACK DlgMain_InitDialog(HWND hWnd, LPARAM lParam)
                {
                        bCommit = TRUE;
                }
-               /*//just for test
-               else if (0 == lstrcmpi(lpArgLower, "\"ping pong\""))
-               {
-                       MessageBox(hWnd, "", lpArgLower, 0);
-               }*/
                else
                {
                        DWORD dwAttributes = GetFileAttributes(lpArgLower);
@@ -376,7 +372,7 @@ BOOL CALLBACK DlgMain_EnableStandalone(HWND hWnd)
        {
                TCHAR buffer[40];
                const UINT major = UINT(VERSION7Z);
-               const UINT minor = UINT(VERSION7Z * 100) % 100;
+               const UINT minor = UINT(VERSION7Z * 100 + 0.5) % 100;
                wsprintf(buffer, "Merge7z%u%02u.dll", major, minor);
                int lower = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)buffer);
                wsprintf(buffer, "Merge7z%u%02uU.dll", major, minor);