DllBuild 0024

diff --git a/ArchiveSupport/Merge7z/Merge7z409.cpp b/ArchiveSupport/Merge7z/Merge7z409.cpp
index 81c57b8..7d07f59 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z409.cpp
+++ b/ArchiveSupport/Merge7z/Merge7z409.cpp
@@ -24,16 +24,17 @@ Please mind 2. a) of the GNU General Public License, and log your changes below.
 
 DATE:          BY:                                     DESCRIPTION:
 ==========     ==================      ================================================
-2003/10/17     Jochen Tucht            Created
-2004/03/15     Jochen Tucht            Fix Visual Studio 2003 build issue
-2004/08/19     Laurent Ganier          Compression of folders
+2003-10-17     Jochen Tucht            Created
+2004-03-15     Jochen Tucht            Fix Visual Studio 2003 build issue
+2004-08-19     Laurent Ganier          Compression of folders
                                                                Through EnumerateDirectory (from code of 7zip)
-2004/10/17     Jochen Tucht            Leave decision whether to recurse into folders
+2004-10-17     Jochen Tucht            Leave decision whether to recurse into folders
                                                                to enumerator (Mask.Recurse)
-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
+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
+2007-07-16     Jochen Neubeck          Cope with revised CThread::Create() in 7z446
 */
 
 #include "stdafx.h"
@@ -49,20 +50,41 @@ DATE:               BY:                                     DESCRIPTION:
 #include "7zip/UI/Common/ArchiveExtractCallback.h"
 #include "7zip/UI/GUI/UpdateCallbackGUI.h"
 
+#include "Windows/Thread.h"
+
+#if MY_VER_MAJOR * 100 + MY_VER_MINOR < 446
+
+class CThread2 : public CThread
+{
+public:
+       HRESULT Create(LPTHREAD_START_ROUTINE startAddress, LPVOID parameter)
+       {
+               return CThread::Create(startAddress, parameter) ? 0 : GetLastError();
+       }
+};
+
+typedef DWORD THREAD_FUNC_RET_TYPE;
+
+#else
+
+typedef NWindows::CThread CThread2;
+
+#endif
+
 /**
  * @brief Extraction thread
  */
-class CThreadExtracting : CThread
+class CThreadExtracting : CThread2
 {
 protected:
-       DWORD Process()
+       THREAD_FUNC_RET_TYPE Process()
        {
                ExtractCallbackSpec->ProgressDialog.WaitCreating();
                result = Archive->Extract(indices, numItems, false, ArchiveExtractCallback);
                ExtractCallbackSpec->ProgressDialog.MyClose();
                return 0;
        }
-       static DWORD WINAPI Process(void *param)
+       static THREAD_FUNC_RET_TYPE WINAPI Process(void *param)
        {
                return ((CThreadExtracting *)param)->Process();
        }
@@ -90,9 +112,9 @@ public:
                numItems(numItems)
        {
                result = E_FAIL;
-               if COMPLAIN(!Create(Process, this))
+               if (HRESULT hr = Create(Process, this))
                {
-                       Complain(GetLastError(), NULL);
+                       Complain(hr, NULL);
                }
                ExtractCallbackSpec->StartProgressDialog(GetUnicodeString(title));
        }
@@ -214,17 +236,17 @@ HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR fold
 /**
  * @brief Compression thread
  */
-class CThreadUpdateCompress : CThread
+class CThreadUpdateCompress : CThread2
 {
 protected:
-       DWORD Process()
+       THREAD_FUNC_RET_TYPE Process()
        {
                updateCallbackGUI->ProgressDialog.WaitCreating();
                result = outArchive->UpdateItems(file, numItems, updateCallbackSpec);
                updateCallbackGUI->ProgressDialog.MyClose();
                return 0;
        }
-       static DWORD WINAPI Process(void *param)
+       static THREAD_FUNC_RET_TYPE WINAPI Process(void *param)
        {
                return ((CThreadUpdateCompress *)param)->Process();
        }
@@ -251,9 +273,9 @@ public:
                file(file)
        {
                result = E_FAIL;
-               if COMPLAIN(!Create(Process, this))
+               if (HRESULT hr = Create(Process, this))
                {
-                       Complain(GetLastError(), NULL);
+                       Complain(hr, NULL);
                }
                updateCallbackGUI->StartProgressDialog(GetUnicodeString(title));
        }

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

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

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

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

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

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

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

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

diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.cpp b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
index 29ff475..472cc93 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.cpp
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
@@ -22,31 +22,35 @@ Please mind 2. a) of the GNU General Public License, and log your changes below.
 
 DATE:          BY:                                     DESCRIPTION:
 ==========     ==================      ================================================
-2003/12/09     Jochen Tucht            Created
-2003/12/16     Jochen Tucht            GuessFormat() now checks for directory
-2004/03/18     Jochen Tucht            Experimental DllGetVersion() based on rcsid.
-2004/10/10     Jochen Tucht            DllGetVersion() based on new REVISION.TXT
-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            Changed as explained in revision.txt
-2005/06/22     Jochen Tucht            Treat .ear and .war like .zip
-2005/07/05     Jochen Tucht            Add missing .tbz2
-2005/08/20     Jochen Tucht            Option to guess archive format by signature.
+2003-12-09     Jochen Tucht            Created
+2003-12-16     Jochen Tucht            GuessFormat() now checks for directory
+2004-03-18     Jochen Tucht            Experimental DllGetVersion() based on rcsid.
+2004-10-10     Jochen Tucht            DllGetVersion() based on new REVISION.TXT
+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            Changed as explained in revision.txt
+2005-06-22     Jochen Tucht            Treat .ear and .war like .zip
+2005-07-05     Jochen Tucht            Add missing .tbz2
+2005-08-20     Jochen Tucht            Option to guess archive format by signature.
                                                                EnumerateDirectory() in EnumDirItems.cpp has
                                                                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)
+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)
-2007/01/27     Jochen Neubeck          Unassociate .exe filename extension from NSIS
+2007-01-27     Jochen Neubeck          Unassociate .exe filename extension from NSIS
                                                                format due to undesired side effect on WinMerge
+2007-04-20     Jochen Neubeck          Cope with 7z445's revised plugin system
+2007-07-13     Jochen Neubeck          Pass MSI files to CAB handler
+2007-08-25     Jochen Neubeck          Add COM format (introduced with 7z452 beta)
+                                                               This format also handles MSI files, which are
+                                                               therefore no longer passed to the CAB handler.
 */
 
 #include "stdafx.h"
 #include "Merge7zCommon.h"
 #include "7zip/FileManager/LangUtils.h"
 
-//#include "7zip/UI/Common/EnumDirItems.cpp" // defines static void EnumerateDirectory()
 using namespace NWindows;
 using namespace NFile;
 using namespace NName;
@@ -173,15 +177,6 @@ static HMODULE DllProxyHelper(LPCSTR *proxy, ...)
 }
 
 /**
- * @brief Access archiver dll functions through proxy.
- */
-struct Format7zDLL *Format7zDLL::Proxy::operator->()
-{
-       DllProxyHelper(Format7zDLL, g_cPath7z);
-       return (struct Format7zDLL *)Format7zDLL;
-}
-
-/**
  * @brief Ask archiver dll for an interface of given class.
  */
 HRESULT Format7zDLL::Interface::CreateObject(const GUID *interfaceID, void **outObject)
@@ -608,12 +603,52 @@ int Merge7z::Initialize(DWORD dwFlags)
        return 0;
 }
 
+Format7zDLL::Interface *Format7zDLL::Interface::head = NULL;
+
+/**
+ * @brief Access archiver dll functions through proxy.
+ */
+#if MY_VER_MAJOR * 100 + MY_VER_MINOR < 445
+
+/**
+ * @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).
+ * 7-Zip 4.45+: OpenArchive.cpp included again - no more secondary dependencies.
+ */
+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);
+}
+
 static const char aCreateObject[] = "CreateObject";
 static const char aGetHandlerProperty[] = "GetHandlerProperty";
 
-Format7zDLL::Interface *Format7zDLL::Interface::head = NULL;
+struct Format7zDLL::Proxy *Format7zDLL::Proxy::operator->()
+{
+       DllProxyHelper(&aModule, g_cPath7z);
+       return this;
+}
 
-#define        DEFINE_FORMAT(name, dll, extension, signature) \
+#define        DEFINE_FORMAT(name, id, dll, extension, signature) \
                Format7zDLL::Proxy PROXY_##name = \
                { \
                        "%1Formats\\" dll, \
@@ -625,23 +660,99 @@ Format7zDLL::Interface *Format7zDLL::Interface::head = NULL;
                }; \
                Format7zDLL::Interface name = PROXY_##name;
 
-DEFINE_FORMAT(CFormat7z,               "7Z.DLL",               "7z", "@7z\xBC\xAF\x27\x1C");
-DEFINE_FORMAT(CArjHandler,             "ARJ.DLL",              "arj", "@\x60\xEA");
-DEFINE_FORMAT(CBZip2Handler,   "BZ2.DLL",              "bz2 tbz2", "@BZh");
-DEFINE_FORMAT(CCabHandler,             "CAB.DLL",              "cab", "@MSCF");
-DEFINE_FORMAT(CCpioHandler,            "CPIO.DLL",             "cpio", "");
-DEFINE_FORMAT(CDebHandler,             "DEB.DLL",              "deb", "@!<arch>\n");
-DEFINE_FORMAT(CLzhHandler,             "LZH.DLL",              "lzh lha", "@@@-l@@-");//"@-l" doesn't work because signature starts at offset 2
-DEFINE_FORMAT(CGZipHandler,            "GZ.DLL",               "gz tgz", "@\x1F\x8B");
-DEFINE_FORMAT(CRarHandler,             "RAR.DLL",              "rar", "@Rar!\x1a\x07\x00");
-DEFINE_FORMAT(CRpmHandler,             "RPM.DLL",              "rpm", "");
-DEFINE_FORMAT(CSplitHandler,   "SPLIT.DLL",    "001", "");
-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",             "", "@@@@@\xEF\xBE\xAD\xDENullsoftInst");
+#else
+
+#define CLS_ARC_ID_ITEM(cls) ((cls).Data4[5])
+
+Format7zDLL::Proxy::Handle Format7zDLL::Proxy::handle =
+{
+       "%1!s!7z.dll",
+       "CreateObject",
+       "GetHandlerProperty2",
+       "GetNumberOfFormats",
+       (HMODULE)0
+};
+
+struct Format7zDLL::Proxy *Format7zDLL::Proxy::operator->()
+{
+       DllProxyHelper(&handle.aModule, g_cPath7z);
+       if (formatIndex < 0)
+       {
+               GUID clsId =
+               {
+                       0x23170F69, 0x40C1, 0x278A,
+                       0x10, 0x00, 0x00, 0x01, 0x10, (BYTE)-formatIndex, 0x00, 0x00
+               };
+               UINT32 i = 0;
+               handle.GetNumberOfFormats(&i);
+               while (i)
+               {
+                       PROPVARIANT value;
+                       ::VariantInit((LPVARIANT)&value);
+                       if (SUCCEEDED(handle.GetHandlerProperty2(--i, NArchive::kClassID, &value)) &&
+                               value.vt == VT_BSTR &&
+                               SysStringByteLen(value.bstrVal) == sizeof(GUID) &&
+                               IsEqualGUID(clsId, *value.puuid))
+                       {
+                               formatIndex = i;
+                               i = 0;
+                       }
+                       ::VariantClear((LPVARIANT)&value);
+               }
+               if (formatIndex < 0)
+               {
+                       TCHAR szArcID[4];
+                       wsprintf(szArcID, _T("%02x"), (UINT)CLS_ARC_ID_ITEM(clsId));
+                       Complain(RPC_S_INTERFACE_NOT_FOUND, szArcID, handle);
+               }
+       }
+       return this;
+}
+
+STDMETHODIMP Format7zDLL::Proxy::CreateObject(const GUID *clsID, const GUID *interfaceID, void **outObject)
+{
+       return handle.CreateObject(clsID, interfaceID, outObject);
+}
+
+STDMETHODIMP Format7zDLL::Proxy::GetHandlerProperty(PROPID propID, PROPVARIANT *value)
+{
+       return handle.GetHandlerProperty2(formatIndex, propID, value);
+}
+
+#define        DEFINE_FORMAT(name, id, dll, extension, signature) \
+               Format7zDLL::Proxy PROXY_##name = \
+               { \
+                       -0x##id, \
+                       signature extension + sizeof signature extension - sizeof extension, \
+                       sizeof signature extension - sizeof extension \
+               }; \
+               Format7zDLL::Interface name = PROXY_##name;
+
+#endif
+
+DEFINE_FORMAT(CFormat7z,               07, "7Z.DLL",           "7z", "@7z\xBC\xAF\x27\x1C");
+DEFINE_FORMAT(CArjHandler,             04, "ARJ.DLL",          "arj", "@\x60\xEA");
+DEFINE_FORMAT(CBZip2Handler,   02, "BZ2.DLL",          "bz2 tbz2", "@BZh");
+DEFINE_FORMAT(CCabHandler,             08, "CAB.DLL",          "cab", "@MSCF");
+DEFINE_FORMAT(CCpioHandler,            ED, "CPIO.DLL",         "cpio", "");
+DEFINE_FORMAT(CDebHandler,             EC, "DEB.DLL",          "deb", "@!<arch>\n");
+DEFINE_FORMAT(CLzhHandler,             06, "LZH.DLL",          "lzh lha", "@@@-l@@-");//"@-l" doesn't work because signature starts at offset 2
+DEFINE_FORMAT(CGZipHandler,            EF, "GZ.DLL",           "gz tgz", "@\x1F\x8B");
+DEFINE_FORMAT(CRarHandler,             03, "RAR.DLL",          "rar", "@Rar!\x1a\x07\x00");
+DEFINE_FORMAT(CRpmHandler,             EB, "RPM.DLL",          "rpm", "");
+DEFINE_FORMAT(CSplitHandler,   EA, "SPLIT.DLL",        "001", "");
+DEFINE_FORMAT(CTarHandler,             EE, "TAR.DLL",          "tar", "");
+DEFINE_FORMAT(CZHandler,               05, "Z.DLL",            "z", "@\x1F\x9D");
+DEFINE_FORMAT(CZipHandler,             01, "ZIP.DLL",          "zip jar war ear xpi", "@PK\x03\x04");
+DEFINE_FORMAT(CChmHandler,             E9, "CHM.DLL",          "chm chi chq chw hxs hxi hxr hxq hxw lit", "@ITSF");
+DEFINE_FORMAT(CIsoHandler,             E7, "ISO.DLL",          "iso", "");
+DEFINE_FORMAT(CNsisHandler,            09, "NSIS.DLL",         "", "@@@@@\xEF\xBE\xAD\xDENullsoftInst");
+#if MY_VER_MAJOR * 100 + MY_VER_MINOR >= 449
+DEFINE_FORMAT(CWimHandler,             E6, "WIM.DLL",          "wim swm", "@MSWIM\x00\x00\x00");
+#endif
+#if MY_VER_MAJOR * 100 + MY_VER_MINOR >= 452
+DEFINE_FORMAT(CComHandler,             E5, "COM.DLL",          "", "@\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1");
+#endif
 
 /**
  * @brief Construct Merge7z interface.
@@ -865,20 +976,7 @@ LPCTSTR Merge7z::LoadLang(LPCTSTR langFile)
  * This is global 7-Zip function otherwise defined in RegistryUtils.cpp.
  * Exclude RegistryUtils.cpp from build to avoid link-time collision.
  */
-void ReadRegLang(CSysString &langFile)
-{
-       langFile = g_LangPath;
-}
-
-/**
- * @brief 7-Zip 4.26: ReloadLangSmart() wants this #ifdef _UNICODE.
- * We certainly don't want to write 7-Zip's registry so we make it a NOP.
- */
-void SaveRegLang(const CSysString &langFile)
-{
-}
 
-#ifndef _UNICODE
 void ReadRegLang(UString &langFile)
 {
        langFile = GetUnicodeString(g_LangPath);
@@ -887,35 +985,6 @@ void ReadRegLang(UString &langFile)
 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.

diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.h b/ArchiveSupport/Merge7z/Merge7zCommon.h
index 6995022..5967f96 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.h
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.h
@@ -1,16 +1,19 @@
 // includes from 7-Zip sources
+
+#include "7zip/MyVersion.h"
 #include "7zip/Archive/IArchive.h"
 #include "Common/StringConvert.h"
 #include "Windows/PropVariant.h"
 #include "Windows/PropVariantConversions.h"
 #include "Windows/FileDir.h"
 #include "Windows/FileFind.h"
-#include "Windows/Thread.h"
+
 #include "7zip/UI/Common/DirItem.h"
 #include "7zip/Common/FileStreams.h"
+
 // Merge7z includes
 #include "tools.h"
-#define DllBuild_Merge7z 19
+#define DllBuild_Merge7z 24
 #define DLLPSTUB /##/
 #include "Merge7z.h"
 
@@ -23,41 +26,68 @@ extern HINSTANCE g_hInstance;
 extern DWORD g_dwFlags;
 extern CHAR g_cPath7z[MAX_PATH];
 
-typedef UINT32 (WINAPI * CreateObjectFunc)(
-       const GUID *clsID, 
-       const GUID *interfaceID, 
-       void **outObject);
+struct Format7zDLL
+{
+       struct Proxy;
+       interface Interface;
+};
 
-typedef UINT32 (WINAPI * GetHandlerPropertyFunc)(
-       PROPID propID, PROPVARIANT *value);
+#if MY_VER_MAJOR * 100 + MY_VER_MINOR < 445
 
-struct Format7zDLL
+struct Format7zDLL::Proxy
 {
-       HMODULE origin;
-       CreateObjectFunc CreateObject;
-       GetHandlerPropertyFunc GetHandlerProperty;
+       const char *aModule;
+       union
+       {
+               const char *aCreateObject;
+               HRESULT(STDAPICALLTYPE*CreateObject)(const GUID *clsID, const GUID *interfaceID, void **outObject);
+       };
+       union
+       {
+               const char *aGetHandlerProperty;
+               HRESULT(STDAPICALLTYPE*GetHandlerProperty)(PROPID propID, PROPVARIANT *value);
+       };
        HMODULE handle;
-       //CLSID clsid;
        const char *extension;
        size_t signature;
-       struct Proxy;
-       interface Interface;
+       struct Proxy *operator->();
 };
 
+#else
+
 struct Format7zDLL::Proxy
 {
-       LPCSTR Format7zDLL
-       [
-               &((struct Format7zDLL *)0)->handle
-       -       &((struct Format7zDLL *)0)->origin
-       ];
-       HMODULE handle;
-       //CLSID clsid;
+       INT32 formatIndex;
        const char *extension;
        size_t signature;
-       struct Format7zDLL *operator->();
+       STDMETHODIMP CreateObject(const GUID *clsID, const GUID *interfaceID, void **outObject);
+       STDMETHODIMP GetHandlerProperty(PROPID propID, PROPVARIANT *value);
+       static struct Handle
+       {
+               const char *aModule;
+               union
+               {
+                       const char *aCreateObject;
+                       HRESULT(STDAPICALLTYPE*CreateObject)(const GUID *clsID, const GUID *interfaceID, void **outObject);
+               };
+               union
+               {
+                       const char *aGetHandlerProperty2;
+                       HRESULT(STDAPICALLTYPE*GetHandlerProperty2)(UINT32 formatIndex, PROPID propID, PROPVARIANT *value);
+               };
+               union
+               {
+                       const char *aGetNumberOfFormats;
+                       HRESULT(STDAPICALLTYPE*GetNumberOfFormats)(UINT32 *numFormats);
+               };
+               HMODULE handle;
+               operator HMODULE() { return handle; }
+       } handle;
+       struct Proxy *operator->();
 };
 
+#endif
+
 interface Format7zDLL::Interface : Merge7z::Format
 {
        Proxy &proxy;

diff --git a/ArchiveSupport/Merge7z/revision.txt b/ArchiveSupport/Merge7z/revision.txt
index 3adb156..1ecc62c 100755 (executable)
--- a/ArchiveSupport/Merge7z/revision.txt
+++ b/ArchiveSupport/Merge7z/revision.txt
@@ -1,20 +1,20 @@
 //Merge7z/revision.txt
 
-"*"//2003/12/16        Jochen Tucht    GuessFormat() now checks for directory
-"*"//2004/03/15        Jochen Tucht    Fix Visual Studio 2003 build issue
-"*"//2004/04/13        Jochen Tucht    Experimental DllGetVersion() based on rcsid.
-"*"//2004/08/19        Laurent Ganier  Compression of folders
+"*"//2003-12-16        Jochen Tucht    GuessFormat() now checks for directory
+"*"//2004-03-15        Jochen Tucht    Fix Visual Studio 2003 build issue
+"*"//2004-04-13        Jochen Tucht    Experimental DllGetVersion() based on rcsid.
+"*"//2004-08-19        Laurent Ganier  Compression of folders
 //                                                             Through EnumerateDirectory (from code of 7zip)
 
 VERSION(2,1)
 
-"*"//2004/10/10        Jochen Tucht    Support 7z409 beta. DllGetVersion() no longer
+"*"//2004-10-10        Jochen Tucht    Support 7z409 beta. DllGetVersion() no longer
 //based on rcsid. Revision numbers will be generated from new file REVISION.TXT.
 
-"*"//2004/10/17        Jochen Tucht    Leave decision whether to recurse into folders
+"*"//2004-10-17        Jochen Tucht    Leave decision whether to recurse into folders
 //to enumerator (Mask.Recurse)
 
-"*"//2004/10/18 Jochen Tucht   Change generation of revision numbers to allow
+"*"//2004-10-18 Jochen Tucht   Change generation of revision numbers to allow
 //for arbitrary version numbers at any stage without affecting build number.
 //Merge7z may now follow a WinMerge-like versioning policy, or just use same
 //version numbers as WinMerge, yet provide a build number simply reflecting
@@ -22,11 +22,11 @@ VERSION(2,1)
 
 VERSION(2,2)
 
-"*"//2005/01/15 Jochen Tucht   New interface Merge7z::Format::Inspector
+"*"//2005-01-15 Jochen Tucht   New interface Merge7z::Format::Inspector
 //                                                             New interface Merge7z::Format::Updater
 //                                                             New method Merge7z::LoadLang() to set UI language
 
-"*"//2005/02/26 Jochen Tucht   Fix extensions when unwrapping tgz, rpm, ...
+"*"//2005-02-26 Jochen Tucht   Fix extensions when unwrapping tgz, rpm, ...
 //                                                             Expose some handler properties
 //                                                             Fix crash on failure to open archive
 //                                                             Use canned system messages wherever possible
@@ -34,19 +34,26 @@ VERSION(2,2)
 //                                                             Use DLLPSTUB if DllBuild_Merge7z >= 10
 //                                                             Optimize release builds for size
 
-"*"//2005/03/19 Jochen Tucht   Set UI language during Merge7z::Initialize()
+"*"//2005-03-19 Jochen Tucht   Set UI language during Merge7z::Initialize()
 //                                                             according to LANGID given in HIWORD(dwFlags)
 //                                                             Allow for Merge7z::LoadLang(MAKEINTATOM(LANGID))
 //                                                             Don't show error message on intentional abort
 
-"*"//2005/06/22 Jochen Tucht   Treat .ear and .war like .zip
-"*"//2005/08/20 Jochen Tucht   Option to guess archive format by signature
-"*"//2005/08/25 Jochen Tucht   Fix broken GuessFormatByExtension()
-"*"//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)
+"*"//2005-06-22 Jochen Tucht   Treat .ear and .war like .zip
+"*"//2005-08-20 Jochen Tucht   Option to guess archive format by signature
+"*"//2005-08-25 Jochen Tucht   Fix broken GuessFormatByExtension()
+"*"//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
-"*"//2007/01/27        Jochen Neubeck  Unassociate .exe filename extension from NSIS
+"*"//2007-01-27        Jochen Neubeck  Unassociate .exe filename extension from NSIS
 //                                                             format due to undesired side effect on WinMerge
+"*"//2007-04-20        Jochen Neubeck  Cope with 7z445's revised plugin system
+"*"//2007-07-13        Jochen Neubeck  Pass MSI files to CAB handler
+//                                                             Drop support for 7-Zip versions prior to 4.32
+"*"//2007-07-15        Jochen Neubeck  Add WIM format (introduced with 7z449 beta)
+"*"//2007-07-16        Jochen Neubeck  Cope with revised CThread::Create() in 7z446
+"*"//2007-08-25 Jochen Neubeck Add COM format (introduced with 7z452 beta)
+//                                                             No longer pass MSI files to CAB handler