Finish Merge7z integration

diff --git a/ArchiveSupport/Merge7z/Merge7z311.dsp b/ArchiveSupport/Merge7z/Merge7z311.dsp
index 6a81e92..43de0c7 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z311.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z311.dsp
@@ -40,12 +40,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Build\MergeRelease"
-# PROP Intermediate_Dir "..\Build\MergeRelease"
+# PROP Output_Dir "..\BuildTmp\Merge7z311___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z311___Win32_Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../7z311" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z311_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z311" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z311_EXPORTS" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z311.dll"
 
 !ELSEIF  "$(CFG)" == "Merge7z311 - Win32 Debug"
 
@@ -66,12 +66,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Build\MergeDebug"
-# PROP Intermediate_Dir "..\Build\MergeDebug"
+# PROP Output_Dir "..\BuildTmp\Merge7z311___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z311___Win32_Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z311" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z311_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z311" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z311_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -81,25 +81,25 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386
-# SUBTRACT LINK32 /map
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z311.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z311.dll"
+# SUBTRACT LINK32 /pdb:none /map
 
 !ELSEIF  "$(CFG)" == "Merge7z311 - Win32 UnicodeDebug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Merge7z311___Win32_UnicodeDebug"
-# PROP BASE Intermediate_Dir "Merge7z311___Win32_UnicodeDebug"
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z311___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z311___Win32_UnicodeDebug"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Build\MergeUnicodeDebug"
-# PROP Intermediate_Dir "..\Build\MergeUnicodeDebug"
+# PROP Output_Dir "..\BuildTmp\Merge7z311___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z311___Win32_UnicodeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z311" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z311" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z311_EXPORTS" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z311" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z311" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z311_EXPORTS" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -109,25 +109,25 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z311.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z311U.dll"
-# SUBTRACT LINK32 /map
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z311U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z311U.dll"
+# SUBTRACT LINK32 /pdb:none /map
 
 !ELSEIF  "$(CFG)" == "Merge7z311 - Win32 UnicodeRelease"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Merge7z311___Win32_UnicodeRelease"
-# PROP BASE Intermediate_Dir "Merge7z311___Win32_UnicodeRelease"
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z311___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z311___Win32_UnicodeRelease"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Build\MergeUnicodeRelease"
-# PROP Intermediate_Dir "..\Build\MergeUnicodeRelease"
+# PROP Output_Dir "..\BuildTmp\Merge7z311___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z311___Win32_UnicodeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../7z311" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../7z311" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z311_EXPORTS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z311" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z311" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z311_EXPORTS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -193,15 +193,15 @@ SOURCE=.\tools.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Ui\Gui\FM.ico
+SOURCE=..\..\..\7z311\7zip\Ui\Gui\FM.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\UI\GUI\resource.h
+SOURCE=..\..\..\7z311\7zip\UI\GUI\resource.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Ui\Gui\resource.rc
+SOURCE=..\..\..\7z311\7zip\Ui\Gui\resource.rc
 # End Source File
 # End Group
 # Begin Group "Windows"
@@ -209,64 +209,43 @@ SOURCE=..\..\7z311\7zip\Ui\Gui\resource.rc
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\DLL.cpp
-
-!IF  "$(CFG)" == "Merge7z311 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "Merge7z311 - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "Merge7z311 - Win32 UnicodeDebug"
-
-!ELSEIF  "$(CFG)" == "Merge7z311 - Win32 UnicodeRelease"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\7z311\Windows\DLL.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\7z311\Windows\FileIO.cpp
+SOURCE=..\..\..\7z311\Windows\FileIO.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\FileIO.h
+SOURCE=..\..\..\7z311\Windows\FileIO.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\PropVariant.cpp
+SOURCE=..\..\..\7z311\Windows\PropVariant.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\PropVariant.h
+SOURCE=..\..\..\7z311\Windows\PropVariant.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\PropVariantConversions.cpp
+SOURCE=..\..\..\7z311\Windows\PropVariantConversions.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\PropVariantConversions.h
+SOURCE=..\..\..\7z311\Windows\PropVariantConversions.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\ResourceString.cpp
+SOURCE=..\..\..\7z311\Windows\ResourceString.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\ResourceString.h
+SOURCE=..\..\..\7z311\Windows\ResourceString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\Synchronization.cpp
+SOURCE=..\..\..\7z311\Windows\Synchronization.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\Synchronization.h
+SOURCE=..\..\..\7z311\Windows\Synchronization.h
 # End Source File
 # End Group
 # Begin Group "Common"
@@ -274,59 +253,59 @@ SOURCE=..\..\7z311\Windows\Synchronization.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\IntToString.cpp
+SOURCE=..\..\..\7z311\Common\IntToString.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\IntToString.h
+SOURCE=..\..\..\7z311\Common\IntToString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\Lang.cpp
+SOURCE=..\..\..\7z311\Common\Lang.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\Lang.h
+SOURCE=..\..\..\7z311\Common\Lang.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\StdInStream.cpp
+SOURCE=..\..\..\7z311\Common\StdInStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\StdInStream.h
+SOURCE=..\..\..\7z311\Common\StdInStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\String.cpp
+SOURCE=..\..\..\7z311\Common\String.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\String.h
+SOURCE=..\..\..\7z311\Common\String.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\StringConvert.cpp
+SOURCE=..\..\..\7z311\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\StringConvert.h
+SOURCE=..\..\..\7z311\Common\StringConvert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\TextConfig.cpp
+SOURCE=..\..\..\7z311\Common\TextConfig.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\TextConfig.h
+SOURCE=..\..\..\7z311\Common\TextConfig.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\UTFConvert.cpp
+SOURCE=..\..\..\7z311\Common\UTFConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\UTFConvert.h
+SOURCE=..\..\..\7z311\Common\UTFConvert.h
 # End Source File
 # End Group
 # Begin Group "7zip Common"
@@ -334,119 +313,119 @@ SOURCE=..\..\7z311\Common\UTFConvert.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Ui\Agent\ArchiveExtractCallback.cpp
+SOURCE=..\..\..\7z311\7zip\Ui\Agent\ArchiveExtractCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\UI\Agent\ArchiveExtractCallback.h
+SOURCE=..\..\..\7z311\7zip\UI\Agent\ArchiveExtractCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Ui\Agent\ArchiveUpdateCallback.cpp
+SOURCE=..\..\..\7z311\7zip\Ui\Agent\ArchiveUpdateCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\UI\Agent\ArchiveUpdateCallback.h
+SOURCE=..\..\..\7z311\7zip\UI\Agent\ArchiveUpdateCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\Control\Dialog.cpp
+SOURCE=..\..\..\7z311\Windows\Control\Dialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\Control\Dialog.h
+SOURCE=..\..\..\7z311\Windows\Control\Dialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\ExtractCallback.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\ExtractCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\ExtractCallback.h
+SOURCE=..\..\..\7z311\7zip\FileManager\ExtractCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Common\FileStreams.cpp
+SOURCE=..\..\..\7z311\7zip\Common\FileStreams.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Common\FileStreams.h
+SOURCE=..\..\..\7z311\7zip\Common\FileStreams.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\FormatUtils.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\FormatUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\FormatUtils.h
+SOURCE=..\..\..\7z311\7zip\FileManager\FormatUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\LangUtils.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\LangUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\LangUtils.h
+SOURCE=..\..\..\7z311\7zip\FileManager\LangUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\OpenCallback.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\OpenCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\OpenCallback.h
+SOURCE=..\..\..\7z311\7zip\FileManager\OpenCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+SOURCE=..\..\..\7z311\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+SOURCE=..\..\..\7z311\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\Registry.cpp
+SOURCE=..\..\..\7z311\Windows\Registry.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\Registry.h
+SOURCE=..\..\..\7z311\Windows\Registry.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\RegistryUtils.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\RegistryUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\RegistryUtils.h
+SOURCE=..\..\..\7z311\7zip\FileManager\RegistryUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\FileManager\UpdateCallback100.cpp
+SOURCE=..\..\..\7z311\7zip\FileManager\UpdateCallback100.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\Window.cpp
+SOURCE=..\..\..\7z311\Windows\Window.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\Window.h
+SOURCE=..\..\..\7z311\Windows\Window.h
 # End Source File
 # End Group
 # Begin Group "Extract"
@@ -454,72 +433,72 @@ SOURCE=..\..\7z311\Windows\Window.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Ui\Common\ExtractingFilePath.cpp
+SOURCE=..\..\..\7z311\7zip\Ui\Common\ExtractingFilePath.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\UI\Common\ExtractingFilePath.h
+SOURCE=..\..\..\7z311\7zip\UI\Common\ExtractingFilePath.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\FileDir.cpp
+SOURCE=..\..\..\7z311\Windows\FileDir.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\FileDir.h
+SOURCE=..\..\..\7z311\Windows\FileDir.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\FileFind.cpp
+SOURCE=..\..\..\7z311\Windows\FileFind.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\FileFind.h
+SOURCE=..\..\..\7z311\Windows\FileFind.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\FileName.cpp
+SOURCE=..\..\..\7z311\Windows\FileName.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\FileName.h
+SOURCE=..\..\..\7z311\Windows\FileName.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Common\FilePathAutoRename.cpp
+SOURCE=..\..\..\7z311\7zip\Common\FilePathAutoRename.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Common\FilePathAutoRename.h
+SOURCE=..\..\..\7z311\7zip\Common\FilePathAutoRename.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\System.cpp
+SOURCE=..\..\..\7z311\Windows\System.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Windows\System.h
+SOURCE=..\..\..\7z311\Windows\System.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\Vector.cpp
+SOURCE=..\..\..\7z311\Common\Vector.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\Vector.h
+SOURCE=..\..\..\7z311\Common\Vector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\Wildcard.cpp
+SOURCE=..\..\..\7z311\Common\Wildcard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z311\Common\Wildcard.h
+SOURCE=..\..\..\7z311\Common\Wildcard.h
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\7z311\7zip\Ui\Gui\7zG.exe.manifest
+SOURCE=..\..\..\7z311\7zip\Ui\Gui\7zG.exe.manifest
 # End Source File
 # End Target
 # End Project

diff --git a/ArchiveSupport/Merge7z/Merge7z312.dsp b/ArchiveSupport/Merge7z/Merge7z312.dsp
index bd39d23..2564f0a 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z312.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z312.dsp
@@ -40,12 +40,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Build\MergeRelease"
-# PROP Intermediate_Dir "..\Build\MergeRelease"
+# PROP Output_Dir "..\BuildTmp\Merge7z312___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z312___Win32_Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../7z312" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z312_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z312" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z312_EXPORTS" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z312.dll"
 
 !ELSEIF  "$(CFG)" == "Merge7z312 - Win32 Debug"
 
@@ -66,12 +66,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Build\MergeDebug"
-# PROP Intermediate_Dir "..\Build\MergeDebug"
+# PROP Output_Dir "..\BuildTmp\Merge7z312___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z312___Win32_Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z312" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z312_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z312" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z312_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -81,25 +81,25 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386
-# SUBTRACT LINK32 /map
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z312.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z312.dll"
+# SUBTRACT LINK32 /pdb:none /map
 
 !ELSEIF  "$(CFG)" == "Merge7z312 - Win32 UnicodeDebug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Merge7z312___Win32_UnicodeDebug"
-# PROP BASE Intermediate_Dir "Merge7z312___Win32_UnicodeDebug"
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z312___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z312___Win32_UnicodeDebug"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Build\MergeUnicodeDebug"
-# PROP Intermediate_Dir "..\Build\MergeUnicodeDebug"
+# PROP Output_Dir "..\BuildTmp\Merge7z312___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z312___Win32_UnicodeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z312" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z312" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z312_EXPORTS" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z312" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z312" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z312_EXPORTS" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -109,25 +109,25 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z312.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z312U.dll"
-# SUBTRACT LINK32 /map
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z312U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z312U.dll"
+# SUBTRACT LINK32 /pdb:none /map
 
 !ELSEIF  "$(CFG)" == "Merge7z312 - Win32 UnicodeRelease"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Merge7z312___Win32_UnicodeRelease"
-# PROP BASE Intermediate_Dir "Merge7z312___Win32_UnicodeRelease"
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z312___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z312___Win32_UnicodeRelease"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Build\MergeUnicodeRelease"
-# PROP Intermediate_Dir "..\Build\MergeUnicodeRelease"
+# PROP Output_Dir "..\BuildTmp\Merge7z312___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z312___Win32_UnicodeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../7z312" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../7z312" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z312_EXPORTS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z312" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z312" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z312_EXPORTS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -193,15 +193,15 @@ SOURCE=.\tools.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Ui\Gui\FM.ico
+SOURCE=..\..\..\7z312\7zip\Ui\Gui\FM.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\UI\GUI\resource.h
+SOURCE=..\..\..\7z312\7zip\UI\GUI\resource.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Ui\Gui\resource.rc
+SOURCE=..\..\..\7z312\7zip\Ui\Gui\resource.rc
 # End Source File
 # End Group
 # Begin Group "Windows"
@@ -209,64 +209,43 @@ SOURCE=..\..\7z312\7zip\Ui\Gui\resource.rc
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\DLL.cpp
-
-!IF  "$(CFG)" == "Merge7z312 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "Merge7z312 - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "Merge7z312 - Win32 UnicodeDebug"
-
-!ELSEIF  "$(CFG)" == "Merge7z312 - Win32 UnicodeRelease"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\7z312\Windows\DLL.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\7z312\Windows\FileIO.cpp
+SOURCE=..\..\..\7z312\Windows\FileIO.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\FileIO.h
+SOURCE=..\..\..\7z312\Windows\FileIO.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\PropVariant.cpp
+SOURCE=..\..\..\7z312\Windows\PropVariant.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\PropVariant.h
+SOURCE=..\..\..\7z312\Windows\PropVariant.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\PropVariantConversions.cpp
+SOURCE=..\..\..\7z312\Windows\PropVariantConversions.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\PropVariantConversions.h
+SOURCE=..\..\..\7z312\Windows\PropVariantConversions.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\ResourceString.cpp
+SOURCE=..\..\..\7z312\Windows\ResourceString.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\ResourceString.h
+SOURCE=..\..\..\7z312\Windows\ResourceString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\Synchronization.cpp
+SOURCE=..\..\..\7z312\Windows\Synchronization.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\Synchronization.h
+SOURCE=..\..\..\7z312\Windows\Synchronization.h
 # End Source File
 # End Group
 # Begin Group "Common"
@@ -274,59 +253,59 @@ SOURCE=..\..\7z312\Windows\Synchronization.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\IntToString.cpp
+SOURCE=..\..\..\7z312\Common\IntToString.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\IntToString.h
+SOURCE=..\..\..\7z312\Common\IntToString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\Lang.cpp
+SOURCE=..\..\..\7z312\Common\Lang.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\Lang.h
+SOURCE=..\..\..\7z312\Common\Lang.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\StdInStream.cpp
+SOURCE=..\..\..\7z312\Common\StdInStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\StdInStream.h
+SOURCE=..\..\..\7z312\Common\StdInStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\String.cpp
+SOURCE=..\..\..\7z312\Common\String.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\String.h
+SOURCE=..\..\..\7z312\Common\String.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\StringConvert.cpp
+SOURCE=..\..\..\7z312\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\StringConvert.h
+SOURCE=..\..\..\7z312\Common\StringConvert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\TextConfig.cpp
+SOURCE=..\..\..\7z312\Common\TextConfig.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\TextConfig.h
+SOURCE=..\..\..\7z312\Common\TextConfig.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\UTFConvert.cpp
+SOURCE=..\..\..\7z312\Common\UTFConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\UTFConvert.h
+SOURCE=..\..\..\7z312\Common\UTFConvert.h
 # End Source File
 # End Group
 # Begin Group "7zip Common"
@@ -334,119 +313,119 @@ SOURCE=..\..\7z312\Common\UTFConvert.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Ui\Agent\ArchiveExtractCallback.cpp
+SOURCE=..\..\..\7z312\7zip\Ui\Agent\ArchiveExtractCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\UI\Agent\ArchiveExtractCallback.h
+SOURCE=..\..\..\7z312\7zip\UI\Agent\ArchiveExtractCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Ui\Agent\ArchiveUpdateCallback.cpp
+SOURCE=..\..\..\7z312\7zip\Ui\Agent\ArchiveUpdateCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\UI\Agent\ArchiveUpdateCallback.h
+SOURCE=..\..\..\7z312\7zip\UI\Agent\ArchiveUpdateCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\Control\Dialog.cpp
+SOURCE=..\..\..\7z312\Windows\Control\Dialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\Control\Dialog.h
+SOURCE=..\..\..\7z312\Windows\Control\Dialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\ExtractCallback.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\ExtractCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\ExtractCallback.h
+SOURCE=..\..\..\7z312\7zip\FileManager\ExtractCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Common\FileStreams.cpp
+SOURCE=..\..\..\7z312\7zip\Common\FileStreams.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Common\FileStreams.h
+SOURCE=..\..\..\7z312\7zip\Common\FileStreams.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\FormatUtils.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\FormatUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\FormatUtils.h
+SOURCE=..\..\..\7z312\7zip\FileManager\FormatUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\LangUtils.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\LangUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\LangUtils.h
+SOURCE=..\..\..\7z312\7zip\FileManager\LangUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\OpenCallback.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\OpenCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\OpenCallback.h
+SOURCE=..\..\..\7z312\7zip\FileManager\OpenCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+SOURCE=..\..\..\7z312\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+SOURCE=..\..\..\7z312\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\Registry.cpp
+SOURCE=..\..\..\7z312\Windows\Registry.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\Registry.h
+SOURCE=..\..\..\7z312\Windows\Registry.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\RegistryUtils.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\RegistryUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\RegistryUtils.h
+SOURCE=..\..\..\7z312\7zip\FileManager\RegistryUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\FileManager\UpdateCallback100.cpp
+SOURCE=..\..\..\7z312\7zip\FileManager\UpdateCallback100.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\Window.cpp
+SOURCE=..\..\..\7z312\Windows\Window.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\Window.h
+SOURCE=..\..\..\7z312\Windows\Window.h
 # End Source File
 # End Group
 # Begin Group "Extract"
@@ -454,72 +433,72 @@ SOURCE=..\..\7z312\Windows\Window.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Ui\Common\ExtractingFilePath.cpp
+SOURCE=..\..\..\7z312\7zip\Ui\Common\ExtractingFilePath.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\UI\Common\ExtractingFilePath.h
+SOURCE=..\..\..\7z312\7zip\UI\Common\ExtractingFilePath.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\FileDir.cpp
+SOURCE=..\..\..\7z312\Windows\FileDir.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\FileDir.h
+SOURCE=..\..\..\7z312\Windows\FileDir.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\FileFind.cpp
+SOURCE=..\..\..\7z312\Windows\FileFind.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\FileFind.h
+SOURCE=..\..\..\7z312\Windows\FileFind.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\FileName.cpp
+SOURCE=..\..\..\7z312\Windows\FileName.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\FileName.h
+SOURCE=..\..\..\7z312\Windows\FileName.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Common\FilePathAutoRename.cpp
+SOURCE=..\..\..\7z312\7zip\Common\FilePathAutoRename.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Common\FilePathAutoRename.h
+SOURCE=..\..\..\7z312\7zip\Common\FilePathAutoRename.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\System.cpp
+SOURCE=..\..\..\7z312\Windows\System.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Windows\System.h
+SOURCE=..\..\..\7z312\Windows\System.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\Vector.cpp
+SOURCE=..\..\..\7z312\Common\Vector.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\Vector.h
+SOURCE=..\..\..\7z312\Common\Vector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\Wildcard.cpp
+SOURCE=..\..\..\7z312\Common\Wildcard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z312\Common\Wildcard.h
+SOURCE=..\..\..\7z312\Common\Wildcard.h
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\7z312\7zip\Ui\Gui\7zG.exe.manifest
+SOURCE=..\..\..\7z312\7zip\Ui\Gui\7zG.exe.manifest
 # End Source File
 # End Target
 # End Project

diff --git a/ArchiveSupport/Merge7z/Merge7z313.dsp b/ArchiveSupport/Merge7z/Merge7z313.dsp
index 43f75f6..61f5564 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z313.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z313.dsp
@@ -40,12 +40,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Build\MergeRelease"
-# PROP Intermediate_Dir "..\Build\MergeRelease"
+# PROP Output_Dir "..\BuildTmp\Merge7z313___Win32_Release"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z313___Win32_Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../7z313" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z313_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z313" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z313_EXPORTS" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z313.dll"
 
 !ELSEIF  "$(CFG)" == "Merge7z313 - Win32 Debug"
 
@@ -66,12 +66,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Build\MergeDebug"
-# PROP Intermediate_Dir "..\Build\MergeDebug"
+# PROP Output_Dir "..\BuildTmp\Merge7z313___Win32_Debug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z313___Win32_Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z313" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z313_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z313" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z313_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -81,25 +81,25 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386
-# SUBTRACT LINK32 /map
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z313.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z313.dll"
+# SUBTRACT LINK32 /pdb:none /map
 
 !ELSEIF  "$(CFG)" == "Merge7z313 - Win32 UnicodeDebug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Merge7z313___Win32_UnicodeDebug"
-# PROP BASE Intermediate_Dir "Merge7z313___Win32_UnicodeDebug"
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z313___Win32_UnicodeDebug"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z313___Win32_UnicodeDebug"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Build\MergeUnicodeDebug"
-# PROP Intermediate_Dir "..\Build\MergeUnicodeDebug"
+# PROP Output_Dir "..\BuildTmp\Merge7z313___Win32_UnicodeDebug"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z313___Win32_UnicodeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z313" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z313" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z313_EXPORTS" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z313" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z313" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z313_EXPORTS" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -109,25 +109,25 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z313.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z313U.dll"
-# SUBTRACT LINK32 /map
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z313U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z313U.dll"
+# SUBTRACT LINK32 /pdb:none /map
 
 !ELSEIF  "$(CFG)" == "Merge7z313 - Win32 UnicodeRelease"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Merge7z313___Win32_UnicodeRelease"
-# PROP BASE Intermediate_Dir "Merge7z313___Win32_UnicodeRelease"
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z313___Win32_UnicodeRelease"
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z313___Win32_UnicodeRelease"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Build\MergeUnicodeRelease"
-# PROP Intermediate_Dir "..\Build\MergeUnicodeRelease"
+# PROP Output_Dir "..\BuildTmp\Merge7z313___Win32_UnicodeRelease"
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z313___Win32_UnicodeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../7z313" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../7z313" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z313_EXPORTS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z313" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z313" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7z313_EXPORTS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -193,15 +193,15 @@ SOURCE=.\tools.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Ui\Gui\FM.ico
+SOURCE=..\..\..\7z313\7zip\Ui\Gui\FM.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\UI\GUI\resource.h
+SOURCE=..\..\..\7z313\7zip\UI\GUI\resource.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Ui\Gui\resource.rc
+SOURCE=..\..\..\7z313\7zip\Ui\Gui\resource.rc
 # End Source File
 # End Group
 # Begin Group "Windows"
@@ -209,64 +209,43 @@ SOURCE=..\..\7z313\7zip\Ui\Gui\resource.rc
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\DLL.cpp
-
-!IF  "$(CFG)" == "Merge7z313 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "Merge7z313 - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "Merge7z313 - Win32 UnicodeDebug"
-
-!ELSEIF  "$(CFG)" == "Merge7z313 - Win32 UnicodeRelease"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\7z313\Windows\DLL.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\7z313\Windows\FileIO.cpp
+SOURCE=..\..\..\7z313\Windows\FileIO.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\FileIO.h
+SOURCE=..\..\..\7z313\Windows\FileIO.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\PropVariant.cpp
+SOURCE=..\..\..\7z313\Windows\PropVariant.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\PropVariant.h
+SOURCE=..\..\..\7z313\Windows\PropVariant.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\PropVariantConversions.cpp
+SOURCE=..\..\..\7z313\Windows\PropVariantConversions.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\PropVariantConversions.h
+SOURCE=..\..\..\7z313\Windows\PropVariantConversions.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\ResourceString.cpp
+SOURCE=..\..\..\7z313\Windows\ResourceString.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\ResourceString.h
+SOURCE=..\..\..\7z313\Windows\ResourceString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\Synchronization.cpp
+SOURCE=..\..\..\7z313\Windows\Synchronization.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\Synchronization.h
+SOURCE=..\..\..\7z313\Windows\Synchronization.h
 # End Source File
 # End Group
 # Begin Group "Common"
@@ -274,59 +253,59 @@ SOURCE=..\..\7z313\Windows\Synchronization.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\IntToString.cpp
+SOURCE=..\..\..\7z313\Common\IntToString.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\IntToString.h
+SOURCE=..\..\..\7z313\Common\IntToString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\Lang.cpp
+SOURCE=..\..\..\7z313\Common\Lang.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\Lang.h
+SOURCE=..\..\..\7z313\Common\Lang.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\StdInStream.cpp
+SOURCE=..\..\..\7z313\Common\StdInStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\StdInStream.h
+SOURCE=..\..\..\7z313\Common\StdInStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\String.cpp
+SOURCE=..\..\..\7z313\Common\String.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\String.h
+SOURCE=..\..\..\7z313\Common\String.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\StringConvert.cpp
+SOURCE=..\..\..\7z313\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\StringConvert.h
+SOURCE=..\..\..\7z313\Common\StringConvert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\TextConfig.cpp
+SOURCE=..\..\..\7z313\Common\TextConfig.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\TextConfig.h
+SOURCE=..\..\..\7z313\Common\TextConfig.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\UTFConvert.cpp
+SOURCE=..\..\..\7z313\Common\UTFConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\UTFConvert.h
+SOURCE=..\..\..\7z313\Common\UTFConvert.h
 # End Source File
 # End Group
 # Begin Group "7zip Common"
@@ -334,119 +313,119 @@ SOURCE=..\..\7z313\Common\UTFConvert.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Ui\Agent\ArchiveExtractCallback.cpp
+SOURCE=..\..\..\7z313\7zip\Ui\Agent\ArchiveExtractCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\UI\Agent\ArchiveExtractCallback.h
+SOURCE=..\..\..\7z313\7zip\UI\Agent\ArchiveExtractCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Ui\Agent\ArchiveUpdateCallback.cpp
+SOURCE=..\..\..\7z313\7zip\Ui\Agent\ArchiveUpdateCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\UI\Agent\ArchiveUpdateCallback.h
+SOURCE=..\..\..\7z313\7zip\UI\Agent\ArchiveUpdateCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\Control\Dialog.cpp
+SOURCE=..\..\..\7z313\Windows\Control\Dialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\Control\Dialog.h
+SOURCE=..\..\..\7z313\Windows\Control\Dialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\ExtractCallback.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\ExtractCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\ExtractCallback.h
+SOURCE=..\..\..\7z313\7zip\FileManager\ExtractCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Common\FileStreams.cpp
+SOURCE=..\..\..\7z313\7zip\Common\FileStreams.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Common\FileStreams.h
+SOURCE=..\..\..\7z313\7zip\Common\FileStreams.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\FormatUtils.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\FormatUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\FormatUtils.h
+SOURCE=..\..\..\7z313\7zip\FileManager\FormatUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\LangUtils.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\LangUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\LangUtils.h
+SOURCE=..\..\..\7z313\7zip\FileManager\LangUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\Resource\MessagesDialog\MessagesDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\OpenCallback.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\OpenCallback.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\OpenCallback.h
+SOURCE=..\..\..\7z313\7zip\FileManager\OpenCallback.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\Resource\OverwriteDialog\OverwriteDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
+SOURCE=..\..\..\7z313\7zip\FileManager\Resource\PasswordDialog\PasswordDialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
+SOURCE=..\..\..\7z313\7zip\FileManager\Resource\ProgressDialog2\ProgressDialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\Registry.cpp
+SOURCE=..\..\..\7z313\Windows\Registry.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\Registry.h
+SOURCE=..\..\..\7z313\Windows\Registry.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\RegistryUtils.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\RegistryUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\RegistryUtils.h
+SOURCE=..\..\..\7z313\7zip\FileManager\RegistryUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\FileManager\UpdateCallback100.cpp
+SOURCE=..\..\..\7z313\7zip\FileManager\UpdateCallback100.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\Window.cpp
+SOURCE=..\..\..\7z313\Windows\Window.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\Window.h
+SOURCE=..\..\..\7z313\Windows\Window.h
 # End Source File
 # End Group
 # Begin Group "Extract"
@@ -454,72 +433,72 @@ SOURCE=..\..\7z313\Windows\Window.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Ui\Common\ExtractingFilePath.cpp
+SOURCE=..\..\..\7z313\7zip\Ui\Common\ExtractingFilePath.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\UI\Common\ExtractingFilePath.h
+SOURCE=..\..\..\7z313\7zip\UI\Common\ExtractingFilePath.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\FileDir.cpp
+SOURCE=..\..\..\7z313\Windows\FileDir.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\FileDir.h
+SOURCE=..\..\..\7z313\Windows\FileDir.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\FileFind.cpp
+SOURCE=..\..\..\7z313\Windows\FileFind.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\FileFind.h
+SOURCE=..\..\..\7z313\Windows\FileFind.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\FileName.cpp
+SOURCE=..\..\..\7z313\Windows\FileName.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\FileName.h
+SOURCE=..\..\..\7z313\Windows\FileName.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Common\FilePathAutoRename.cpp
+SOURCE=..\..\..\7z313\7zip\Common\FilePathAutoRename.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Common\FilePathAutoRename.h
+SOURCE=..\..\..\7z313\7zip\Common\FilePathAutoRename.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\System.cpp
+SOURCE=..\..\..\7z313\Windows\System.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Windows\System.h
+SOURCE=..\..\..\7z313\Windows\System.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\Vector.cpp
+SOURCE=..\..\..\7z313\Common\Vector.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\Vector.h
+SOURCE=..\..\..\7z313\Common\Vector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\Wildcard.cpp
+SOURCE=..\..\..\7z313\Common\Wildcard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7z313\Common\Wildcard.h
+SOURCE=..\..\..\7z313\Common\Wildcard.h
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\7z313\7zip\Ui\Gui\7zG.exe.manifest
+SOURCE=..\..\..\7z313\7zip\Ui\Gui\7zG.exe.manifest
 # End Source File
 # End Target
 # End Project

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index e94c24b..07f0764 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -40,6 +40,7 @@
 #include "logfile.h"
 #include "paths.h"
 #include "WaitStatusCursor.h"
+#include "7zCommon.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -79,6 +80,8 @@ CDirDoc::~CDirDoc()
        
        delete m_pFilterGlobal;
        delete m_pFilterUI;
+       // Delete all temporary folders belonging to this document
+       CTempPath(this);
 }
 
 // callback we give our frame

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index c8c63a8..85fefff 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -39,6 +39,7 @@
 #include "FileTransform.h"
 #include "SelectUnpackerDlg.h"
 #include "paths.h"     // paths_GetParentPath()
+#include "7zCommon.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -132,6 +133,10 @@ BEGIN_MESSAGE_MAP(CDirView, CListViewEx)
        ON_UPDATE_COMMAND_UI(ID_FILE_RIGHT_READONLY, OnUpdateRightReadOnly)
        ON_COMMAND(ID_TOOLS_CUSTOMIZECOLUMNS, OnCustomizeColumns)
        ON_COMMAND(ID_EDIT_COPY, OnEditCopy)
+       ON_COMMAND(ID_DIR_ZIP_LEFT, OnCtxtDirZipLeft)
+       ON_COMMAND(ID_DIR_ZIP_RIGHT, OnCtxtDirZipRight)
+       ON_COMMAND(ID_DIR_ZIP_BOTH, OnCtxtDirZipBoth)
+       ON_COMMAND(ID_DIR_ZIP_BOTH_DIFFS_ONLY, OnCtxtDirZipBothDiffsOnly)
        //}}AFX_MSG_MAP
        ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
        ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnInfoTip)
@@ -370,6 +375,21 @@ static CWnd * GetNonChildAncestor(CWnd * w)
 }
 
 /**
+ * @brief Format context menu string and disable item if it cannot be applied.
+ */
+static void NTAPI FormatContextMenu(CMenu *pPopup, UINT uIDItem, int n1, int n2 = 0, int n3 = 0)
+{
+       CString s1, s2;
+       pPopup->GetMenuString(uIDItem, s1, MF_BYCOMMAND);
+       s2.FormatMessage(s1, NumToStr(n1), NumToStr(n2), NumToStr(n3));
+       pPopup->ModifyMenu(uIDItem, MF_BYCOMMAND, uIDItem, s2);
+       if (n1 == 0)
+       {
+               pPopup->EnableMenuItem(uIDItem, MF_GRAYED);
+       }
+}
+
+/**
  * @brief User right-clicked in listview rows
  */
 void CDirView::ListContextMenu(CPoint point, int /*i*/)
@@ -385,18 +405,73 @@ void CDirView::ListContextMenu(CPoint point, int /*i*/)
        CString sl, sr;
        GetSelectedDirNames(sl, sr);
 
-       // find non-child ancestor to use as menu parent
-       CWnd * pWndPopupOwner = GetNonChildAncestor(this);
-
        // TODO: It would be more efficient to set
        // all the popup items now with one traverse over selected items
        // instead of using updates, in which we make a traverse for every item
        // Perry, 2002-12-04
 
+       //2003/12/17 Jochen:
+       //-     Archive related menu items follow the above suggestion.
+       //-     For disabling to work properly, the tracking frame's m_bAutoMenuEnable
+       //      member has to temporarily be turned off.
+       int nTotal = 0;
+       int nCopyableToLeft = 0;
+       int nCopyableToRight = 0;
+       int nDeletableOnLeft = 0;
+       int nDeletableOnRight = 0;
+       int nDeletableOnBoth = 0;
+       int nOpenableOnLeft = 0;
+       int nOpenableOnRight = 0;
+       int nOpenableOnLeftWith = 0;
+       int nOpenableOnRightWith = 0;
+       int nDiffItems = 0;
+       int nDiffFiles = 0;
+       int i = -1;
+       while ((i = m_pList->GetNextItem(i, LVNI_SELECTED)) != -1)
+       {
+               const DIFFITEM& di = GetDiffItem(i);
+               if (IsItemCopyableToLeft(di))
+                       ++nCopyableToLeft;
+               if (IsItemCopyableToRight(di))
+                       ++nCopyableToRight;
+               if (IsItemDeletableOnLeft(di))
+                       ++nDeletableOnLeft;
+               if (IsItemDeletableOnRight(di))
+                       ++nDeletableOnRight;
+               if (IsItemDeletableOnBoth(di))
+                       ++nDeletableOnBoth;
+               if (IsItemOpenableOnLeft(di))
+                       ++nOpenableOnLeft;
+               if (IsItemOpenableOnRight(di))
+                       ++nOpenableOnRight;
+               if (IsItemOpenableOnLeftWith(di))
+                       ++nOpenableOnLeftWith;
+               if (IsItemOpenableOnRightWith(di))
+                       ++nOpenableOnRightWith;
+               if (IsItemNavigableDiff(di))
+               {
+                       ++nDiffItems;
+                       if (IsItemOpenableOnLeftWith(di))
+                               ++nDiffFiles;
+                       if (IsItemOpenableOnRightWith(di))
+                               ++nDiffFiles;
+               }
+               ++nTotal;
+       }
+
+       FormatContextMenu(pPopup, ID_DIR_ZIP_LEFT, nOpenableOnLeftWith, nTotal);
+       FormatContextMenu(pPopup, ID_DIR_ZIP_RIGHT, nOpenableOnRightWith, nTotal);
+       FormatContextMenu(pPopup, ID_DIR_ZIP_BOTH, nOpenableOnLeftWith + nOpenableOnRightWith, nTotal);
+       FormatContextMenu(pPopup, ID_DIR_ZIP_BOTH_DIFFS_ONLY, nDiffFiles, nDiffItems, nTotal);
+
+       CFrameWnd *pFrame = GetTopLevelFrame();
+       ASSERT(pFrame != NULL);
+       pFrame->m_bAutoMenuEnable = FALSE;
        // invoke context menu
        // this will invoke all the OnUpdate methods to enable/disable the individual items
        pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y,
-               pWndPopupOwner);
+               pFrame);
+       pFrame->m_bAutoMenuEnable = TRUE;
 }
 
 /**
@@ -413,13 +488,12 @@ void CDirView::HeaderContextMenu(CPoint point, int /*i*/)
        ASSERT(pPopup != NULL);
 
        // find non-child ancestor to use as menu parent
-       CWnd * pWndPopupOwner = GetNonChildAncestor(this);
-
+       CFrameWnd *pFrame = GetTopLevelFrame();
+       ASSERT(pFrame != NULL);
        // invoke context menu
        // this will invoke all the OnUpdate methods to enable/disable the individual items
        pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y,
-               pWndPopupOwner);
-       
+               pFrame);
 }      
 
 /// Make a string out of a number
@@ -1839,3 +1913,56 @@ void CDirView::AddParentFolderItem()
        lvItem.pszText = const_cast<LPTSTR>(_T(".."));
        GetListCtrl().SetItem(&lvItem);
 }
+
+/**
+ * @brief Zip selected files from left side.
+ */
+void CDirView::OnCtxtDirZipLeft() 
+{
+       DirItemEnumerator
+       (
+               this, LVNI_SELECTED
+       |       DirItemEnumerator::Left
+       ).CompressArchive();
+}
+
+/**
+ * @brief Zip selected files from right side.
+ */
+void CDirView::OnCtxtDirZipRight() 
+{
+       DirItemEnumerator
+       (
+               this, LVNI_SELECTED
+       |       DirItemEnumerator::Right
+       ).CompressArchive();
+}
+
+/**
+ * @brief Zip selected files from both sides, using original/altered format.
+ */
+void CDirView::OnCtxtDirZipBoth() 
+{
+       DirItemEnumerator
+       (
+               this, LVNI_SELECTED
+       |       DirItemEnumerator::Original
+       |       DirItemEnumerator::Altered
+       |       DirItemEnumerator::BalanceFolders
+       ).CompressArchive();
+}
+
+/**
+ * @brief Zip selected diffs from both sides, using original/altered format.
+ */
+void CDirView::OnCtxtDirZipBothDiffsOnly() 
+{
+       DirItemEnumerator
+       (
+               this, LVNI_SELECTED
+       |       DirItemEnumerator::Original
+       |       DirItemEnumerator::Altered
+       |       DirItemEnumerator::BalanceFolders
+       |       DirItemEnumerator::DiffsOnly
+       ).CompressArchive();
+}

diff --git a/Src/DirView.h b/Src/DirView.h
index 4c0c41f..7ae5750 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -276,6 +276,11 @@ protected:
        afx_msg void OnCtxtOpenWithUnpacker();
        afx_msg void OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI);
        afx_msg void OnEditCopy();
+       afx_msg void OnCtxtDirZipLeft();
+       afx_msg void OnCtxtDirZipRight();
+       afx_msg void OnCtxtDirZipBoth();
+       afx_msg void OnCtxtDirZipBothDiffsOnly();
+       afx_msg void OnUpdateCtxtDir(CCmdUI* pCmdUI);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
        BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 3f819fc..0323a8c 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -61,6 +61,8 @@
 #include "SelectUnpackerDlg.h"
 #include "files.h"
 #include "ConfigLog.h"
+#include "7zCommon.h"
+#include <shlwapi.h>
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -192,6 +194,8 @@ CMainFrame::~CMainFrame()
 {
        // destroy the reg expression list
        FreeRegExpList();
+       // Delete all temporary folders belonging to this process
+       CTempPath(0);
 }
 
 // This is a bridge to implement IStatusDisplay for WaitStatusCursor
@@ -1157,6 +1161,76 @@ BOOL CMainFrame::DoFileOpen(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*
                                  m_bScrollToFirst);
        }
 
+       // Handle archives using 7-zip
+       if (Merge7z::Format *piHandler = Merge7z->GuessFormat(strLeft))
+       {
+               pathsType = IS_EXISTING_DIR;
+               if (strRight == strLeft)
+               {
+                       strRight.Empty();
+               }
+               CTempPath path = pDirDoc;
+               do
+               {
+                       if FAILED(piHandler->DeCompressArchive(m_hWnd, strLeft, path))
+                               break;
+                       if (strLeft.Find(path) == 0)
+                       {
+                               DeleteFile(strLeft);
+                       }
+                       strLeft.Delete(0, strLeft.ReverseFind('\\'));
+                       int dot = strLeft.ReverseFind('.');
+                       if (piHandler != &Merge7z->TarHandler && StrChr(_T("Tt"), strLeft[dot + 1]))
+                       {
+                               strLeft.GetBufferSetLength(dot + 2);
+                               strLeft += _T("ar");
+                       }
+                       else
+                       {
+                               strLeft.GetBufferSetLength(dot);
+                       }
+                       strLeft.Insert(0, path);
+               } while (piHandler = Merge7z->GuessFormat(strLeft));
+               strLeft = path;
+               if (Merge7z::Format *piHandler = Merge7z->GuessFormat(strRight))
+               {
+                       path.MakeSibling(_T(".1"));
+                       do
+                       {
+                               if FAILED(piHandler->DeCompressArchive(m_hWnd, strRight, path))
+                                       break;;
+                               if (strRight.Find(path) == 0)
+                               {
+                                       DeleteFile(strRight);
+                               }
+                               strRight.Delete(0, strRight.ReverseFind('\\'));
+                               int dot = strRight.ReverseFind('.');
+                               if (piHandler != &Merge7z->TarHandler && StrChr(_T("Tt"), strRight[dot + 1]))
+                               {
+                                       strRight.GetBufferSetLength(dot + 2);
+                                       strRight += _T("ar");
+                               }
+                               else
+                               {
+                                       strRight.GetBufferSetLength(dot);
+                               }
+                               strRight.Insert(0, path);
+                       } while (piHandler = Merge7z->GuessFormat(strRight));
+                       strRight = path;
+               }
+               else if (strRight.IsEmpty())
+               {
+                       // assume Perry style patch
+                       strRight = path;
+                       strLeft += _T("\\ORIGINAL");
+                       strRight += _T("\\ALTERED");
+                       if (!PathFileExists(strLeft) || !PathFileExists(strRight))
+                       {
+                               // not a Perry style patch: diff with itself...
+                               strLeft = strRight = path;
+                       }
+               }
+       }
        // open the diff
        if (pathsType == IS_EXISTING_DIR)
        {
@@ -2171,6 +2245,14 @@ void CMainFrame::OnDropFiles(HDROP dropInfo)
 
        // If Ctrl pressed, do recursive compare
        BOOL ctrlKey = ::GetAsyncKeyState(VK_CONTROL);
+
+       // If user has <Shift> pressed with one file selected,
+       // assume it is an archive and set filenames to same
+       if (::GetAsyncKeyState(VK_SHIFT) < 0 && fileCount == 1)
+       {
+               files[1] = files[0];
+       }
+
        DoFileOpen(files[0], files[1], FFILEOPEN_NONE, FFILEOPEN_NONE, ctrlKey);
 }
 

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index 7c8aaff..c74dc2c 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -235,6 +235,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=.\7zCommon.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\diffutils\src\ANALYZE.C
 
 !IF  "$(CFG)" == "Merge - Win32 Release"
@@ -751,10 +755,6 @@ SOURCE=.\diffutils\GnuVersion.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\WMGotoDlg.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\diffutils\src\IFDEF.C
 
 !IF  "$(CFG)" == "Merge - Win32 Release"
@@ -1428,12 +1428,20 @@ SOURCE=.\VssPrompt.cpp
 
 SOURCE=.\WaitStatusCursor.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\WMGotoDlg.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=.\7zCommon.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\BCMenu.h
 # End Source File
 # Begin Source File
@@ -1578,10 +1586,6 @@ SOURCE=.\GhostTextView.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\WMGotoDlg.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\Common\LanguageSelect.h
 # End Source File
 # Begin Source File
@@ -1772,6 +1776,10 @@ SOURCE=.\VssPrompt.h
 
 SOURCE=.\WaitStatusCursor.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\WMGotoDlg.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -2139,10 +2147,10 @@ SOURCE=.\stampver.inf
 # End Source File
 # End Target
 # End Project
+# Section Merge : {00312E6C-0754-0055-90BD-550078075500}
+#      1:19:IDR_POPUP_ABOUT_DLG:104
+# End Section
 # Section Merge : {6F747475-446E-6C62-436C-6B0000003100}
 #      1:10:IDB_SPLASH:103
 #      2:21:SplashScreenInsertKey:4.0
 # End Section
-# Section Merge : {00312E6C-0754-0055-90BD-550078075500}
-#      1:19:IDR_POPUP_ABOUT_DLG:104
-# End Section

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 26d1529..7cb754c 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -249,6 +249,19 @@ BEGIN
             MENUITEM "with external editor",        ID_DIR_OPEN_RIGHT_WITHEDITOR
             MENUITEM "with...",                     ID_DIR_OPEN_RIGHT_WITH
         END
+        MENUITEM SEPARATOR
+        POPUP "Zip"
+        BEGIN
+            MENUITEM "Zip left side %1 file(s) from %2 selected item(s)", 
+                                                    ID_DIR_ZIP_LEFT
+            MENUITEM "Zip right side %1 file(s) from %2 selected item(s)", 
+                                                    ID_DIR_ZIP_RIGHT
+            MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)", 
+                                                    ID_DIR_ZIP_BOTH
+            MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)", 
+                                                    ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+        END
     END
     POPUP "_HDR_POPUP_"
     BEGIN
@@ -1149,6 +1162,7 @@ BEGIN
     IDR_MAINFRAME           "WinMerge"
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+    IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE

diff --git a/Src/readme.txt b/Src/readme.txt
index 5f05b7d..e32f7c9 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2004-01-19 Jochen
+ Finish Merge7z integration
+  src: Merge.rc resource.h DirView.cpp DirView.h DirDoc.cpp MainFrm.cpp Merge.dsp
+  Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
+
 2004-01-19 Perry
  PATCH: [ 880046 ] Save every line including last one in SaveToFile
   src: MergeDoc.cpp

diff --git a/Src/resource.h b/Src/resource.h
index 71385ed..7bffec2 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -16,6 +16,7 @@
 #define IDD_OPEN                        106
 #define IDS_WINMERGE_THIS_DIRECTORY     106
 #define IDD_EDITFILE                    107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
@@ -529,6 +530,10 @@
 #define ID_DIR_COPY_RIGHT_TO_BROWSE     32857
 #define ID_WINDOW_CHANGE_PANE           32858
 #define ID_EDIT_WMGOTO                  32859
+#define ID_DIR_ZIP_LEFT                 32860
+#define ID_DIR_ZIP_RIGHT                32861
+#define ID_DIR_ZIP_BOTH                 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
 
 // Next default values for new objects
 //
@@ -536,7 +541,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        121
-#define _APS_NEXT_COMMAND_VALUE         32860
+#define _APS_NEXT_COMMAND_VALUE         32864
 #define _APS_NEXT_CONTROL_VALUE         1108
 #define _APS_NEXT_SYMED_VALUE           108
 #endif