[Winmerge-svn] SF.net SVN: winmerge: [4517] trunk/ArchiveSupport/Merge7z
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <jt...@us...> - 2007-09-06 16:56:38
|
Revision: 4517 http://winmerge.svn.sourceforge.net/winmerge/?rev=4517&view=rev Author: jtuc Date: 2007-09-06 09:41:13 -0700 (Thu, 06 Sep 2007) Log Message: ----------- DllBuild 0025 Modified Paths: -------------- trunk/ArchiveSupport/Merge7z/Merge7zCommon.cpp trunk/ArchiveSupport/Merge7z/Merge7zCommon.h trunk/ArchiveSupport/Merge7z/revision.txt Added Paths: ----------- trunk/ArchiveSupport/Merge7z/Merge7z453.cpp trunk/ArchiveSupport/Merge7z/Merge7z453.dsp trunk/ArchiveSupport/Merge7z/Merge7z454.dsp Added: trunk/ArchiveSupport/Merge7z/Merge7z453.cpp =================================================================== --- trunk/ArchiveSupport/Merge7z/Merge7z453.cpp (rev 0) +++ trunk/ArchiveSupport/Merge7z/Merge7z453.cpp 2007-09-06 16:41:13 UTC (rev 4517) @@ -0,0 +1,352 @@ +/*/Merge7z453.cpp + +Copyright (c) Jochen Neubeck + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Please mind 2. b) of the GNU LGPL terms, and log your changes below. + +DATE: BY: DESCRIPTION: +========== ================== ================================================ +2007-08-30 Jochen Neubeck Branched from Merge7z409.cpp +*/ + +#include "stdafx.h" + +#define INITGUID +#include <initguid.h> + +#include "Merge7zCommon.h" + +#include "7zip/UI/FileManager/OpenCallback.h" +#include "7zip/UI/FileManager/ExtractCallback.h" + +#include "7zip/UI/Common/ArchiveExtractCallback.h" +#include "7zip/UI/GUI/UpdateCallbackGUI.h" + +#include "Windows/Thread.h" + +/** + * @brief Extraction thread + */ +class CThreadExtracting : CThread +{ +protected: + THREAD_FUNC_RET_TYPE Process() + { + ExtractCallbackSpec->ProgressDialog.WaitCreating(); + result = Archive->Extract(indices, numItems, false, ArchiveExtractCallback); + ExtractCallbackSpec->ProgressDialog.MyClose(); + return 0; + } + static THREAD_FUNC_RET_TYPE WINAPI Process(void *param) + { + return ((CThreadExtracting *)param)->Process(); + } + CExtractCallbackImp *ExtractCallbackSpec; + IInArchive *Archive; + IArchiveExtractCallback *ArchiveExtractCallback; + const UINT32 *indices; + UINT32 numItems; +public: + HRESULT result; + + CThreadExtracting + ( + CExtractCallbackImp *ExtractCallbackSpec, + IInArchive *Archive, + IArchiveExtractCallback *ArchiveExtractCallback, + const CSysString &title, + const UINT32 *indices = 0, + UINT32 numItems = -1 + ): + ExtractCallbackSpec(ExtractCallbackSpec), + Archive(Archive), + ArchiveExtractCallback(ArchiveExtractCallback), + indices(indices), + numItems(numItems) + { + result = E_FAIL; + if (HRESULT hr = Create(Process, this)) + { + Complain(hr, NULL); + } + ExtractCallbackSpec->StartProgressDialog(GetUnicodeString(title)); + } +}; + +/** + * @brief Initialize Inspector + */ +Format7zDLL::Interface::Inspector::Inspector(Format7zDLL::Interface *format, LPCTSTR path) +: format(format), archive(0), file(0), callback(0), path(path), ustrDefaultName(GetUnicodeString(path)) +{ +} + +/** + * @brief Initialize Inspector + */ +void Format7zDLL::Interface::Inspector::Init(HWND hwndParent) +{ + format->GetDefaultName(hwndParent, ustrDefaultName); + COpenArchiveCallback *callbackImpl = new COpenArchiveCallback; + //COpenCallbackImp *callbackImpl = new COpenCallbackImp; + (archive = format->GetInArchive()) -> AddRef(); + (file = new CInFileStream) -> AddRef(); + (callback = callbackImpl) -> AddRef(); + callbackImpl->PasswordIsDefined = false; + callbackImpl->ParentWindow = hwndParent; + /*CMyComBSTR password; + callback->CryptoGetTextPassword(&password);*/ + if COMPLAIN(!NFile::NFind::FindFile(path, fileInfo)) + { + Complain(ERROR_FILE_NOT_FOUND, path); + } + if COMPLAIN(!file->Open(path)) + { + Complain(ERROR_OPEN_FAILED, path); + } + if COMPLAIN(archive->Open(file, 0, callback) != S_OK) + { + Complain(ERROR_CANT_ACCESS_FILE, path); + } + passwordIsDefined = callbackImpl->PasswordIsDefined; + password = callbackImpl->Password; +} + +/** + * @brief Extract set of items specified by index + */ +HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR folder, const UINT32 *indices, UINT32 numItems) +{ + CArchiveExtractCallback *extractCallbackSpec = 0; + CExtractCallbackImp *extractCallbackSpec2 = 0; + HRESULT result = 0; + try + { + if (*folder) + { + if COMPLAIN(!NFile::NDirectory::CreateComplexDirectory(folder)) + { + Complain(ERROR_CANNOT_MAKE, folder); + } + } + + (extractCallbackSpec2 = new CExtractCallbackImp) -> AddRef(); + + extractCallbackSpec2->Init(); + + extractCallbackSpec2->ParentWindow = hwndParent; + extractCallbackSpec2->OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt; + extractCallbackSpec2->PasswordIsDefined = passwordIsDefined; + extractCallbackSpec2->Password = password; + + extractCallbackSpec2->ProgressDialog.MainWindow = 0; + (extractCallbackSpec = new CArchiveExtractCallback) -> AddRef(); + + extractCallbackSpec->InitForMulti + ( + false, + NExtract::NPathMode::kFullPathnames, + NExtract::NOverwriteMode::kWithoutPrompt + ); + extractCallbackSpec->Init + ( + archive, + extractCallbackSpec2, + false, //stdOutMode + GetUnicodeString(folder), + UStringVector(), + ustrDefaultName, + fileInfo.LastWriteTime, + fileInfo.Attributes, + (UInt64)(Int64)-1 + ); + + result = CThreadExtracting + ( + extractCallbackSpec2, + archive, + extractCallbackSpec, + PathFindFileName(path), + indices, + numItems + ).result; + + if COMPLAIN(extractCallbackSpec->_numErrors) + { + // There is no canned system message for this one, so it won't + // localize. I can't help it. + Complain(_T("%s:\n%I64u error(s)"), path, extractCallbackSpec->_numErrors); + } + if COMPLAIN(result != S_OK && result != E_ABORT) + { + Complain(result, path); + } + } + catch (Complain *complain) + { + result = complain->Alert(hwndParent); + } + Release(static_cast<IArchiveExtractCallback*>(extractCallbackSpec)); + Release(static_cast<IFolderArchiveExtractCallback*>(extractCallbackSpec2)); + return result; +} + +/** + * @brief Compression thread + */ +class CThreadUpdateCompress : CThread +{ +protected: + THREAD_FUNC_RET_TYPE Process() + { + updateCallbackGUI->ProgressDialog.WaitCreating(); + result = outArchive->UpdateItems(file, numItems, updateCallbackSpec); + updateCallbackGUI->ProgressDialog.MyClose(); + return 0; + } + static THREAD_FUNC_RET_TYPE WINAPI Process(void *param) + { + return ((CThreadUpdateCompress *)param)->Process(); + } + CUpdateCallbackGUI *updateCallbackGUI; + IOutArchive *outArchive; + CArchiveUpdateCallback *updateCallbackSpec; + COutFileStream *file; +public: + HRESULT result; + UINT32 numItems; + CThreadUpdateCompress + ( + CUpdateCallbackGUI *updateCallbackGUI, + IOutArchive *outArchive, + CArchiveUpdateCallback *updateCallbackSpec, + UINT32 numItems, + COutFileStream *file, + const CSysString &title + ): + updateCallbackGUI(updateCallbackGUI), + outArchive(outArchive), + updateCallbackSpec(updateCallbackSpec), + numItems(numItems), + file(file) + { + result = E_FAIL; + if (HRESULT hr = Create(Process, this)) + { + Complain(hr, NULL); + } + updateCallbackGUI->StartProgressDialog(GetUnicodeString(title)); + } +}; + +/** + * @brief Construct Updater + */ +Format7zDLL::Interface::Updater::Updater(Format7zDLL::Interface *format, LPCTSTR path) +: format(format), outArchive(0), file(0), path(path) +{ +} + +/** + * @brief Initialize Updater + */ +void Format7zDLL::Interface::Updater::Init(HWND hwndParent) +{ + (outArchive = format->GetOutArchive()) -> AddRef(); + (file = new COutFileStream) -> AddRef(); + if COMPLAIN(!file->Create(path, true)) + { + Complain(ERROR_CANNOT_MAKE, path); + } +} + +/** + * @brief Commit update + */ +HRESULT Format7zDLL::Interface::Updater::Commit(HWND hwndParent) +{ + CArchiveUpdateCallback *updateCallbackSpec = 0; + CUpdateCallbackGUI *updateCallbackGUI = 0; + HRESULT result = 0; + try + { + // Ref counts are not always accurate with 7-Zip. + // An extra AddRef() ensures that interfaces remain valid until they + // are explicitly released at the end of this function. + (updateCallbackSpec = new CArchiveUpdateCallback) -> AddRef(); + (updateCallbackGUI = new CUpdateCallbackGUI);// -> AddRef(); + + // No items in dest archive. We always recreate the dest archive + // Build the operationChain. One element per item + CObjectVector<CUpdatePair2> operationChain; + CUpdatePair2 pair2; + pair2.IsAnti = false; + pair2.ExistInArchive = false; + pair2.ExistOnDisk = true; + pair2.NewData = pair2.NewProperties = true; + + operationChain.Reserve(dirItems.Size()); + int i; + for (i = 0 ; i < dirItems.Size() ; i++) + { + pair2.DirItemIndex = i; + operationChain.Add(pair2); + } + + /* The following code may or may not help implement update on existing + /* archives, which is currently not supported. + UINT32 fileTimeType; + outArchive->GetFileTimeType(&fileTimeType); + + CObjectVector<CUpdatePair> updatePairs; + GetUpdatePairInfoList(dirItems, archiveItems, NFileTimeType::EEnum(fileTimeType), updatePairs); // must be done only once!!! + + CObjectVector<CUpdatePair2> operationChain; + UpdateProduce(dirItems, archiveItems, updatePairs, NUpdateArchive::kAddActionSet, operationChain);*/ + + // Now compress... + updateCallbackSpec->DirItems = &dirItems; + updateCallbackSpec->ArchiveItems = &archiveItems; + updateCallbackSpec->UpdatePairs = &operationChain; + updateCallbackSpec->Callback = updateCallbackGUI; + + result = CThreadUpdateCompress + ( + updateCallbackGUI, + outArchive, + updateCallbackSpec, + operationChain.Size(), + file, + PathFindFileName(path) + ).result; + + //result = outArchive->UpdateItems(file, operationChain.Size(), updateCallbackSpec); + if COMPLAIN(result != S_OK && result != E_ABORT) + { + Complain(result, path); + } + } + catch (Complain *complain) + { + result = complain->Alert(hwndParent); + } + // Always release interfaces in this order, or else all hell will break + // loose! + Release(static_cast<IArchiveUpdateCallback*>(updateCallbackSpec)); + delete updateCallbackGUI; + return result; +} Added: trunk/ArchiveSupport/Merge7z/Merge7z453.dsp =================================================================== --- trunk/ArchiveSupport/Merge7z/Merge7z453.dsp (rev 0) +++ trunk/ArchiveSupport/Merge7z/Merge7z453.dsp 2007-09-06 16:41:13 UTC (rev 4517) @@ -0,0 +1,577 @@ +# Microsoft Developer Studio Project File - Name="Merge7z453" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** NICHT BEARBEITEN ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=Merge7z453 - Win32 UnicodeDebug +!MESSAGE Dies ist kein g\xFCltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE +!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f\xFChren Sie den Befehl +!MESSAGE +!MESSAGE NMAKE /f "Merge7z453.mak". +!MESSAGE +!MESSAGE Sie k\xF6nnen beim Ausf\xFChren von NMAKE eine Konfiguration angeben +!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: +!MESSAGE +!MESSAGE NMAKE /f "Merge7z453.mak" CFG="Merge7z453 - Win32 UnicodeDebug" +!MESSAGE +!MESSAGE F\xFCr die Konfiguration stehen zur Auswahl: +!MESSAGE +!MESSAGE "Merge7z453 - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Merge7z453 - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Merge7z453 - Win32 UnicodeDebug" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Merge7z453 - Win32 UnicodeRelease" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Merge7z453 - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\BuildTmp\Merge7z453___Win32_Release" +# PROP Intermediate_Dir "..\BuildTmp\Merge7z453___Win32_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z453" /I "..\..\..\7z453\CPP" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z453_EXPORTS" /FR /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z453.dll" + +!ELSEIF "$(CFG)" == "Merge7z453 - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\BuildTmp\Merge7z453___Win32_Debug" +# PROP Intermediate_Dir "..\BuildTmp\Merge7z453___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 "..\..\..\7z453" /I "..\..\..\7z453\CPP" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z453_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z453.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z453.dll" +# SUBTRACT LINK32 /pdb:none /map + +!ELSEIF "$(CFG)" == "Merge7z453 - Win32 UnicodeDebug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeDebug" +# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeDebug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeDebug" +# PROP Intermediate_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeDebug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 +# 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 +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z453.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z453U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z453U.dll" +# SUBTRACT LINK32 /pdb:none /map + +!ELSEIF "$(CFG)" == "Merge7z453 - Win32 UnicodeRelease" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeRelease" +# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeRelease" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeRelease" +# PROP Intermediate_Dir "..\BuildTmp\Merge7z453___Win32_UnicodeRelease" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 +# 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 +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z453.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z453U.dll" + +!ENDIF + +# Begin Target + +# Name "Merge7z453 - Win32 Release" +# Name "Merge7z453 - Win32 Debug" +# Name "Merge7z453 - Win32 UnicodeDebug" +# Name "Merge7z453 - Win32 UnicodeRelease" +# Begin Group "Quellcodedateien" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\Merge7z.def +# End Source File +# Begin Source File + +SOURCE=.\Merge7z.h +# End Source File +# Begin Source File + +SOURCE=.\Merge7z453.cpp +# End Source File +# Begin Source File + +SOURCE=.\Merge7zCommon.cpp +# End Source File +# Begin Source File + +SOURCE=.\Merge7zCommon.h +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.cpp +# ADD CPP /Yc"stdafx.h" +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.h +# End Source File +# Begin Source File + +SOURCE=.\tools.cpp +# End Source File +# Begin Source File + +SOURCE=.\tools.h +# End Source File +# End Group +# Begin Group "Header-Dateien" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Ressourcendateien" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Ui\Gui\FM.ico +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\GUI\resource.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Ui\Gui\resource.rc +# End Source File +# End Group +# Begin Group "Windows" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\DLL.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\DLL.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\Error.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\Error.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\FileIO.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\FileIO.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\PropVariant.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\PropVariant.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\PropVariantConversions.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\PropVariantConversions.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\ResourceString.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\ResourceString.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\Synchronization.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\Synchronization.h +# End Source File +# End Group +# Begin Group "Common" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\IntToString.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\IntToString.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\Lang.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\Lang.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\MyString.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\MyString.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\StdInStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\StdInStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\StringConvert.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\StringConvert.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\StringToInt.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\StringToInt.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\TextConfig.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\TextConfig.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\UTFConvert.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\UTFConvert.h +# End Source File +# End Group +# Begin Group "7zip Common" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Ui\Common\ArchiveExtractCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\ArchiveExtractCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\ArchiveOpenCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\ArchiveOpenCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\DefaultName.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\DefaultName.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\Control\Dialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\Control\Dialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ExtractCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ExtractCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Common\FileStreams.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Common\FileStreams.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\FormatUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\FormatUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\LangUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\LangUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\MessagesDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\MessagesDialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z450\CPP\7zip\UI\Common\OpenArchive.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z450\CPP\7zip\UI\Common\OpenArchive.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\OpenCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\OpenCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\OverwriteDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\OverwriteDialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\PasswordDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\PasswordDialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ProgramLocation.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ProgramLocation.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\FileManager\ProgressDialog2.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Common\ProgressUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Common\ProgressUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Common\StreamUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Common\StreamUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\UpdateCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\UpdateCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\GUI\UpdateCallbackGUI.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\GUI\UpdateCallbackGUI.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\Window.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\Window.h +# End Source File +# End Group +# Begin Group "Extract" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Ui\Common\ExtractingFilePath.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\UI\Common\ExtractingFilePath.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\FileDir.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\FileDir.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\FileFind.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\FileFind.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\FileName.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Windows\FileName.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Common\FilePathAutoRename.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Common\FilePathAutoRename.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\MyVector.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\MyVector.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\Wildcard.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\Common\Wildcard.h +# End Source File +# End Group +# Begin Group "C" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z453\C\Threads.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\..\7z453\CPP\7zip\Ui\Gui\7zG.exe.manifest +# End Source File +# Begin Source File + +SOURCE=.\revision.txt +# End Source File +# End Target +# End Project Added: trunk/ArchiveSupport/Merge7z/Merge7z454.dsp =================================================================== --- trunk/ArchiveSupport/Merge7z/Merge7z454.dsp (rev 0) +++ trunk/ArchiveSupport/Merge7z/Merge7z454.dsp 2007-09-06 16:41:13 UTC (rev 4517) @@ -0,0 +1,577 @@ +# Microsoft Developer Studio Project File - Name="Merge7z454" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** NICHT BEARBEITEN ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=Merge7z454 - Win32 UnicodeDebug +!MESSAGE Dies ist kein g\xFCltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE +!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f\xFChren Sie den Befehl +!MESSAGE +!MESSAGE NMAKE /f "Merge7z454.mak". +!MESSAGE +!MESSAGE Sie k\xF6nnen beim Ausf\xFChren von NMAKE eine Konfiguration angeben +!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: +!MESSAGE +!MESSAGE NMAKE /f "Merge7z454.mak" CFG="Merge7z454 - Win32 UnicodeDebug" +!MESSAGE +!MESSAGE F\xFCr die Konfiguration stehen zur Auswahl: +!MESSAGE +!MESSAGE "Merge7z454 - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Merge7z454 - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Merge7z454 - Win32 UnicodeDebug" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Merge7z454 - Win32 UnicodeRelease" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Merge7z454 - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\BuildTmp\Merge7z454___Win32_Release" +# PROP Intermediate_Dir "..\BuildTmp\Merge7z454___Win32_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\7z454" /I "..\..\..\7z454\CPP" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z454_EXPORTS" /FR /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z454.dll" + +!ELSEIF "$(CFG)" == "Merge7z454 - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\BuildTmp\Merge7z454___Win32_Debug" +# PROP Intermediate_Dir "..\BuildTmp\Merge7z454___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 "..\..\..\7z454" /I "..\..\..\7z454\CPP" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Merge7z454_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeDebug/Merge7z454.pdb" /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z454.dll" +# SUBTRACT LINK32 /pdb:none /map + +!ELSEIF "$(CFG)" == "Merge7z454 - Win32 UnicodeDebug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeDebug" +# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeDebug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeDebug" +# PROP Intermediate_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeDebug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 +# 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 +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /map /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z454.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"../Build/MergeUnicodeDebug/Merge7z454U.pdb" /debug /machine:I386 /out:"../Build/MergeUnicodeDebug/Merge7z454U.dll" +# SUBTRACT LINK32 /pdb:none /map + +!ELSEIF "$(CFG)" == "Merge7z454 - Win32 UnicodeRelease" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeRelease" +# PROP BASE Intermediate_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeRelease" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeRelease" +# PROP Intermediate_Dir "..\BuildTmp\Merge7z454___Win32_UnicodeRelease" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 +# 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 +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z454.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeUnicodeRelease/Merge7z454U.dll" + +!ENDIF + +# Begin Target + +# Name "Merge7z454 - Win32 Release" +# Name "Merge7z454 - Win32 Debug" +# Name "Merge7z454 - Win32 UnicodeDebug" +# Name "Merge7z454 - Win32 UnicodeRelease" +# Begin Group "Quellcodedateien" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\Merge7z.def +# End Source File +# Begin Source File + +SOURCE=.\Merge7z.h +# End Source File +# Begin Source File + +SOURCE=.\Merge7z453.cpp +# End Source File +# Begin Source File + +SOURCE=.\Merge7zCommon.cpp +# End Source File +# Begin Source File + +SOURCE=.\Merge7zCommon.h +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.cpp +# ADD CPP /Yc"stdafx.h" +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.h +# End Source File +# Begin Source File + +SOURCE=.\tools.cpp +# End Source File +# Begin Source File + +SOURCE=.\tools.h +# End Source File +# End Group +# Begin Group "Header-Dateien" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Ressourcendateien" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Ui\Gui\FM.ico +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\GUI\resource.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Ui\Gui\resource.rc +# End Source File +# End Group +# Begin Group "Windows" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\DLL.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\DLL.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\Error.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\Error.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\FileIO.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\FileIO.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\PropVariant.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\PropVariant.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\PropVariantConversions.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\PropVariantConversions.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\ResourceString.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\ResourceString.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\Synchronization.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\Synchronization.h +# End Source File +# End Group +# Begin Group "Common" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\IntToString.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\IntToString.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\Lang.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\Lang.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\MyString.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\MyString.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\StdInStream.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\StdInStream.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\StringConvert.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\StringConvert.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\StringToInt.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\StringToInt.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\TextConfig.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\TextConfig.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\UTFConvert.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\UTFConvert.h +# End Source File +# End Group +# Begin Group "7zip Common" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Ui\Common\ArchiveExtractCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\ArchiveExtractCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\ArchiveOpenCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\ArchiveOpenCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\DefaultName.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\DefaultName.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\Control\Dialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\Control\Dialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ExtractCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ExtractCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Common\FileStreams.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Common\FileStreams.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\FormatUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\FormatUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\LangUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\LangUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\MessagesDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\MessagesDialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z450\CPP\7zip\UI\Common\OpenArchive.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z450\CPP\7zip\UI\Common\OpenArchive.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\OpenCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\OpenCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\OverwriteDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\OverwriteDialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\PasswordDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\PasswordDialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ProgramLocation.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ProgramLocation.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\FileManager\ProgressDialog2.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Common\ProgressUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Common\ProgressUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Common\StreamUtils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Common\StreamUtils.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\UpdateCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\UpdateCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\GUI\UpdateCallbackGUI.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\GUI\UpdateCallbackGUI.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\Window.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\Window.h +# End Source File +# End Group +# Begin Group "Extract" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Ui\Common\ExtractingFilePath.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\UI\Common\ExtractingFilePath.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\FileDir.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\FileDir.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\FileFind.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\FileFind.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\FileName.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Windows\FileName.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Common\FilePathAutoRename.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Common\FilePathAutoRename.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\MyVector.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\MyVector.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\Wildcard.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\Common\Wildcard.h +# End Source File +# End Group +# Begin Group "C" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\7z454\C\Threads.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\..\7z454\CPP\7zip\Ui\Gui\7zG.exe.manifest +# End Source File +# Begin Source File + +SOURCE=.\revision.txt +# End Source File +# End Target +# End Project Modified: trunk/ArchiveSupport/Merge7z/Merge7zCommon.cpp =================================================================== --- trunk/ArchiveSupport/Merge7z/Merge7zCommon.cpp 2007-09-05 22:40:08 UTC (rev 4516) +++ trunk/ArchiveSupport/Merge7z/Merge7zCommon.cpp 2007-09-06 16:41:13 UTC (rev 4517) @@ -45,12 +45,15 @@ 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; using namespace NName; Modified: trunk/ArchiveSupport/Merge7z/Merge7zCommon.h =================================================================== --- trunk/ArchiveSupport/Merge7z/Merge7zCommon.h 2007-09-05 22:40:08 UTC (rev 4516) +++ trunk/ArchiveSupport/Merge7z/Merge7zCommon.h 2007-09-06 16:41:13 UTC (rev 4517) @@ -13,7 +13,7 @@ // Merge7z includes #include "tools.h" -#define DllBuild_Merge7z 24 +#define DllBuild_Merge7z 25 #define DLLPSTUB /##/ #include "Merge7z.h" Modified: trunk/ArchiveSupport/Merge7z/revision.txt =================================================================== --- trunk/ArchiveSupport/Merge7z/revision.txt 2007-09-05 22:40:08 UTC (rev 4516) +++ trunk/ArchiveSupport/Merge7z/revision.txt 2007-09-06 16:41:13 UTC (rev 4517) @@ -57,3 +57,4 @@ "*"//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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |