--- /dev/null
+/*/Merge7z453.cpp\r
+\r
+Copyright (c) Jochen Neubeck\r
+\r
+This library is free software; you can redistribute it and/or\r
+modify it under the terms of the GNU Lesser General Public\r
+License as published by the Free Software Foundation; either\r
+version 2.1 of the License, or (at your option) any later version.\r
+\r
+This library is distributed in the hope that it will be useful,\r
+but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
+Lesser General Public License for more details.\r
+\r
+You should have received a copy of the GNU Lesser General Public\r
+License along with this library; if not, write to the Free Software\r
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\r
+\r
+Please mind 2. b) of the GNU LGPL terms, and log your changes below.\r
+\r
+DATE: BY: DESCRIPTION:\r
+========== ================== ================================================\r
+2007-08-30 Jochen Neubeck Branched from Merge7z409.cpp\r
+*/\r
+\r
+#include "stdafx.h"\r
+\r
+#define INITGUID\r
+#include <initguid.h>\r
+\r
+#include "Merge7zCommon.h"\r
+\r
+#include "7zip/UI/FileManager/OpenCallback.h"\r
+#include "7zip/UI/FileManager/ExtractCallback.h"\r
+\r
+#include "7zip/UI/Common/ArchiveExtractCallback.h"\r
+#include "7zip/UI/GUI/UpdateCallbackGUI.h"\r
+\r
+#include "Windows/Thread.h"\r
+\r
+/**\r
+ * @brief Extraction thread\r
+ */\r
+class CThreadExtracting : CThread\r
+{\r
+protected:\r
+ THREAD_FUNC_RET_TYPE Process()\r
+ {\r
+ ExtractCallbackSpec->ProgressDialog.WaitCreating();\r
+ result = Archive->Extract(indices, numItems, false, ArchiveExtractCallback);\r
+ ExtractCallbackSpec->ProgressDialog.MyClose();\r
+ return 0;\r
+ }\r
+ static THREAD_FUNC_RET_TYPE WINAPI Process(void *param)\r
+ {\r
+ return ((CThreadExtracting *)param)->Process();\r
+ }\r
+ CExtractCallbackImp *ExtractCallbackSpec;\r
+ IInArchive *Archive;\r
+ IArchiveExtractCallback *ArchiveExtractCallback;\r
+ const UINT32 *indices;\r
+ UINT32 numItems;\r
+public:\r
+ HRESULT result;\r
+\r
+ CThreadExtracting\r
+ (\r
+ CExtractCallbackImp *ExtractCallbackSpec,\r
+ IInArchive *Archive,\r
+ IArchiveExtractCallback *ArchiveExtractCallback,\r
+ const CSysString &title,\r
+ const UINT32 *indices = 0,\r
+ UINT32 numItems = -1\r
+ ):\r
+ ExtractCallbackSpec(ExtractCallbackSpec),\r
+ Archive(Archive),\r
+ ArchiveExtractCallback(ArchiveExtractCallback),\r
+ indices(indices),\r
+ numItems(numItems)\r
+ {\r
+ result = E_FAIL;\r
+ if (HRESULT hr = Create(Process, this))\r
+ {\r
+ Complain(hr, NULL);\r
+ }\r
+ ExtractCallbackSpec->StartProgressDialog(GetUnicodeString(title));\r
+ }\r
+};\r
+\r
+/**\r
+ * @brief Initialize Inspector\r
+ */\r
+Format7zDLL::Interface::Inspector::Inspector(Format7zDLL::Interface *format, LPCTSTR path)\r
+: format(format), archive(0), file(0), callback(0), path(path), ustrDefaultName(GetUnicodeString(path))\r
+{\r
+}\r
+\r
+/**\r
+ * @brief Initialize Inspector\r
+ */\r
+void Format7zDLL::Interface::Inspector::Init(HWND hwndParent)\r
+{\r
+ format->GetDefaultName(hwndParent, ustrDefaultName);\r
+ COpenArchiveCallback *callbackImpl = new COpenArchiveCallback;\r
+ //COpenCallbackImp *callbackImpl = new COpenCallbackImp;\r
+ (archive = format->GetInArchive()) -> AddRef();\r
+ (file = new CInFileStream) -> AddRef();\r
+ (callback = callbackImpl) -> AddRef();\r
+ callbackImpl->PasswordIsDefined = false;\r
+ callbackImpl->ParentWindow = hwndParent;\r
+ /*CMyComBSTR password;\r
+ callback->CryptoGetTextPassword(&password);*/\r
+ if COMPLAIN(!NFile::NFind::FindFile(path, fileInfo))\r
+ {\r
+ Complain(ERROR_FILE_NOT_FOUND, path);\r
+ }\r
+ if COMPLAIN(!file->Open(path))\r
+ {\r
+ Complain(ERROR_OPEN_FAILED, path);\r
+ }\r
+ if COMPLAIN(archive->Open(file, 0, callback) != S_OK)\r
+ {\r
+ Complain(ERROR_CANT_ACCESS_FILE, path);\r
+ }\r
+ passwordIsDefined = callbackImpl->PasswordIsDefined;\r
+ password = callbackImpl->Password;\r
+}\r
+\r
+/**\r
+ * @brief Extract set of items specified by index\r
+ */\r
+HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR folder, const UINT32 *indices, UINT32 numItems)\r
+{\r
+ CArchiveExtractCallback *extractCallbackSpec = 0;\r
+ CExtractCallbackImp *extractCallbackSpec2 = 0;\r
+ HRESULT result = 0;\r
+ try\r
+ {\r
+ if (*folder)\r
+ {\r
+ if COMPLAIN(!NFile::NDirectory::CreateComplexDirectory(folder))\r
+ {\r
+ Complain(ERROR_CANNOT_MAKE, folder);\r
+ }\r
+ }\r
+\r
+ (extractCallbackSpec2 = new CExtractCallbackImp) -> AddRef();\r
+\r
+ extractCallbackSpec2->Init();\r
+\r
+ extractCallbackSpec2->ParentWindow = hwndParent;\r
+ extractCallbackSpec2->OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt;\r
+ extractCallbackSpec2->PasswordIsDefined = passwordIsDefined;\r
+ extractCallbackSpec2->Password = password;\r
+\r
+ extractCallbackSpec2->ProgressDialog.MainWindow = 0;\r
+ (extractCallbackSpec = new CArchiveExtractCallback) -> AddRef();\r
+\r
+ extractCallbackSpec->InitForMulti\r
+ (\r
+ false,\r
+ NExtract::NPathMode::kFullPathnames,\r
+ NExtract::NOverwriteMode::kWithoutPrompt\r
+ );\r
+ extractCallbackSpec->Init\r
+ (\r
+ archive, \r
+ extractCallbackSpec2,\r
+ false, //stdOutMode\r
+ GetUnicodeString(folder),\r
+ UStringVector(),\r
+ ustrDefaultName,\r
+ fileInfo.LastWriteTime,\r
+ fileInfo.Attributes,\r
+ (UInt64)(Int64)-1\r
+ );\r
+\r
+ result = CThreadExtracting\r
+ (\r
+ extractCallbackSpec2,\r
+ archive,\r
+ extractCallbackSpec,\r
+ PathFindFileName(path),\r
+ indices,\r
+ numItems\r
+ ).result;\r
+\r
+ if COMPLAIN(extractCallbackSpec->_numErrors)\r
+ {\r
+ // There is no canned system message for this one, so it won't\r
+ // localize. I can't help it.\r
+ Complain(_T("%s:\n%I64u error(s)"), path, extractCallbackSpec->_numErrors);\r
+ }\r
+ if COMPLAIN(result != S_OK && result != E_ABORT)\r
+ {\r
+ Complain(result, path);\r
+ }\r
+ }\r
+ catch (Complain *complain)\r
+ {\r
+ result = complain->Alert(hwndParent);\r
+ }\r
+ Release(static_cast<IArchiveExtractCallback*>(extractCallbackSpec));\r
+ Release(static_cast<IFolderArchiveExtractCallback*>(extractCallbackSpec2));\r
+ return result;\r
+}\r
+\r
+/**\r
+ * @brief Compression thread\r
+ */\r
+class CThreadUpdateCompress : CThread\r
+{\r
+protected:\r
+ THREAD_FUNC_RET_TYPE Process()\r
+ {\r
+ updateCallbackGUI->ProgressDialog.WaitCreating();\r
+ result = outArchive->UpdateItems(file, numItems, updateCallbackSpec);\r
+ updateCallbackGUI->ProgressDialog.MyClose();\r
+ return 0;\r
+ }\r
+ static THREAD_FUNC_RET_TYPE WINAPI Process(void *param)\r
+ {\r
+ return ((CThreadUpdateCompress *)param)->Process();\r
+ }\r
+ CUpdateCallbackGUI *updateCallbackGUI;\r
+ IOutArchive *outArchive;\r
+ CArchiveUpdateCallback *updateCallbackSpec;\r
+ COutFileStream *file;\r
+public:\r
+ HRESULT result;\r
+ UINT32 numItems;\r
+ CThreadUpdateCompress\r
+ (\r
+ CUpdateCallbackGUI *updateCallbackGUI,\r
+ IOutArchive *outArchive,\r
+ CArchiveUpdateCallback *updateCallbackSpec,\r
+ UINT32 numItems,\r
+ COutFileStream *file,\r
+ const CSysString &title\r
+ ):\r
+ updateCallbackGUI(updateCallbackGUI),\r
+ outArchive(outArchive),\r
+ updateCallbackSpec(updateCallbackSpec),\r
+ numItems(numItems),\r
+ file(file)\r
+ {\r
+ result = E_FAIL;\r
+ if (HRESULT hr = Create(Process, this))\r
+ {\r
+ Complain(hr, NULL);\r
+ }\r
+ updateCallbackGUI->StartProgressDialog(GetUnicodeString(title));\r
+ }\r
+};\r
+\r
+/**\r
+ * @brief Construct Updater\r
+ */\r
+Format7zDLL::Interface::Updater::Updater(Format7zDLL::Interface *format, LPCTSTR path)\r
+: format(format), outArchive(0), file(0), path(path)\r
+{\r
+}\r
+\r
+/**\r
+ * @brief Initialize Updater\r
+ */\r
+void Format7zDLL::Interface::Updater::Init(HWND hwndParent)\r
+{\r
+ (outArchive = format->GetOutArchive()) -> AddRef();\r
+ (file = new COutFileStream) -> AddRef();\r
+ if COMPLAIN(!file->Create(path, true))\r
+ {\r
+ Complain(ERROR_CANNOT_MAKE, path);\r
+ }\r
+}\r
+\r
+/**\r
+ * @brief Commit update\r
+ */\r
+HRESULT Format7zDLL::Interface::Updater::Commit(HWND hwndParent)\r
+{\r
+ CArchiveUpdateCallback *updateCallbackSpec = 0;\r
+ CUpdateCallbackGUI *updateCallbackGUI = 0;\r
+ HRESULT result = 0;\r
+ try\r
+ {\r
+ // Ref counts are not always accurate with 7-Zip.\r
+ // An extra AddRef() ensures that interfaces remain valid until they\r
+ // are explicitly released at the end of this function.\r
+ (updateCallbackSpec = new CArchiveUpdateCallback) -> AddRef();\r
+ (updateCallbackGUI = new CUpdateCallbackGUI);// -> AddRef();\r
+\r
+ // No items in dest archive. We always recreate the dest archive\r
+ // Build the operationChain. One element per item\r
+ CObjectVector<CUpdatePair2> operationChain;\r
+ CUpdatePair2 pair2;\r
+ pair2.IsAnti = false;\r
+ pair2.ExistInArchive = false;\r
+ pair2.ExistOnDisk = true;\r
+ pair2.NewData = pair2.NewProperties = true;\r
+\r
+ operationChain.Reserve(dirItems.Size());\r
+ int i;\r
+ for (i = 0 ; i < dirItems.Size() ; i++)\r
+ {\r
+ pair2.DirItemIndex = i;\r
+ operationChain.Add(pair2);\r
+ }\r
+\r
+ /* The following code may or may not help implement update on existing\r
+ /* archives, which is currently not supported.\r
+ UINT32 fileTimeType;\r
+ outArchive->GetFileTimeType(&fileTimeType);\r
+\r
+ CObjectVector<CUpdatePair> updatePairs;\r
+ GetUpdatePairInfoList(dirItems, archiveItems, NFileTimeType::EEnum(fileTimeType), updatePairs); // must be done only once!!!\r
+ \r
+ CObjectVector<CUpdatePair2> operationChain;\r
+ UpdateProduce(dirItems, archiveItems, updatePairs, NUpdateArchive::kAddActionSet, operationChain);*/\r
+\r
+ // Now compress...\r
+ updateCallbackSpec->DirItems = &dirItems;\r
+ updateCallbackSpec->ArchiveItems = &archiveItems;\r
+ updateCallbackSpec->UpdatePairs = &operationChain;\r
+ updateCallbackSpec->Callback = updateCallbackGUI;\r
+\r
+ result = CThreadUpdateCompress\r
+ (\r
+ updateCallbackGUI,\r
+ outArchive,\r
+ updateCallbackSpec,\r
+ operationChain.Size(),\r
+ file,\r
+ PathFindFileName(path)\r
+ ).result;\r
+\r
+ //result = outArchive->UpdateItems(file, operationChain.Size(), updateCallbackSpec);\r
+ if COMPLAIN(result != S_OK && result != E_ABORT)\r
+ {\r
+ Complain(result, path);\r
+ }\r
+ }\r
+ catch (Complain *complain)\r
+ {\r
+ result = complain->Alert(hwndParent);\r
+ }\r
+ // Always release interfaces in this order, or else all hell will break\r
+ // loose!\r
+ Release(static_cast<IArchiveUpdateCallback*>(updateCallbackSpec));\r
+ delete updateCallbackGUI;\r
+ return result;\r
+}\r
--- /dev/null
+# Microsoft Developer Studio Project File - Name="Merge7z453" - 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=Merge7z453 - 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 "Merge7z453.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 "Merge7z453.mak" CFG="Merge7z453 - Win32 UnicodeDebug"\r
+!MESSAGE \r
+!MESSAGE Für die Konfiguration stehen zur Auswahl:\r
+!MESSAGE \r
+!MESSAGE "Merge7z453 - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "Merge7z453 - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "Merge7z453 - Win32 UnicodeDebug" (basierend auf "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "Merge7z453 - 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)" == "Merge7z453 - 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\Merge7z453___Win32_Release"\r
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z453___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 "..\..\..\7z453" /I "..\..\..\7z453\CPP" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z453_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/Merge7z453.dll"\r
+\r
+!ELSEIF "$(CFG)" == "Merge7z453 - 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\Merge7z453___Win32_Debug"\r
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z453___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 "..\..\..\7z453" /I "..\..\..\7z453\CPP" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z453_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/Merge7z453.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z453.dll"\r
+# SUBTRACT LINK32 /pdb:none /map\r
+\r
+!ELSEIF "$(CFG)" == "Merge7z453 - Win32 UnicodeDebug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeDebug"\r
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z453___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\Merge7z453___Win32_UnicodeDebug"\r
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeDebug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z453" /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 "..\..\..\7z453" /I "..\..\..\7z453\CPP" /D "Merge7z453_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/Merge7z453.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/Merge7z453U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z453U.dll"\r
+# SUBTRACT LINK32 /pdb:none /map\r
+\r
+!ELSEIF "$(CFG)" == "Merge7z453 - Win32 UnicodeRelease"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeRelease"\r
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z453___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\Merge7z453___Win32_UnicodeRelease"\r
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeRelease"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z453" /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 "..\..\..\7z453\CPP" /D "Merge7z453_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/Merge7z453.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/Merge7z453U.dll"\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "Merge7z453 - Win32 Release"\r
+# Name "Merge7z453 - Win32 Debug"\r
+# Name "Merge7z453 - Win32 UnicodeDebug"\r
+# Name "Merge7z453 - 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=.\Merge7z453.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=..\..\..\7z453\CPP\7zip\Ui\Gui\FM.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\GUI\resource.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\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=..\..\..\7z453\CPP\Windows\DLL.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\DLL.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\Error.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\Error.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\FileIO.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\FileIO.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\PropVariant.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\PropVariant.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\PropVariantConversions.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\PropVariantConversions.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\ResourceString.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\ResourceString.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\Synchronization.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\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=..\..\..\7z453\CPP\Common\IntToString.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\IntToString.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\Lang.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\Lang.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\MyString.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\MyString.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\StdInStream.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\StdInStream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\StringConvert.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\StringConvert.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\StringToInt.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\StringToInt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\TextConfig.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\TextConfig.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\UTFConvert.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\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=..\..\..\7z453\CPP\7zip\Ui\Common\ArchiveExtractCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\ArchiveExtractCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\ArchiveOpenCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\ArchiveOpenCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\DefaultName.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\DefaultName.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\Control\Dialog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\Control\Dialog.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ExtractCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ExtractCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\Common\FileStreams.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\Common\FileStreams.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\FormatUtils.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\FormatUtils.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\LangUtils.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\LangUtils.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\MessagesDialog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\MessagesDialog.h\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=..\..\..\7z453\CPP\7zip\UI\FileManager\OpenCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\OpenCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\OverwriteDialog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\OverwriteDialog.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\PasswordDialog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\PasswordDialog.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ProgramLocation.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ProgramLocation.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ProgressDialog2.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\Common\ProgressUtils.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\Common\ProgressUtils.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\Common\StreamUtils.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\Common\StreamUtils.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\UpdateCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\UpdateCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\GUI\UpdateCallbackGUI.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\GUI\UpdateCallbackGUI.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\Window.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\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=..\..\..\7z453\CPP\7zip\Ui\Common\ExtractingFilePath.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\ExtractingFilePath.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\FileDir.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\FileDir.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\FileFind.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\FileFind.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\FileName.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Windows\FileName.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\Common\FilePathAutoRename.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\7zip\Common\FilePathAutoRename.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\MyVector.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\MyVector.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\CPP\Common\Wildcard.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\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=..\..\..\7z453\C\Threads.c\r
+# SUBTRACT CPP /YX /Yc /Yu\r
+# End Source File\r
+# End Group\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z453\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
--- /dev/null
+# Microsoft Developer Studio Project File - Name="Merge7z454" - 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=Merge7z454 - 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 "Merge7z454.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 "Merge7z454.mak" CFG="Merge7z454 - Win32 UnicodeDebug"\r
+!MESSAGE \r
+!MESSAGE Für die Konfiguration stehen zur Auswahl:\r
+!MESSAGE \r
+!MESSAGE "Merge7z454 - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "Merge7z454 - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "Merge7z454 - Win32 UnicodeDebug" (basierend auf "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "Merge7z454 - 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)" == "Merge7z454 - 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\Merge7z454___Win32_Release"\r
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z454___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 "..\..\..\7z454" /I "..\..\..\7z454\CPP" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z454_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/Merge7z454.dll"\r
+\r
+!ELSEIF "$(CFG)" == "Merge7z454 - 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\Merge7z454___Win32_Debug"\r
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z454___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 "..\..\..\7z454" /I "..\..\..\7z454\CPP" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z454_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/Merge7z454.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z454.dll"\r
+# SUBTRACT LINK32 /pdb:none /map\r
+\r
+!ELSEIF "$(CFG)" == "Merge7z454 - Win32 UnicodeDebug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeDebug"\r
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z454___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\Merge7z454___Win32_UnicodeDebug"\r
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeDebug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "..\..\..\7z454" /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 "..\..\..\7z454" /I "..\..\..\7z454\CPP" /D "Merge7z454_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/Merge7z454.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/Merge7z454U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z454U.dll"\r
+# SUBTRACT LINK32 /pdb:none /map\r
+\r
+!ELSEIF "$(CFG)" == "Merge7z454 - Win32 UnicodeRelease"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeRelease"\r
+# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z454___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\Merge7z454___Win32_UnicodeRelease"\r
+# PROP Intermediate_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeRelease"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\7z454" /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 "..\..\..\7z454\CPP" /D "Merge7z454_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/Merge7z454.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/Merge7z454U.dll"\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "Merge7z454 - Win32 Release"\r
+# Name "Merge7z454 - Win32 Debug"\r
+# Name "Merge7z454 - Win32 UnicodeDebug"\r
+# Name "Merge7z454 - 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=.\Merge7z453.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=..\..\..\7z454\CPP\7zip\Ui\Gui\FM.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\GUI\resource.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\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=..\..\..\7z454\CPP\Windows\DLL.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\DLL.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\Error.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\Error.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\FileIO.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\FileIO.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\PropVariant.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\PropVariant.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\PropVariantConversions.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\PropVariantConversions.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\ResourceString.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\ResourceString.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\Synchronization.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\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=..\..\..\7z454\CPP\Common\IntToString.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\IntToString.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\Lang.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\Lang.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\MyString.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\MyString.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\StdInStream.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\StdInStream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\StringConvert.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\StringConvert.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\StringToInt.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\StringToInt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\TextConfig.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\TextConfig.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\UTFConvert.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\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=..\..\..\7z454\CPP\7zip\Ui\Common\ArchiveExtractCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\ArchiveExtractCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\ArchiveOpenCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\ArchiveOpenCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\DefaultName.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\DefaultName.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\Control\Dialog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\Control\Dialog.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ExtractCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ExtractCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\Common\FileStreams.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\Common\FileStreams.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\FormatUtils.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\FormatUtils.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\LangUtils.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\LangUtils.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\MessagesDialog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\MessagesDialog.h\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=..\..\..\7z454\CPP\7zip\UI\FileManager\OpenCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\OpenCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\OverwriteDialog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\OverwriteDialog.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\PasswordDialog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\PasswordDialog.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ProgramLocation.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ProgramLocation.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ProgressDialog2.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\Common\ProgressUtils.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\Common\ProgressUtils.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\Common\StreamUtils.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\Common\StreamUtils.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\UpdateCallback.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\UpdateCallback.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\GUI\UpdateCallbackGUI.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\GUI\UpdateCallbackGUI.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\Window.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\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=..\..\..\7z454\CPP\7zip\Ui\Common\ExtractingFilePath.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\ExtractingFilePath.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\FileDir.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\FileDir.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\FileFind.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\FileFind.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\FileName.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Windows\FileName.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\Common\FilePathAutoRename.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\7zip\Common\FilePathAutoRename.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\MyVector.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\MyVector.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\CPP\Common\Wildcard.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\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=..\..\..\7z454\C\Threads.c\r
+# SUBTRACT CPP /YX /Yc /Yu\r
+# End Source File\r
+# End Group\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\7z454\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
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.
+2007-09-01 Jochen Neubeck No longer #include "LangUtils.h", which has
+ moved to a different location as of 7z453 beta.
*/
#include "stdafx.h"
#include "Merge7zCommon.h"
-#include "7zip/FileManager/LangUtils.h"
+
+void ReloadLang(); //Implemented in /*/FileManager/LangUtils.cpp
using namespace NWindows;
using namespace NFile;
// Merge7z includes
#include "tools.h"
-#define DllBuild_Merge7z 24
+#define DllBuild_Merge7z 25
#define DLLPSTUB /##/
#include "Merge7z.h"
"*"//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
+"*"//2007-09-01 Jochen Neubeck Some refactoring to build against 7z453 beta
OSDN Git Service
