Merge7z DllBuild 0018

author Jochen Tucht <jtuc@users.sourceforge.net>

Mon, 7 Aug 2006 19:30:28 +0000 (19:30 +0000)

committer Jochen Tucht <jtuc@users.sourceforge.net>

Mon, 7 Aug 2006 19:30:28 +0000 (19:30 +0000)
author Jochen Tucht <jtuc@users.sourceforge.net>
Mon, 7 Aug 2006 19:30:28 +0000 (19:30 +0000)
committer Jochen Tucht <jtuc@users.sourceforge.net>
Mon, 7 Aug 2006 19:30:28 +0000 (19:30 +0000)
diff --git a/ArchiveSupport/Merge7z/Merge7z311.cpp b/ArchiveSupport/Merge7z/Merge7z311.cpp

index 588aa3f..9adca2f 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z311.cpp
+++ b/ArchiveSupport/Merge7z/Merge7z311.cpp
@@ -32,6 +32,7 @@ DATE:         BY:                                     DESCRIPTION:
  2005/01/15     Jochen Tucht            Changed as explained in revision.txt
  2005/02/26     Jochen Tucht            Changed as explained in revision.txt
  2005/03/19     Jochen Tucht            Don't show error message on intentional abort
+2006/06/28     Jochen Neubeck          Avoid to occasionally prompt for password twice
  */
  
  #include "stdafx.h"
@@ -102,6 +103,7 @@ public:
   */
  Format7zDLL::Interface::Inspector::Inspector(Format7zDLL::Interface *format, LPCTSTR path)
  : format(format), archive(0), file(0), callback(0), path(path), ustrDefaultName(GetUnicodeString(path))
+, passwordIsDefined(false)
  {
  }
  
@@ -117,8 +119,6 @@ void Format7zDLL::Interface::Inspector::Init(HWND hwndParent)
         (callback = callbackImpl) -> AddRef();
         callbackImpl->_passwordIsDefined = false;
         callbackImpl->_parentWindow = hwndParent;
-       /*CMyComBSTR password;
-       callback->CryptoGetTextPassword(&password);*/
         if COMPLAIN(!NFile::NFind::FindFile(path, fileInfo))
         {
                 Complain(ERROR_FILE_NOT_FOUND, path);
@@ -131,6 +131,8 @@ void Format7zDLL::Interface::Inspector::Init(HWND hwndParent)
         {
                 Complain(ERROR_CANT_ACCESS_FILE, path);
         }
+       passwordIsDefined = callbackImpl->_passwordIsDefined;
+       password = callbackImpl->_password;
  }
  
  /**
@@ -156,8 +158,8 @@ HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR fold
                 extractCallbackSpec2->Init
                 (
                         NExtractionMode::NOverwrite::kWithoutPrompt,    // overwriteMode
-                       false,                                                                                  // passwordIsDefined
-                       UString()                                                                               // password
+                       passwordIsDefined,                                                              // passwordIsDefined
+                       password                                                                                // password
                 );
  
                 extractCallbackSpec2->_parentWindow = hwndParent;
diff --git a/ArchiveSupport/Merge7z/Merge7z311.dsp b/ArchiveSupport/Merge7z/Merge7z311.dsp

index 0d2ac01..6993bb1 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z311.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z311.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z311.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z311.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z311 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z311.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z311.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z311.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z311.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z311 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z311.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z311U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z311U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z311U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z311U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z311 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z311.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z311U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z311U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z311\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z311\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z311\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z311\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z311\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z311\7zip\FileManager\UpdateCallback100.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z312.dsp b/ArchiveSupport/Merge7z/Merge7z312.dsp

index 654eba3..43e9556 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z312.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z312.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z312.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z312.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z312 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z312.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z312.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z312.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z312.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z312 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z312.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z312U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z312U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z312U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z312U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z312 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z312.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z312U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z312U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z312\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z312\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z312\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z312\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z312\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z312\7zip\FileManager\UpdateCallback100.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z313.dsp b/ArchiveSupport/Merge7z/Merge7z313.dsp

index abf2f53..17dc92f 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z313.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z313.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z313.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z313.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z313 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z313.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z313.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z313.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z313.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z313 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z313.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z313U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z313U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z313U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z313U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z313 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z313.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z313U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z313U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z313\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z313\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z313\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z313\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z313\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z313\7zip\FileManager\UpdateCallback100.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z407.dsp b/ArchiveSupport/Merge7z/Merge7z407.dsp

index 644106f..b89fbdb 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z407.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z407.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z407.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z407.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z407 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z407.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z407.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z407.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z407.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z407 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z407.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z407U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z407U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z407U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z407U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z407 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z407.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z407U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z407U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z407\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z407\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z407\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z407\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z407\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z407\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z408.dsp b/ArchiveSupport/Merge7z/Merge7z408.dsp

index 24ba820..af20d10 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z408.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z408.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z408.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z408.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z408 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z408.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z408.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z408.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z408.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z408 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z408.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z408U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z408U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z408U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z408U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z408 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z408.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z408U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z408U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z408\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z408\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z408\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z408\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z408\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z408\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z409.cpp b/ArchiveSupport/Merge7z/Merge7z409.cpp

index 16817f0..81c57b8 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z409.cpp
+++ b/ArchiveSupport/Merge7z/Merge7z409.cpp
@@ -33,6 +33,7 @@ DATE:         BY:                                     DESCRIPTION:
  2005/01/15     Jochen Tucht            Changed as explained in revision.txt
  2005/02/26     Jochen Tucht            Changed as explained in revision.txt
  2005/03/19     Jochen Tucht            Don't show error message on intentional abort
+2006/06/28     Jochen Neubeck          Avoid to occasionally prompt for password twice
  */
  
  #include "stdafx.h"
@@ -132,6 +133,8 @@ void Format7zDLL::Interface::Inspector::Init(HWND hwndParent)
         {
                 Complain(ERROR_CANT_ACCESS_FILE, path);
         }
+       passwordIsDefined = callbackImpl->PasswordIsDefined;
+       password = callbackImpl->Password;
  }
  
  /**
@@ -158,6 +161,8 @@ HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR fold
  
                 extractCallbackSpec2->ParentWindow = hwndParent;
                 extractCallbackSpec2->OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt;
+               extractCallbackSpec2->PasswordIsDefined = passwordIsDefined;
+               extractCallbackSpec2->Password = password;
  
                 extractCallbackSpec2->ProgressDialog.MainWindow = 0;
                 (extractCallbackSpec = new CArchiveExtractCallback) -> AddRef();
diff --git a/ArchiveSupport/Merge7z/Merge7z409.dsp b/ArchiveSupport/Merge7z/Merge7z409.dsp

index 393fcf6..597250a 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z409.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z409.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z409.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z409.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z409 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z409.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z409.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z409.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z409.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z409 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z409.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z409U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z409U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z409U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z409U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z409 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z409.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z409U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z409U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z409\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z409\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z409\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z409\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z409\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z409\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z410.dsp b/ArchiveSupport/Merge7z/Merge7z410.dsp

index 2da17a9..a086740 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z410.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z410.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z410.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z410.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z410 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z410.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z410.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z410.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z410.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z410 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z410.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z410U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z410U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z410U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z410U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z410 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z410.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z410U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z410U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z410\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z410\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z410\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z410\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z410\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z410\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z411.dsp b/ArchiveSupport/Merge7z/Merge7z411.dsp

index 0d3a3b1..7e29d2f 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z411.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z411.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z411.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z411.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z411 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z411.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z411.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z411.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z411.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z411 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z411.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z411U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z411U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z411U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z411U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z411 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z411.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z411U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z411U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z411\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z411\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z411\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z411\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z411\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z411\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z412.dsp b/ArchiveSupport/Merge7z/Merge7z412.dsp

index 2e27732..a521287 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z412.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z412.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z412.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z412.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z412 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z412.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z412.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z412.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z412.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z412 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z412.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z412U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z412U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z412U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z412U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z412 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z412.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z412U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z412U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z412\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z412\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z412\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z412\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z412\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z412\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z413.dsp b/ArchiveSupport/Merge7z/Merge7z413.dsp

index e84508d..b5f086c 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z413.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z413.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z413.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z413.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z413 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z413.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z413.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z413.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z413.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z413 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z413.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z413U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z413U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z413U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z413U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z413 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z413.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z413U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z413U.dll"
  
  !ENDIF 
  
@@ -405,23 +405,6 @@ SOURCE=..\..\..\7z413\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z413\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z413\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z413\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z413\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z413\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z414.dsp b/ArchiveSupport/Merge7z/Merge7z414.dsp

index 997f8f7..4c96bb6 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z414.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z414.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z414.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z414.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z414 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z414.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z414.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z414.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z414.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z414 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z414.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z414U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z414U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z414U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z414U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z414 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z414.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z414U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z414U.dll"
  
  !ENDIF 
  
@@ -421,23 +421,6 @@ SOURCE=..\..\..\7z414\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z414\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z414\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z414\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z414\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z414\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z415.dsp b/ArchiveSupport/Merge7z/Merge7z415.dsp

index 1a8cd87..a95a4b2 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z415.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z415.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z415.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z415.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z415 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z415.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z415.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z415.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z415.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z415 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z415.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z415U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z415U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z415U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z415U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z415 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z415.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z415U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z415U.dll"
  
  !ENDIF 
  
@@ -349,14 +349,6 @@ SOURCE=..\..\..\7z415\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z415\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z415\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z415\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -409,14 +401,6 @@ SOURCE=..\..\..\7z415\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z415\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z415\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z415\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -453,23 +437,6 @@ SOURCE=..\..\..\7z415\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z415\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z415\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z415\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z415\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z415\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z416.dsp b/ArchiveSupport/Merge7z/Merge7z416.dsp

index 88715ad..9f4201f 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z416.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z416.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z416.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z416.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z416 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z416.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z416.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z416.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z416.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z416 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z416.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z416U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z416U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z416U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z416U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z416 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z416.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z416U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z416U.dll"
  
  !ENDIF 
  
@@ -349,14 +349,6 @@ SOURCE=..\..\..\7z416\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z416\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z416\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z416\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -409,14 +401,6 @@ SOURCE=..\..\..\7z416\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z416\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z416\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z416\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -453,23 +437,6 @@ SOURCE=..\..\..\7z416\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z416\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z416\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z416\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z416\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z416\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z417.dsp b/ArchiveSupport/Merge7z/Merge7z417.dsp

index 7bd2da3..b3f1581 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z417.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z417.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z417.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z417.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z417 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z417.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z417.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z417.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z417.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z417 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z417.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z417U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z417U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z417U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z417U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z417 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z417.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z417U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z417U.dll"
  
  !ENDIF 
  
@@ -349,14 +349,6 @@ SOURCE=..\..\..\7z417\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z417\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z417\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z417\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -409,14 +401,6 @@ SOURCE=..\..\..\7z417\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z417\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z417\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z417\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -453,23 +437,6 @@ SOURCE=..\..\..\7z417\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z417\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z417\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z417\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z417\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z417\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z418.dsp b/ArchiveSupport/Merge7z/Merge7z418.dsp

index 5d44e0a..7ec5772 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z418.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z418.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z418.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z418.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z418 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z418.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z418.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z418.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z418.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z418 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z418.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z418U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z418U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z418U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z418U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z418 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z418.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z418U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z418U.dll"
  
  !ENDIF 
  
@@ -349,14 +349,6 @@ SOURCE=..\..\..\7z418\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z418\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z418\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z418\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -409,14 +401,6 @@ SOURCE=..\..\..\7z418\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z418\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z418\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z418\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -453,23 +437,6 @@ SOURCE=..\..\..\7z418\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z418\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z418\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z418\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z418\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z418\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z419.dsp b/ArchiveSupport/Merge7z/Merge7z419.dsp

index 3f5b8f0..6277c12 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z419.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z419.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z419.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z419.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z419 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z419.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z419.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z419.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z419.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z419 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z419.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z419U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z419U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z419U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z419U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z419 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z419.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z419U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z419U.dll"
  
  !ENDIF 
  
@@ -349,14 +349,6 @@ SOURCE=..\..\..\7z419\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z419\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z419\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z419\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -409,14 +401,6 @@ SOURCE=..\..\..\7z419\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z419\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z419\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z419\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -453,23 +437,6 @@ SOURCE=..\..\..\7z419\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z419\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z419\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z419\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z419\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z419\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z420.dsp b/ArchiveSupport/Merge7z/Merge7z420.dsp

index a2f57b1..2306556 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z420.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z420.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z420.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z420.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z420 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z420.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z420.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z420.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z420.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z420 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z420.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z420U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z420U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z420U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z420U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z420 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z420.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z420U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z420U.dll"
  
  !ENDIF 
  
@@ -349,14 +349,6 @@ SOURCE=..\..\..\7z420\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z420\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z420\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z420\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -409,14 +401,6 @@ SOURCE=..\..\..\7z420\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z420\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z420\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z420\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -453,23 +437,6 @@ SOURCE=..\..\..\7z420\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z420\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z420\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z420\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z420\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z420\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z423.dsp b/ArchiveSupport/Merge7z/Merge7z423.dsp

index cf520ab..c70e86b 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z423.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z423.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z423.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z423.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z423 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z423.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z423.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z423.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z423.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z423 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z423.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z423U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z423U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z423U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z423U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z423 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z423.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z423U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z423U.dll"
  
  !ENDIF 
  
@@ -349,14 +349,6 @@ SOURCE=..\..\..\7z423\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z423\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z423\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z423\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -409,14 +401,6 @@ SOURCE=..\..\..\7z423\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z423\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z423\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z423\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -453,23 +437,6 @@ SOURCE=..\..\..\7z423\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z423\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z423\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z423\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z423\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z423\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z424.dsp b/ArchiveSupport/Merge7z/Merge7z424.dsp

index daa39f3..06d92c9 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z424.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z424.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z424.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z424.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z424 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z424.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z424.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z424.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z424.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z424 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z424.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z424U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z424U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z424U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z424U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z424 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z424.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z424U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z424U.dll"
  
  !ENDIF 
  
@@ -349,14 +349,6 @@ SOURCE=..\..\..\7z424\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z424\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z424\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z424\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -409,14 +401,6 @@ SOURCE=..\..\..\7z424\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z424\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z424\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z424\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -453,23 +437,6 @@ SOURCE=..\..\..\7z424\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z424\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z424\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z424\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z424\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z424\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z425.dsp b/ArchiveSupport/Merge7z/Merge7z425.dsp

index 53c99ea..0f48d22 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z425.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z425.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z425.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z425.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z425 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z425.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z425.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z425.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z425.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z425 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z425.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z425U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z425U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z425U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z425U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z425 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z425.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z425U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z425U.dll"
  
  !ENDIF 
  
@@ -357,14 +357,6 @@ SOURCE=..\..\..\7z425\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z425\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z425\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z425\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -417,14 +409,6 @@ SOURCE=..\..\..\7z425\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z425\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z425\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z425\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -461,23 +445,6 @@ SOURCE=..\..\..\7z425\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z425\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z425\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z425\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z425\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z425\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z426.dsp b/ArchiveSupport/Merge7z/Merge7z426.dsp

index a6f6cdb..6949d75 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z426.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z426.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z426.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z426.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z426 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z426.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z426.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z426.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z426.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z426 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z426.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z426U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z426U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z426U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z426U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z426 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z426.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z426U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z426U.dll"
  
  !ENDIF 
  
@@ -357,14 +357,6 @@ SOURCE=..\..\..\7z426\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z426\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z426\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z426\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -417,14 +409,6 @@ SOURCE=..\..\..\7z426\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z426\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z426\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z426\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -461,23 +445,6 @@ SOURCE=..\..\..\7z426\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z426\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z426\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z426\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z426\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z426\7zip\UI\Common\UpdateCallback.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z427.dsp b/ArchiveSupport/Merge7z/Merge7z427.dsp

index d958f50..1a731f4 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z427.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z427.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z427.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z427.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z427 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z427.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z427.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z427.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z427.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z427 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z427.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z427U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z427U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z427U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z427U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z427 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z427.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z427U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z427U.dll"
  
  !ENDIF 
  
@@ -357,14 +357,6 @@ SOURCE=..\..\..\7z427\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z427\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z427\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z427\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -417,14 +409,6 @@ SOURCE=..\..\..\7z427\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z427\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z427\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z427\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -461,23 +445,6 @@ SOURCE=..\..\..\7z427\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z427\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z427\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z427\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z427\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z427\7zip\Common\StreamUtils.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z428.dsp b/ArchiveSupport/Merge7z/Merge7z428.dsp

index 29a5bad..bd5ebdc 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z428.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z428.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z428.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z428.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z428 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z428.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z428.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z428.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z428.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z428 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z428.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z428U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z428U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z428U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z428U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z428 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z428.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z428U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z428U.dll"
  
  !ENDIF 
  
@@ -357,14 +357,6 @@ SOURCE=..\..\..\7z428\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z428\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z428\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z428\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -417,14 +409,6 @@ SOURCE=..\..\..\7z428\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z428\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z428\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z428\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -461,23 +445,6 @@ SOURCE=..\..\..\7z428\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z428\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z428\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z428\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z428\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z428\7zip\Common\StreamUtils.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z429.dsp b/ArchiveSupport/Merge7z/Merge7z429.dsp

index 29bb546..52863be 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z429.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z429.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z429.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z429.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z429 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z429.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z429.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z429.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z429.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z429 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z429.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z429U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z429U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z429U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z429U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z429 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z429.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z429U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z429U.dll"
  
  !ENDIF 
  
@@ -357,14 +357,6 @@ SOURCE=..\..\..\7z429\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z429\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z429\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z429\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -417,14 +409,6 @@ SOURCE=..\..\..\7z429\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z429\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z429\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z429\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -461,23 +445,6 @@ SOURCE=..\..\..\7z429\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z429\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z429\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z429\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z429\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z429\7zip\Common\StreamUtils.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z430.dsp b/ArchiveSupport/Merge7z/Merge7z430.dsp

index 92f4884..6c1794a 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z430.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z430.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z430.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z430.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z430 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z430.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z430.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z430.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z430.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z430 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z430.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z430U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z430U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z430U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z430U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z430 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z430.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z430U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z430U.dll"
  
  !ENDIF 
  
@@ -357,14 +357,6 @@ SOURCE=..\..\..\7z430\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z430\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z430\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z430\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -417,14 +409,6 @@ SOURCE=..\..\..\7z430\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z430\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z430\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z430\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -461,23 +445,6 @@ SOURCE=..\..\..\7z430\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z430\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z430\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z430\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z430\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z430\7zip\Common\StreamUtils.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z431.dsp b/ArchiveSupport/Merge7z/Merge7z431.dsp

index 32edf24..0d0e6df 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z431.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z431.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z431.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z431.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z431 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z431.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z431.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z431.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z431.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z431 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z431.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z431U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z431U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z431U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z431U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z431 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z431.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z431U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z431U.dll"
  
  !ENDIF 
  
@@ -357,14 +357,6 @@ SOURCE=..\..\..\7z431\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z431\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z431\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z431\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -417,14 +409,6 @@ SOURCE=..\..\..\7z431\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z431\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z431\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z431\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -461,23 +445,6 @@ SOURCE=..\..\..\7z431\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z431\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z431\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z431\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z431\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z431\7zip\Common\StreamUtils.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z432.dsp b/ArchiveSupport/Merge7z/Merge7z432.dsp

index e1feb73..fc507bc 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z432.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z432.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z432.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z432.dll"
  
  !ELSEIF  "$(CFG)" == "Merge7z432 - Win32 Debug"
  
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z432.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z432.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z432.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z432.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z432 - Win32 UnicodeDebug"
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z432.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z432U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z432U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z432U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z432U.dll"
  # SUBTRACT LINK32 /pdb:none /map
  
  !ELSEIF  "$(CFG)" == "Merge7z432 - Win32 UnicodeRelease"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z432.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z432U.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z432U.dll"
  
  !ENDIF 
  
@@ -357,14 +357,6 @@ SOURCE=..\..\..\7z432\7zip\UI\Common\ArchiveOpenCallback.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z432\7zip\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z432\7zip\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z432\7zip\UI\Common\DefaultName.cpp
  # End Source File
  # Begin Source File
@@ -417,14 +409,6 @@ SOURCE=..\..\..\7z432\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cp
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z432\7zip\UI\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z432\7zip\UI\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z432\7zip\FileManager\OpenCallback.cpp
  # End Source File
  # Begin Source File
@@ -461,23 +445,6 @@ SOURCE=..\..\..\7z432\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
  # End Source File
  # Begin Source File
  
-SOURCE=..\..\..\7z432\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z432\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z432\7zip\FileManager\RegistryUtils.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\7z432\7zip\FileManager\RegistryUtils.h
-# End Source File
-# Begin Source File
-
  SOURCE=..\..\..\7z432\7zip\Common\StreamUtils.cpp
  # End Source File
  # Begin Source File
diff --git a/ArchiveSupport/Merge7z/Merge7z433.dsp b/ArchiveSupport/Merge7z/Merge7z433.dsp

new file mode 100755 (executable)

index 0000000..2c1a8b7
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z433.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z433" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z433 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z433.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z433.mak" CFG="Merge7z433 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z433 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z433 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z433 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z433 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z433 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z433___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z433___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z433" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z433_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z433.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z433 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z433___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z433___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z433" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z433_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z433.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z433.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z433 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z433___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z433___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z433___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z433___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z433" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z433" /D "Merge7z433_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z433.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z433U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z433U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z433 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z433___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z433___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z433___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z433___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z433" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z433" /D "Merge7z433_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z433.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z433U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z433 - Win32 Release"
+# Name "Merge7z433 - Win32 Debug"
+# Name "Merge7z433 - Win32 UnicodeDebug"
+# Name "Merge7z433 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z433\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z433\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7z434.dsp b/ArchiveSupport/Merge7z/Merge7z434.dsp

new file mode 100755 (executable)

index 0000000..6c50b85
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z434.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z434" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z434 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z434.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z434.mak" CFG="Merge7z434 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z434 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z434 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z434 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z434 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z434 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z434___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z434___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z434" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z434_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z434.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z434 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z434___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z434___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z434" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z434_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z434.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z434.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z434 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z434___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z434___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z434___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z434___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z434" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z434" /D "Merge7z434_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z434.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z434U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z434U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z434 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z434___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z434___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z434___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z434___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z434" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z434" /D "Merge7z434_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z434.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z434U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z434 - Win32 Release"
+# Name "Merge7z434 - Win32 Debug"
+# Name "Merge7z434 - Win32 UnicodeDebug"
+# Name "Merge7z434 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z434\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z434\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7z435.dsp b/ArchiveSupport/Merge7z/Merge7z435.dsp

new file mode 100755 (executable)

index 0000000..f5cd0f2
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z435.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z435" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z435 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z435.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z435.mak" CFG="Merge7z435 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z435 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z435 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z435 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z435 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z435 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z435___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z435___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z435" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z435_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z435.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z435 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z435___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z435___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z435" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z435_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z435.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z435.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z435 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z435___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z435___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z435___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z435___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z435" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z435" /D "Merge7z435_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z435.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z435U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z435U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z435 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z435___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z435___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z435___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z435___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z435" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z435" /D "Merge7z435_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z435.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z435U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z435 - Win32 Release"
+# Name "Merge7z435 - Win32 Debug"
+# Name "Merge7z435 - Win32 UnicodeDebug"
+# Name "Merge7z435 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z435\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z435\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7z436.dsp b/ArchiveSupport/Merge7z/Merge7z436.dsp

new file mode 100755 (executable)

index 0000000..8982a0f
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z436.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z436" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z436 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z436.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z436.mak" CFG="Merge7z436 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z436 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z436 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z436 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z436 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z436 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z436___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z436___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z436" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z436_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z436.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z436 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z436___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z436___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z436" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z436_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z436.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z436.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z436 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z436___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z436___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z436___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z436___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z436" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z436" /D "Merge7z436_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z436.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z436U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z436U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z436 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z436___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z436___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z436___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z436___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z436" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z436" /D "Merge7z436_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z436.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z436U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z436 - Win32 Release"
+# Name "Merge7z436 - Win32 Debug"
+# Name "Merge7z436 - Win32 UnicodeDebug"
+# Name "Merge7z436 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z436\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z436\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7z437.dsp b/ArchiveSupport/Merge7z/Merge7z437.dsp

new file mode 100755 (executable)

index 0000000..c1569a5
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z437.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z437" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z437 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z437.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z437.mak" CFG="Merge7z437 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z437 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z437 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z437 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z437 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z437 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z437___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z437___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z437" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z437_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z437.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z437 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z437___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z437___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z437" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z437_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z437.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z437.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z437 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z437___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z437___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z437___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z437___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z437" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z437" /D "Merge7z437_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z437.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z437U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z437U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z437 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z437___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z437___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z437___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z437___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z437" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z437" /D "Merge7z437_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z437.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z437U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z437 - Win32 Release"
+# Name "Merge7z437 - Win32 Debug"
+# Name "Merge7z437 - Win32 UnicodeDebug"
+# Name "Merge7z437 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z437\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z437\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7z438.dsp b/ArchiveSupport/Merge7z/Merge7z438.dsp

new file mode 100755 (executable)

index 0000000..246b200
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z438.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z438" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z438 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z438.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z438.mak" CFG="Merge7z438 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z438 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z438 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z438 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z438 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z438 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z438___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z438___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z438" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z438_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z438.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z438 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z438___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z438___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z438" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z438_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z438.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z438.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z438 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z438___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z438___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z438___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z438___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z438" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z438" /D "Merge7z438_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z438.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z438U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z438U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z438 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z438___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z438___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z438___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z438___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z438" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z438" /D "Merge7z438_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z438.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z438U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z438 - Win32 Release"
+# Name "Merge7z438 - Win32 Debug"
+# Name "Merge7z438 - Win32 UnicodeDebug"
+# Name "Merge7z438 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z438\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z438\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7z439.dsp b/ArchiveSupport/Merge7z/Merge7z439.dsp

new file mode 100755 (executable)

index 0000000..cf92cae
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z439.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z439" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z439 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z439.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z439.mak" CFG="Merge7z439 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z439 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z439 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z439 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z439 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z439 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z439___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z439___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z439" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z439_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z439.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z439 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z439___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z439___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z439" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z439_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z439.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z439.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z439 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z439___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z439___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z439___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z439___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z439" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z439" /D "Merge7z439_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z439.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z439U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z439U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z439 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z439___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z439___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z439___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z439___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z439" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z439" /D "Merge7z439_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z439.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z439U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z439 - Win32 Release"
+# Name "Merge7z439 - Win32 Debug"
+# Name "Merge7z439 - Win32 UnicodeDebug"
+# Name "Merge7z439 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z439\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z439\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7z440.dsp b/ArchiveSupport/Merge7z/Merge7z440.dsp

new file mode 100755 (executable)

index 0000000..2c2815e
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z440.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z440" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z440 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z440.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z440.mak" CFG="Merge7z440 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z440 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z440 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z440 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z440 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z440 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z440___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z440___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z440" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z440_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z440.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z440 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z440___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z440___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z440" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z440_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z440.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z440.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z440 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z440___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z440___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z440___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z440___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z440" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z440" /D "Merge7z440_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z440.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z440U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z440U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z440 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z440___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z440___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z440___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z440___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z440" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z440" /D "Merge7z440_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z440.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z440U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z440 - Win32 Release"
+# Name "Merge7z440 - Win32 Debug"
+# Name "Merge7z440 - Win32 UnicodeDebug"
+# Name "Merge7z440 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z440\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z440\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7z442.dsp b/ArchiveSupport/Merge7z/Merge7z442.dsp

new file mode 100755 (executable)

index 0000000..cf89017
--- /dev/null
+++ b/ArchiveSupport/Merge7z/Merge7z442.dsp
@@ -0,0 +1,548 @@
+# Microsoft Developer Studio Project File - Name="Merge7z442" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=Merge7z442 - Win32 UnicodeDebug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z442.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Merge7z442.mak" CFG="Merge7z442 - Win32 UnicodeDebug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Merge7z442 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z442 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z442 - Win32 UnicodeDebug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Merge7z442 - Win32 UnicodeRelease" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Merge7z442 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z442___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z442___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z442" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z442_EXPORTS" /FR /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z442.dll"
+
+!ELSEIF  "$(CFG)" == "Merge7z442 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z442___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z442___Win32_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z442" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z442_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z442.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z442.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z442 - Win32 UnicodeDebug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z442___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z442___Win32_UnicodeDebug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\BuildTmp\Merge7z442___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z442___Win32_UnicodeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z442" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z442" /D "Merge7z442_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z442.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z442U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z442U.dll"
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "Merge7z442 - Win32 UnicodeRelease"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z442___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z442___Win32_UnicodeRelease"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\BuildTmp\Merge7z442___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z442___Win32_UnicodeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z442" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z442" /D "Merge7z442_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z442.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z442U.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Merge7z442 - Win32 Release"
+# Name "Merge7z442 - Win32 Debug"
+# Name "Merge7z442 - Win32 UnicodeDebug"
+# Name "Merge7z442 - Win32 UnicodeRelease"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Merge7z.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7z409.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Merge7zCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tools.h
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Ui\Gui\FM.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\GUI\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Ui\Gui\resource.rc
+# End Source File
+# End Group
+# Begin Group "Windows"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\DLL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\DLL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\Error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\Error.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\FileIO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\FileIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\PropVariantConversions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\PropVariantConversions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\ResourceString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\ResourceString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\Synchronization.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\Synchronization.h
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\IntToString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\IntToString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\Lang.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\Lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\StdInStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\StdInStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\String.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\String.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\StringConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\StringConvert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\TextConfig.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\TextConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\UTFConvert.h
+# End Source File
+# End Group
+# Begin Group "7zip Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Ui\Common\ArchiveExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\Common\ArchiveExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\Common\ArchiveOpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\Common\ArchiveOpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\Common\DefaultName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\Common\DefaultName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\Control\Dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\Control\Dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\ExtractCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\ExtractCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Common\FileStreams.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Common\FileStreams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\FormatUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\FormatUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\LangUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\LangUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\OpenCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\OpenCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\ProgramLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\ProgramLocation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Common\StreamUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\Common\UpdateCallback.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\Common\UpdateCallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\GUI\UpdateCallbackGUI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\GUI\UpdateCallbackGUI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\Window.h
+# End Source File
+# End Group
+# Begin Group "Extract"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Ui\Common\ExtractingFilePath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\UI\Common\ExtractingFilePath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\FileDir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\FileDir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\FileFind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\FileFind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\FileName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Windows\FileName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Common\FilePathAutoRename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Common\FilePathAutoRename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\Vector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\Vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\Wildcard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\7z442\Common\Wildcard.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\7z442\7zip\Ui\Gui\7zG.exe.manifest
+# End Source File
+# Begin Source File
+
+SOURCE=.\revision.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.cpp b/ArchiveSupport/Merge7z/Merge7zCommon.cpp

index 5c69127..d49d906 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.cpp
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
@@ -36,6 +36,8 @@ DATE:         BY:                                     DESCRIPTION:
                                                                 somewhat changed so I can no longer use it.
  2005/10/02     Jochen Tucht            Add CHM format
  2005/11/19     Jochen Tucht            Minor changes to build against 7z430 beta
+2006/06/28     Jochen Neubeck          Add ISO format (introduced with 7z436 beta)
+                                                               Add NSIS format (introduced with 7z440 beta)
  */
  
  #include "stdafx.h"
@@ -636,6 +638,8 @@ DEFINE_FORMAT(CTarHandler,          "TAR.DLL",              "tar", "");
  DEFINE_FORMAT(CZHandler,               "Z.DLL",                "z", "@\x1F\x9D");
  DEFINE_FORMAT(CZipHandler,             "ZIP.DLL",              "zip jar war ear xpi", "@PK\x03\x04");
  DEFINE_FORMAT(CChmHandler,             "CHM.DLL",              "chm chi chq chw hxs hxi hxr hxq hxw lit", "@ITSF");
+DEFINE_FORMAT(CIsoHandler,             "ISO.DLL",              "iso", "");
+DEFINE_FORMAT(CNsisHandler,            "NSIS.DLL",             "exe", "@@@@@\xEF\xBE\xAD\xDENullsoftInst");
  
  /**
   * @brief Construct Merge7z interface.
@@ -884,6 +888,34 @@ void SaveRegLang(const UString &langFile)
  #endif
  
  /**
+ * @brief 7-Zip 4.15+: IsArchiveItemFolder(), needed by CArchiveExtractCallback,
+ * used to reside in OpenArchive.cpp, which has been removed from Merge7z in an
+ * attempt to reduce dependencies (actually got rid of four cpp files).
+ */
+static HRESULT IsArchiveItemProp(IInArchive *archive, UINT32 index, PROPID propID, bool &result)
+{
+       NCOM::CPropVariant prop;
+       RINOK(archive->GetProperty(index, propID, &prop));
+       if(prop.vt == VT_BOOL)
+               result = VARIANT_BOOLToBool(prop.boolVal);
+       else if (prop.vt == VT_EMPTY)
+               result = false;
+       else
+               return E_FAIL;
+       return S_OK;
+}
+
+HRESULT IsArchiveItemFolder(IInArchive *archive, UINT32 index, bool &result)
+{
+       return IsArchiveItemProp(archive, index, kpidIsFolder, result);
+}
+
+HRESULT IsArchiveItemAnti(IInArchive *archive, UINT32 index, bool &result)
+{
+       return IsArchiveItemProp(archive, index, kpidIsAnti, result);
+}
+
+/**
   * @brief Export instance of Merge7z interface.
   */
  EXTERN_C
diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.h b/ArchiveSupport/Merge7z/Merge7zCommon.h

index d55d337..cf316df 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.h
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.h
@@ -10,7 +10,7 @@
  #include "7zip/Common/FileStreams.h"
  // Merge7z includes
  #include "tools.h"
-#define DllBuild_Merge7z 17
+#define DllBuild_Merge7z 18
  #define DLLPSTUB /##/
  #include "Merge7z.h"
  
@@ -91,6 +91,8 @@ interface Format7zDLL::Interface : Merge7z::Format
                 IArchiveOpenCallback *callback;
                 CSysString const path;
                 UString ustrDefaultName;
+               bool passwordIsDefined;
+               UString password;
                 NFile::NFind::CFileInfo fileInfo;
                 Inspector(Format7zDLL::Interface *, LPCTSTR);
                 void Init(HWND);
diff --git a/ArchiveSupport/Merge7z/revision.txt b/ArchiveSupport/Merge7z/revision.txt

index 646613f..bbecb07 100755 (executable)
--- a/ArchiveSupport/Merge7z/revision.txt
+++ b/ArchiveSupport/Merge7z/revision.txt
@@ -45,3 +45,6 @@ VERSION(2,2)
  "*"//2005/10/02 Jochen Tucht   Add CHM format
  "*"//2005/10/04 Jochen Tucht   Don't rely on 7-Zip's format CLSIDs
  "*"//2005/11/19 Jochen Tucht   Minor changes to build against 7z430 beta
+"*"//2006/06/28        Jochen Neubeck  Add ISO format (introduced with 7z436 beta)
+//                                                             Add NSIS format (introduced with 7z440 beta)
+//                                                             Avoid to occasionally prompt for password twice
diff --git a/ArchiveSupport/Merge7zInstaller/Files.rc2 b/ArchiveSupport/Merge7zInstaller/Files.rc2

index baef3ec..103db65 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,11,0,19,12,0,0,0}
+SYSTEMTIME RCDATA {2006,6,0,28,12,0,0,0}
  #endif
  
  IMPORT(Merge7z311.dll)                 Merge7z "../Build/MergeRelease/Merge7z311.dll"
@@ -53,89 +53,118 @@ IMPORT(Merge7z429.dll)                     Merge7z "../Build/MergeRelease/Merge7z429.dll"
  IMPORT(Merge7z429U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z429U.dll"
  IMPORT(Merge7z430.dll)                 Merge7z "../Build/MergeRelease/Merge7z430.dll"
  IMPORT(Merge7z430U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z430U.dll"
+IMPORT(Merge7z431.dll)                 Merge7z "../Build/MergeRelease/Merge7z431.dll"
+IMPORT(Merge7z431U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z431U.dll"
+IMPORT(Merge7z432.dll)                 Merge7z "../Build/MergeRelease/Merge7z432.dll"
+IMPORT(Merge7z432U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z432U.dll"
+IMPORT(Merge7z433.dll)                 Merge7z "../Build/MergeRelease/Merge7z433.dll"
+IMPORT(Merge7z433U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z433U.dll"
+IMPORT(Merge7z434.dll)                 Merge7z "../Build/MergeRelease/Merge7z434.dll"
+IMPORT(Merge7z434U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z434U.dll"
+IMPORT(Merge7z435.dll)                 Merge7z "../Build/MergeRelease/Merge7z435.dll"
+IMPORT(Merge7z435U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z435U.dll"
+IMPORT(Merge7z436.dll)                 Merge7z "../Build/MergeRelease/Merge7z436.dll"
+IMPORT(Merge7z436U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z436U.dll"
+IMPORT(Merge7z437.dll)                 Merge7z "../Build/MergeRelease/Merge7z437.dll"
+IMPORT(Merge7z437U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z437U.dll"
+IMPORT(Merge7z438.dll)                 Merge7z "../Build/MergeRelease/Merge7z438.dll"
+IMPORT(Merge7z438U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z438U.dll"
+IMPORT(Merge7z439.dll)                 Merge7z "../Build/MergeRelease/Merge7z439.dll"
+IMPORT(Merge7z439U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z439U.dll"
+IMPORT(Merge7z440.dll)                 Merge7z "../Build/MergeRelease/Merge7z440.dll"
+IMPORT(Merge7z440U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z440U.dll"
+IMPORT(Merge7z442.dll)                 Merge7z "../Build/MergeRelease/Merge7z442.dll"
+IMPORT(Merge7z442U.dll)                        Merge7z "../Build/MergeUnicodeRelease/Merge7z442U.dll"
  
-IMPORT(7zip_pad.xml)                   7-ZIP   "../../../7z423bin/7zip_pad.xml"
+IMPORT(7zip_pad.xml)                   7-ZIP   "../../../7z442bin/7zip_pad.xml"
  
-IMPORT(Codecs/7zAES.dll)               7-ZIP   "../../../7z423bin/Codecs/7zAES.dll"
-IMPORT(Codecs/AES.dll)                 7-ZIP   "../../../7z423bin/Codecs/AES.dll"
-IMPORT(Codecs/Branch.dll)              7-ZIP   "../../../7z423bin/Codecs/Branch.dll"
-IMPORT(Codecs/BZip2.dll)               7-ZIP   "../../../7z423bin/Codecs/BZip2.dll"
-IMPORT(Codecs/Copy.dll)                        7-ZIP   "../../../7z423bin/Codecs/Copy.dll"
-IMPORT(Codecs/Deflate.dll)             7-ZIP   "../../../7z423bin/Codecs/Deflate.dll"
-//IMPORT(Codecs/Implode.dll)           7-ZIP   "../../../7z423bin/Codecs/Implode.dll"
-IMPORT(Codecs/LZMA.dll)                        7-ZIP   "../../../7z423bin/Codecs/LZMA.dll"
-IMPORT(Codecs/PPMD.dll)                        7-ZIP   "../../../7z423bin/Codecs/PPMD.dll"
-IMPORT(Codecs/Rar29.dll)               7-ZIP   "../../../7z423bin/Codecs/Rar29.dll"
-IMPORT(Codecs/Swap.dll)                        7-ZIP   "../../../7z423bin/Codecs/Swap.dll"
+IMPORT(Codecs/7zAES.dll)               7-ZIP   "../../../7z442bin/Codecs/7zAES.dll"
+IMPORT(Codecs/AES.dll)                 7-ZIP   "../../../7z442bin/Codecs/AES.dll"
+IMPORT(Codecs/Branch.dll)              7-ZIP   "../../../7z442bin/Codecs/Branch.dll"
+IMPORT(Codecs/BZip2.dll)               7-ZIP   "../../../7z442bin/Codecs/BZip2.dll"
+IMPORT(Codecs/Copy.dll)                        7-ZIP   "../../../7z442bin/Codecs/Copy.dll"
+IMPORT(Codecs/Deflate.dll)             7-ZIP   "../../../7z442bin/Codecs/Deflate.dll"
+//IMPORT(Codecs/Implode.dll)           7-ZIP   "../../../7z442bin/Codecs/Implode.dll"
+IMPORT(Codecs/LZMA.dll)                        7-ZIP   "../../../7z442bin/Codecs/LZMA.dll"
+IMPORT(Codecs/PPMD.dll)                        7-ZIP   "../../../7z442bin/Codecs/PPMD.dll"
+IMPORT(Codecs/Rar29.dll)               7-ZIP   "../../../7z442bin/Codecs/Rar29.dll"
+IMPORT(Codecs/Swap.dll)                        7-ZIP   "../../../7z442bin/Codecs/Swap.dll"
  
-IMPORT(Formats/7z.dll)                 7-ZIP   "../../../7z423bin/Formats/7z.dll"
-IMPORT(Formats/arj.dll)                        7-ZIP   "../../../7z423bin/Formats/arj.dll"
-IMPORT(Formats/bz2.dll)                        7-ZIP   "../../../7z423bin/Formats/bz2.dll"
-IMPORT(Formats/cab.dll)                        7-ZIP   "../../../7z423bin/Formats/cab.dll"
-IMPORT(Formats/cpio.dll)               7-ZIP   "../../../7z423bin/Formats/cpio.dll"
-IMPORT(Formats/deb.dll)                        7-ZIP   "../../../7z423bin/Formats/deb.dll"
-IMPORT(Formats/gz.dll)                 7-ZIP   "../../../7z423bin/Formats/gz.dll"
-IMPORT(Formats/rar.dll)                        7-ZIP   "../../../7z423bin/Formats/rar.dll"
-IMPORT(Formats/rpm.dll)                        7-ZIP   "../../../7z423bin/Formats/rpm.dll"
-IMPORT(Formats/split.dll)              7-ZIP   "../../../7z423bin/Formats/split.dll"
-IMPORT(Formats/tar.dll)                        7-ZIP   "../../../7z423bin/Formats/tar.dll"
-IMPORT(Formats/z.dll)                  7-ZIP   "../../../7z423bin/Formats/z.dll"
-IMPORT(Formats/zip.dll)                        7-ZIP   "../../../7z423bin/Formats/zip.dll"
+IMPORT(Formats/7z.dll)                 7-ZIP   "../../../7z442bin/Formats/7z.dll"
+IMPORT(Formats/arj.dll)                        7-ZIP   "../../../7z442bin/Formats/arj.dll"
+IMPORT(Formats/bz2.dll)                        7-ZIP   "../../../7z442bin/Formats/bz2.dll"
+IMPORT(Formats/cab.dll)                        7-ZIP   "../../../7z442bin/Formats/cab.dll"
+IMPORT(Formats/chm.dll)                        7-ZIP   "../../../7z442bin/Formats/chm.dll"
+IMPORT(Formats/cpio.dll)               7-ZIP   "../../../7z442bin/Formats/cpio.dll"
+IMPORT(Formats/deb.dll)                        7-ZIP   "../../../7z442bin/Formats/deb.dll"
+IMPORT(Formats/gz.dll)                 7-ZIP   "../../../7z442bin/Formats/gz.dll"
+IMPORT(Formats/iso.dll)                        7-ZIP   "../../../7z442bin/Formats/iso.dll"
+IMPORT(Formats/lzh.dll)                        7-ZIP   "../../../7z442bin/Formats/lzh.dll"
+IMPORT(Formats/nsis.dll)               7-ZIP   "../../../7z442bin/Formats/nsis.dll"
+IMPORT(Formats/rar.dll)                        7-ZIP   "../../../7z442bin/Formats/rar.dll"
+IMPORT(Formats/rpm.dll)                        7-ZIP   "../../../7z442bin/Formats/rpm.dll"
+IMPORT(Formats/split.dll)              7-ZIP   "../../../7z442bin/Formats/split.dll"
+IMPORT(Formats/tar.dll)                        7-ZIP   "../../../7z442bin/Formats/tar.dll"
+IMPORT(Formats/z.dll)                  7-ZIP   "../../../7z442bin/Formats/z.dll"
+IMPORT(Formats/zip.dll)                        7-ZIP   "../../../7z442bin/Formats/zip.dll"
  
-IMPORT(Lang/af.txt)                            7-ZIP   "../../../7z423bin/Lang/af.txt"
-IMPORT(Lang/ar.txt)                            7-ZIP   "../../../7z423bin/Lang/ar.txt"
-IMPORT(Lang/ast.txt)                   7-ZIP   "../../../7z423bin/Lang/ast.txt"
-IMPORT(Lang/az.txt)                            7-ZIP   "../../../7z423bin/Lang/az.txt"
-IMPORT(Lang/be.txt)                            7-ZIP   "../../../7z423bin/Lang/be.txt"
-IMPORT(Lang/bg.txt)                            7-ZIP   "../../../7z423bin/Lang/bg.txt"
-IMPORT(Lang/br.txt)                            7-ZIP   "../../../7z423bin/Lang/br.txt"
-IMPORT(Lang/ca.txt)                            7-ZIP   "../../../7z423bin/Lang/ca.txt"
-IMPORT(Lang/cs.txt)                            7-ZIP   "../../../7z423bin/Lang/cs.txt"
-IMPORT(Lang/da.txt)                            7-ZIP   "../../../7z423bin/Lang/da.txt"
-IMPORT(Lang/de.txt)                            7-ZIP   "../../../7z423bin/Lang/de.txt"
-IMPORT(Lang/el.txt)                            7-ZIP   "../../../7z423bin/Lang/el.txt"
-IMPORT(Lang/en.ttt)                            7-ZIP   "../../../7z423bin/Lang/en.ttt"
-IMPORT(Lang/eo.txt)                            7-ZIP   "../../../7z423bin/Lang/eo.txt"
-IMPORT(Lang/es.txt)                            7-ZIP   "../../../7z423bin/Lang/es.txt"
-IMPORT(Lang/et.txt)                            7-ZIP   "../../../7z423bin/Lang/et.txt"
-IMPORT(Lang/ext.txt)                   7-ZIP   "../../../7z423bin/Lang/ext.txt"
-IMPORT(Lang/fa.txt)                            7-ZIP   "../../../7z423bin/Lang/fa.txt"
-IMPORT(Lang/fi.txt)                            7-ZIP   "../../../7z423bin/Lang/fi.txt"
-IMPORT(Lang/fr.txt)                            7-ZIP   "../../../7z423bin/Lang/fr.txt"
-IMPORT(Lang/fur.txt)                   7-ZIP   "../../../7z423bin/Lang/fur.txt"
-IMPORT(Lang/fy.txt)                            7-ZIP   "../../../7z423bin/Lang/fy.txt"
-IMPORT(Lang/gl.txt)                            7-ZIP   "../../../7z423bin/Lang/gl.txt"
-IMPORT(Lang/he.txt)                            7-ZIP   "../../../7z423bin/Lang/he.txt"
-IMPORT(Lang/hr.txt)                            7-ZIP   "../../../7z423bin/Lang/hr.txt"
-IMPORT(Lang/hu.txt)                            7-ZIP   "../../../7z423bin/Lang/hu.txt"
-IMPORT(Lang/id.txt)                            7-ZIP   "../../../7z423bin/Lang/id.txt"
-IMPORT(Lang/it.txt)                            7-ZIP   "../../../7z423bin/Lang/it.txt"
-IMPORT(Lang/ja.txt)                            7-ZIP   "../../../7z423bin/Lang/ja.txt"
-IMPORT(Lang/ka.txt)                            7-ZIP   "../../../7z423bin/Lang/ka.txt"
-IMPORT(Lang/ko.txt)                            7-ZIP   "../../../7z423bin/Lang/ko.txt"
-IMPORT(Lang/lt.txt)                            7-ZIP   "../../../7z423bin/Lang/lt.txt"
-IMPORT(Lang/lv.txt)                            7-ZIP   "../../../7z423bin/Lang/lv.txt"
-IMPORT(Lang/mk.txt)                            7-ZIP   "../../../7z423bin/Lang/mk.txt"
-IMPORT(Lang/mn.txt)                            7-ZIP   "../../../7z423bin/Lang/mn.txt"
-IMPORT(Lang/ms.txt)                            7-ZIP   "../../../7z423bin/Lang/ms.txt"
-IMPORT(Lang/nl.txt)                            7-ZIP   "../../../7z423bin/Lang/nl.txt"
-IMPORT(Lang/no.txt)                            7-ZIP   "../../../7z423bin/Lang/no.txt"
-IMPORT(Lang/pl.txt)                            7-ZIP   "../../../7z423bin/Lang/pl.txt"
-IMPORT(Lang/pt.txt)                            7-ZIP   "../../../7z423bin/Lang/pt.txt"
-IMPORT(Lang/pt-br.txt)                 7-ZIP   "../../../7z423bin/Lang/pt-br.txt"
-IMPORT(Lang/ro.txt)                            7-ZIP   "../../../7z423bin/Lang/ro.txt"
-IMPORT(Lang/ru.txt)                            7-ZIP   "../../../7z423bin/Lang/ru.txt"
-IMPORT(Lang/sk.txt)                            7-ZIP   "../../../7z423bin/Lang/sk.txt"
-IMPORT(Lang/sl.txt)                            7-ZIP   "../../../7z423bin/Lang/sl.txt"
-IMPORT(Lang/sr.txt)                            7-ZIP   "../../../7z423bin/Lang/sr.txt"
-IMPORT(Lang/sv.txt)                            7-ZIP   "../../../7z423bin/Lang/sv.txt"
-IMPORT(Lang/ta.txt)                            7-ZIP   "../../../7z423bin/Lang/ta.txt"
-IMPORT(Lang/th.txt)                            7-ZIP   "../../../7z423bin/Lang/th.txt"
-IMPORT(Lang/tr.txt)                            7-ZIP   "../../../7z423bin/Lang/tr.txt"
-IMPORT(Lang/uk.txt)                            7-ZIP   "../../../7z423bin/Lang/uk.txt"
-IMPORT(Lang/uz.txt)                            7-ZIP   "../../../7z423bin/Lang/uz.txt"
-IMPORT(Lang/va.txt)                            7-ZIP   "../../../7z423bin/Lang/va.txt"
-IMPORT(Lang/vi.txt)                            7-ZIP   "../../../7z423bin/Lang/vi.txt"
-IMPORT(Lang/vr.txt)                            7-ZIP   "../../../7z423bin/Lang/vr.txt"
-IMPORT(Lang/zh-cn.txt)                 7-ZIP   "../../../7z423bin/Lang/zh-cn.txt"
-IMPORT(Lang/zh-tw.txt)                 7-ZIP   "../../../7z423bin/Lang/zh-tw.txt"
+IMPORT(Lang/af.txt)                            7-ZIP   "../../../7z442bin/Lang/af.txt"
+IMPORT(Lang/ar.txt)                            7-ZIP   "../../../7z442bin/Lang/ar.txt"
+IMPORT(Lang/ast.txt)                   7-ZIP   "../../../7z442bin/Lang/ast.txt"
+IMPORT(Lang/az.txt)                            7-ZIP   "../../../7z442bin/Lang/az.txt"
+IMPORT(Lang/be.txt)                            7-ZIP   "../../../7z442bin/Lang/be.txt"
+IMPORT(Lang/bg.txt)                            7-ZIP   "../../../7z442bin/Lang/bg.txt"
+IMPORT(Lang/br.txt)                            7-ZIP   "../../../7z442bin/Lang/br.txt"
+IMPORT(Lang/ca.txt)                            7-ZIP   "../../../7z442bin/Lang/ca.txt"
+IMPORT(Lang/cs.txt)                            7-ZIP   "../../../7z442bin/Lang/cs.txt"
+IMPORT(Lang/da.txt)                            7-ZIP   "../../../7z442bin/Lang/da.txt"
+IMPORT(Lang/de.txt)                            7-ZIP   "../../../7z442bin/Lang/de.txt"
+IMPORT(Lang/el.txt)                            7-ZIP   "../../../7z442bin/Lang/el.txt"
+IMPORT(Lang/en.ttt)                            7-ZIP   "../../../7z442bin/Lang/en.ttt"
+IMPORT(Lang/eo.txt)                            7-ZIP   "../../../7z442bin/Lang/eo.txt"
+IMPORT(Lang/es.txt)                            7-ZIP   "../../../7z442bin/Lang/es.txt"
+IMPORT(Lang/et.txt)                            7-ZIP   "../../../7z442bin/Lang/et.txt"
+IMPORT(Lang/eu.txt)                            7-ZIP   "../../../7z442bin/Lang/eu.txt"
+IMPORT(Lang/ext.txt)                   7-ZIP   "../../../7z442bin/Lang/ext.txt"
+IMPORT(Lang/fa.txt)                            7-ZIP   "../../../7z442bin/Lang/fa.txt"
+IMPORT(Lang/fi.txt)                            7-ZIP   "../../../7z442bin/Lang/fi.txt"
+IMPORT(Lang/fr.txt)                            7-ZIP   "../../../7z442bin/Lang/fr.txt"
+IMPORT(Lang/fur.txt)                   7-ZIP   "../../../7z442bin/Lang/fur.txt"
+IMPORT(Lang/fy.txt)                            7-ZIP   "../../../7z442bin/Lang/fy.txt"
+IMPORT(Lang/gl.txt)                            7-ZIP   "../../../7z442bin/Lang/gl.txt"
+IMPORT(Lang/he.txt)                            7-ZIP   "../../../7z442bin/Lang/he.txt"
+IMPORT(Lang/hr.txt)                            7-ZIP   "../../../7z442bin/Lang/hr.txt"
+IMPORT(Lang/hu.txt)                            7-ZIP   "../../../7z442bin/Lang/hu.txt"
+IMPORT(Lang/id.txt)                            7-ZIP   "../../../7z442bin/Lang/id.txt"
+IMPORT(Lang/io.txt)                            7-ZIP   "../../../7z442bin/Lang/io.txt"
+IMPORT(Lang/it.txt)                            7-ZIP   "../../../7z442bin/Lang/it.txt"
+IMPORT(Lang/ja.txt)                            7-ZIP   "../../../7z442bin/Lang/ja.txt"
+IMPORT(Lang/ka.txt)                            7-ZIP   "../../../7z442bin/Lang/ka.txt"
+IMPORT(Lang/ko.txt)                            7-ZIP   "../../../7z442bin/Lang/ko.txt"
+IMPORT(Lang/lt.txt)                            7-ZIP   "../../../7z442bin/Lang/lt.txt"
+IMPORT(Lang/lv.txt)                            7-ZIP   "../../../7z442bin/Lang/lv.txt"
+IMPORT(Lang/mk.txt)                            7-ZIP   "../../../7z442bin/Lang/mk.txt"
+IMPORT(Lang/mn.txt)                            7-ZIP   "../../../7z442bin/Lang/mn.txt"
+IMPORT(Lang/ms.txt)                            7-ZIP   "../../../7z442bin/Lang/ms.txt"
+IMPORT(Lang/nl.txt)                            7-ZIP   "../../../7z442bin/Lang/nl.txt"
+IMPORT(Lang/no.txt)                            7-ZIP   "../../../7z442bin/Lang/no.txt"
+IMPORT(Lang/pl.txt)                            7-ZIP   "../../../7z442bin/Lang/pl.txt"
+IMPORT(Lang/pt.txt)                            7-ZIP   "../../../7z442bin/Lang/pt.txt"
+IMPORT(Lang/pt-br.txt)                 7-ZIP   "../../../7z442bin/Lang/pt-br.txt"
+IMPORT(Lang/ro.txt)                            7-ZIP   "../../../7z442bin/Lang/ro.txt"
+IMPORT(Lang/ru.txt)                            7-ZIP   "../../../7z442bin/Lang/ru.txt"
+IMPORT(Lang/sk.txt)                            7-ZIP   "../../../7z442bin/Lang/sk.txt"
+IMPORT(Lang/sl.txt)                            7-ZIP   "../../../7z442bin/Lang/sl.txt"
+IMPORT(Lang/sr.txt)                            7-ZIP   "../../../7z442bin/Lang/sr.txt"
+IMPORT(Lang/sv.txt)                            7-ZIP   "../../../7z442bin/Lang/sv.txt"
+IMPORT(Lang/ta.txt)                            7-ZIP   "../../../7z442bin/Lang/ta.txt"
+IMPORT(Lang/th.txt)                            7-ZIP   "../../../7z442bin/Lang/th.txt"
+IMPORT(Lang/tr.txt)                            7-ZIP   "../../../7z442bin/Lang/tr.txt"
+IMPORT(Lang/tt.txt)                            7-ZIP   "../../../7z442bin/Lang/tt.txt"
+IMPORT(Lang/uk.txt)                            7-ZIP   "../../../7z442bin/Lang/uk.txt"
+IMPORT(Lang/uz.txt)                            7-ZIP   "../../../7z442bin/Lang/uz.txt"
+IMPORT(Lang/va.txt)                            7-ZIP   "../../../7z442bin/Lang/va.txt"
+IMPORT(Lang/vi.txt)                            7-ZIP   "../../../7z442bin/Lang/vi.txt"
+IMPORT(Lang/vr.txt)                            7-ZIP   "../../../7z442bin/Lang/vr.txt"
+IMPORT(Lang/zh-cn.txt)                 7-ZIP   "../../../7z442bin/Lang/zh-cn.txt"
+IMPORT(Lang/zh-tw.txt)                 7-ZIP   "../../../7z442bin/Lang/zh-tw.txt"
diff --git a/ArchiveSupport/Merge7zInstaller/Installer.cpp b/ArchiveSupport/Merge7zInstaller/Installer.cpp

index cbc3daf..f55fe29 100755 (executable)
--- a/ArchiveSupport/Merge7zInstaller/Installer.cpp
+++ b/ArchiveSupport/Merge7zInstaller/Installer.cpp
@@ -35,6 +35,9 @@ DATE:         BY:                                     DESCRIPTION:
                                                                 Batch options: /standalone, /select, /commit
  2005/05/30     Jochen Tucht            Standalone option now based on 7z420
  2005/06/28     Jochen Tucht            Standalone option now based on 7z423
+2005/12/04     Jochen Tucht            Standalone option now based on 7z431
+2005/12/09     Jochen Tucht            Standalone option now based on 7z432
+2006/06/28     Jochen Neubeck          Standalone option now based on 7z442
  */
  
  #include <windows.h>
@@ -351,8 +354,8 @@ BOOL CALLBACK DlgMain_EnableStandalone(HWND hWnd)
  {
         if (IsDlgButtonChecked(hWnd, 205))
         {
-               int lower = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)"Merge7z423.dll");
-               int upper = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)"Merge7z423U.dll");
+               int lower = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)"Merge7z442.dll");
+               int upper = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)"Merge7z442U.dll");
                 SendDlgItemMessage(hWnd, 100, LB_SELITEMRANGEEX, lower, upper);
                 if (GetFocus() == GetDlgItem(hWnd, 205))
                 {
diff --git a/ArchiveSupport/Merge7zInstaller/Installer.rc b/ArchiveSupport/Merge7zInstaller/Installer.rc

index b5c65cb..50f2974 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 4.23 to program directory.",
+    CONTROL         "&Enable standalone operation\nThis option adds required components from 7-Zip 4.42 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
author	Jochen Tucht <jtuc@users.sourceforge.net>
	Mon, 7 Aug 2006 19:30:28 +0000 (19:30 +0000)
committer	Jochen Tucht <jtuc@users.sourceforge.net>
	Mon, 7 Aug 2006 19:30:28 +0000 (19:30 +0000)
ArchiveSupport/Merge7z/Merge7z311.cpp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z311.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z312.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z313.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z407.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z408.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z409.cpp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z409.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z410.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z411.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z412.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z413.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z414.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z415.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z416.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z417.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z418.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z419.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z420.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z423.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z424.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z425.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z426.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z427.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z428.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z429.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z430.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z431.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z432.dsp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7z433.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7z434.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7z435.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7z436.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7z437.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7z438.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7z439.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7z440.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7z442.dsp	[new file with mode: 0755]	patch \| blob
ArchiveSupport/Merge7z/Merge7zCommon.cpp		patch \| blob \| history
ArchiveSupport/Merge7z/Merge7zCommon.h		patch \| blob \| history
ArchiveSupport/Merge7z/revision.txt		patch \| blob \| history
ArchiveSupport/Merge7zInstaller/Files.rc2		patch \| blob \| history
ArchiveSupport/Merge7zInstaller/Installer.cpp		patch \| blob \| history
ArchiveSupport/Merge7zInstaller/Installer.rc		patch \| blob \| history