From e75ad3d355875b97a50fe81961fa4dfedad0586c Mon Sep 17 00:00:00 2001 From: glachancecmaisonneuve Date: Wed, 5 Sep 2018 01:00:35 -0400 Subject: [PATCH] 19.0 --- .gitignore | 17 + CPP/7zip/Bundles/Fm/7zfm.vcxproj | 42 -- CPP/7zip/UI/Console/makefile | 131 +++--- CPP/7zip/UI/FileManager/FM.vcxproj | 655 ----------------------------- CPP/7zip/UI/FileManager/makefile | 204 ++++----- CPP/7zip/UI/GUI/GUI.vcxproj | 557 ------------------------ CPP/7zip/UI/GUI/makefile | 289 ++++++------- CPP/Common/MyWindows.h | 2 - CPP/build-x64.cmd | 103 ----- README.md | 14 +- build.cmd | 5 +- 11 files changed, 344 insertions(+), 1675 deletions(-) delete mode 100644 CPP/7zip/Bundles/Fm/7zfm.vcxproj delete mode 100644 CPP/7zip/UI/FileManager/FM.vcxproj delete mode 100644 CPP/7zip/UI/GUI/GUI.vcxproj delete mode 100644 CPP/build-x64.cmd diff --git a/.gitignore b/.gitignore index 5761abcf..d19e11d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,18 @@ *.o +out/ +7zAll/x64/ +*.pdb +*.tlog +*.obj +*.user +*.log +*.pch +*.idb +x64/ +*.exe +*.res +*.dll +*.lib +*.exp +*.sfx +*.txt diff --git a/CPP/7zip/Bundles/Fm/7zfm.vcxproj b/CPP/7zip/Bundles/Fm/7zfm.vcxproj deleted file mode 100644 index 88964a93..00000000 --- a/CPP/7zip/Bundles/Fm/7zfm.vcxproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Release - x64 - - - - 15.0 - {2E507455-9726-46EE-8DE1-10B26C238535} - Win32Proj - - - - Makefile - false - v141 - - - - - - - - - - -SET CPU=AMD64 -SET MY_STATIC_LINK=1 -SET _SFX=1 -SET O=$(OutDir).TrimEnd('\') -SET LFLAGS=/DEBUG /SUBSYSTEM:WINDOWS,"5.02" -nmake /f Makefile - - NDEBUG;$(NMakePreprocessorDefinitions) - - - - - - \ No newline at end of file diff --git a/CPP/7zip/UI/Console/makefile b/CPP/7zip/UI/Console/makefile index 2210e0b8..8fa4aa52 100644 --- a/CPP/7zip/UI/Console/makefile +++ b/CPP/7zip/UI/Console/makefile @@ -1,64 +1,67 @@ -PROG = 7z.exe -CFLAGS = $(CFLAGS) \ - -DEXTERNAL_CODECS \ - -COMMON_OBJS = \ - $O\CommandLineParser.obj \ - $O\CRC.obj \ - $O\IntToString.obj \ - $O\ListFileUtils.obj \ - $O\NewHandler.obj \ - $O\StdInStream.obj \ - $O\StdOutStream.obj \ - $O\MyString.obj \ - $O\StringConvert.obj \ - $O\StringToInt.obj \ - $O\UTFConvert.obj \ - $O\MyVector.obj \ - $O\Wildcard.obj \ - -WIN_OBJS = \ - $O\DLL.obj \ - $O\ErrorMsg.obj \ - $O\FileDir.obj \ - $O\FileFind.obj \ - $O\FileIO.obj \ - $O\FileLink.obj \ - $O\FileName.obj \ - $O\FileSystem.obj \ - $O\MemoryLock.obj \ - $O\PropVariant.obj \ - $O\PropVariantConv.obj \ - $O\Registry.obj \ - $O\System.obj \ - $O\TimeUtils.obj \ - -7ZIP_COMMON_OBJS = \ - $O\CreateCoder.obj \ - $O\FilePathAutoRename.obj \ - $O\FileStreams.obj \ - $O\FilterCoder.obj \ - $O\LimitedStreams.obj \ - $O\MethodProps.obj \ - $O\ProgressUtils.obj \ - $O\PropId.obj \ - $O\StreamObjects.obj \ - $O\StreamUtils.obj \ - $O\UniqBlocks.obj \ - -AR_COMMON_OBJS = \ - $O\OutStreamWithCRC.obj \ - -COMPRESS_OBJS = \ - $O\CopyCoder.obj \ - -C_OBJS = $(C_OBJS) \ - $O\Alloc.obj \ - $O\CpuArch.obj \ - $O\Sort.obj \ - $O\Threads.obj \ - -!include "../../Crc.mak" -!include "Console.mak" - -!include "../../7zip.mak" +PROG = 7z.exe +CFLAGS = $(CFLAGS) \ + -DEXTERNAL_CODECS \ + +COMMON_OBJS = \ + $O\CommandLineParser.obj \ + $O\CRC.obj \ + $O\IntToString.obj \ + $O\ListFileUtils.obj \ + $O\NewHandler.obj \ + $O\StdInStream.obj \ + $O\StdOutStream.obj \ + $O\MyString.obj \ + $O\StringConvert.obj \ + $O\StringToInt.obj \ + $O\UTFConvert.obj \ + $O\MyVector.obj \ + $O\Wildcard.obj \ + $O\ResourceString.obj \ + + +WIN_OBJS = \ + $O\DLL.obj \ + $O\ErrorMsg.obj \ + $O\FileDir.obj \ + $O\FileFind.obj \ + $O\FileIO.obj \ + $O\FileLink.obj \ + $O\FileName.obj \ + $O\FileSystem.obj \ + $O\MemoryLock.obj \ + $O\PropVariant.obj \ + $O\PropVariantConv.obj \ + $O\Registry.obj \ + $O\System.obj \ + $O\TimeUtils.obj \ + $O\LoadCodecs.obj \ + +7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ + $O\FilePathAutoRename.obj \ + $O\FileStreams.obj \ + $O\FilterCoder.obj \ + $O\LimitedStreams.obj \ + $O\MethodProps.obj \ + $O\ProgressUtils.obj \ + $O\PropId.obj \ + $O\StreamObjects.obj \ + $O\StreamUtils.obj \ + $O\UniqBlocks.obj \ + +AR_COMMON_OBJS = \ + $O\OutStreamWithCRC.obj \ + +COMPRESS_OBJS = \ + $O\CopyCoder.obj \ + +C_OBJS = $(C_OBJS) \ + $O\Alloc.obj \ + $O\CpuArch.obj \ + $O\Sort.obj \ + $O\Threads.obj \ + +!include "../../Crc.mak" +!include "Console.mak" + +!include "../../7zip.mak" diff --git a/CPP/7zip/UI/FileManager/FM.vcxproj b/CPP/7zip/UI/FileManager/FM.vcxproj deleted file mode 100644 index 0c34f2bb..00000000 --- a/CPP/7zip/UI/FileManager/FM.vcxproj +++ /dev/null @@ -1,655 +0,0 @@ - - - - - DebugU - Win32 - - - DebugU - x64 - - - ReleaseU - Win32 - - - ReleaseU - x64 - - - - {2628FF64-E1E1-4CB7-B588-08DE7145B630} - 7zFM - 10.0.17763.0 - - - - Application - v141 - false - - - Application - v141 - false - - - Application - v141 - false - Unicode - - - Application - v141 - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.27924.0 - - - true - C:\Program Files\7-Zip\ - $(SolutionDir)..\out\FileManager\ - - - true - false - C:\Program Files\7-Zip\ - $(SolutionDir)..\out\FileManager\ - - - false - C:\Program Files\7-Zip\ - $(SolutionDir)..\out\FileManager\ - - - false - false - C:\Program Files\7-Zip\ - $(SolutionDir)..\out\FileManager\ - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\DebugU/FM.tlb - - - - Disabled - _DEBUG;WIN32;_WINDOWS;LANG;WIN_LONG_PATH;NEW_FOLDER_INTERFACE;EXTERNAL_CODECS;SUPPORT_DEVICE_FILE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - StdAfx.h - Level4 - true - StdCall - EditAndContinue - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;comctl32.lib;Mpr.lib;htmlhelp.lib;Urlmon.lib;%(AdditionalDependencies) - true - true - .\DebugU/7zFM.pdb - Windows - false - - MachineX86 - - - true - .\DebugU/FM.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\DebugU/FM.tlb - - - - Disabled - _DEBUG;WIN32;_WINDOWS;LANG;WIN_LONG_PATH;NEW_FOLDER_INTERFACE;EXTERNAL_CODECS;SUPPORT_DEVICE_FILE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - StdAfx.h - Level4 - true - true - ProgramDatabase - StdCall - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;comctl32.lib;Mpr.lib;htmlhelp.lib;Urlmon.lib;%(AdditionalDependencies) - true - true - - - Windows - false - - MachineX64 - - - true - .\DebugU/FM.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\ReleaseU/FM.tlb - - - - MinSpace - OnlyExplicitInline - NDEBUG;WIN32;_WINDOWS;LANG;WIN_LONG_PATH;NEW_FOLDER_INTERFACE;EXTERNAL_CODECS;SUPPORT_DEVICE_FILE;_UNICODE;UNICODE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - StdAfx.h - Level4 - true - true - StdCall - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;comctl32.lib;Mpr.lib;htmlhelp.lib;Urlmon.lib;%(AdditionalDependencies) - true - .\ReleaseU/7zFM.pdb - Windows - false - - MachineX86 - - - true - .\ReleaseU/FM.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\ReleaseU/FM.tlb - - - - MinSpace - OnlyExplicitInline - NDEBUG;WIN32;_WINDOWS;LANG;WIN_LONG_PATH;NEW_FOLDER_INTERFACE;EXTERNAL_CODECS;SUPPORT_DEVICE_FILE;_UNICODE;UNICODE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - StdAfx.h - Level4 - true - true - StdCall - true - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;comctl32.lib;Mpr.lib;htmlhelp.lib;Urlmon.lib;%(AdditionalDependencies) - true - - - Windows - false - - MachineX64 - true - - - true - .\ReleaseU/FM.bsc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ..\Agent\Agent.cpp - - - ..\Agent\AgentProxy.cpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AboutDialog.cpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CPP/7zip/UI/FileManager/makefile b/CPP/7zip/UI/FileManager/makefile index 27dce9fd..c4697c2f 100644 --- a/CPP/7zip/UI/FileManager/makefile +++ b/CPP/7zip/UI/FileManager/makefile @@ -1,102 +1,102 @@ -PROG = 7zFM.exe -CFLAGS = $(CFLAGS) \ - -DEXTERNAL_CODECS \ - -!include "FM.mak" - -COMMON_OBJS = \ - $O\IntToString.obj \ - $O\Lang.obj \ - $O\MyString.obj \ - $O\MyVector.obj \ - $O\NewHandler.obj \ - $O\Random.obj \ - $O\StringConvert.obj \ - $O\StringToInt.obj \ - $O\UTFConvert.obj \ - $O\Wildcard.obj \ - -WIN_OBJS = $(WIN_OBJS) \ - $O\Clipboard.obj \ - $O\CommonDialog.obj \ - $O\DLL.obj \ - $O\ErrorMsg.obj \ - $O\FileDir.obj \ - $O\FileFind.obj \ - $O\FileIO.obj \ - $O\FileLink.obj \ - $O\FileName.obj \ - $O\MemoryGlobal.obj \ - $O\MemoryLock.obj \ - $O\Menu.obj \ - $O\ProcessUtils.obj \ - $O\PropVariant.obj \ - $O\PropVariantConv.obj \ - $O\Registry.obj \ - $O\ResourceString.obj \ - $O\Shell.obj \ - $O\Synchronization.obj \ - $O\System.obj \ - $O\TimeUtils.obj \ - $O\Window.obj \ - - -WIN_CTRL_OBJS = \ - $O\ComboBox.obj \ - $O\Dialog.obj \ - $O\ListView.obj \ - $O\PropertyPage.obj \ - $O\Window2.obj \ - -7ZIP_COMMON_OBJS = \ - $O\CreateCoder.obj \ - $O\FilePathAutoRename.obj \ - $O\FileStreams.obj \ - $O\FilterCoder.obj \ - $O\LimitedStreams.obj \ - $O\MethodProps.obj \ - $O\ProgressUtils.obj \ - $O\PropId.obj \ - $O\StreamObjects.obj \ - $O\StreamUtils.obj \ - $O\UniqBlocks.obj \ - -UI_COMMON_OBJS = \ - $O\ArchiveExtractCallback.obj \ - $O\ArchiveName.obj \ - $O\ArchiveOpenCallback.obj \ - $O\CompressCall.obj \ - $O\DefaultName.obj \ - $O\EnumDirItems.obj \ - $O\ExtractingFilePath.obj \ - $O\HashCalc.obj \ - $O\LoadCodecs.obj \ - $O\OpenArchive.obj \ - $O\PropIDUtils.obj \ - $O\SetProperties.obj \ - $O\SortUtils.obj \ - $O\UpdateAction.obj \ - $O\UpdateCallback.obj \ - $O\UpdatePair.obj \ - $O\UpdateProduce.obj \ - $O\WorkDir.obj \ - $O\ZipRegistry.obj \ - -EXPLORER_OBJS = \ - $O\ContextMenu.obj \ - $O\RegistryContextMenu.obj \ - -GUI_OBJS = \ - $O\HashGUI.obj \ - $O\UpdateCallbackGUI2.obj \ - -COMPRESS_OBJS = \ - $O\CopyCoder.obj \ - -C_OBJS = $(C_OBJS) \ - $O\Alloc.obj \ - $O\CpuArch.obj \ - $O\Sort.obj \ - $O\Threads.obj \ - -!include "../../7zip.mak" +PROG = 7zFM.exe +CFLAGS = $(CFLAGS) \ + -DEXTERNAL_CODECS \ + +!include "FM.mak" + +COMMON_OBJS = \ + $O\IntToString.obj \ + $O\Lang.obj \ + $O\MyString.obj \ + $O\MyVector.obj \ + $O\NewHandler.obj \ + $O\Random.obj \ + $O\StringConvert.obj \ + $O\StringToInt.obj \ + $O\UTFConvert.obj \ + $O\Wildcard.obj + +WIN_OBJS = $(WIN_OBJS) \ + $O\Clipboard.obj \ + $O\CommonDialog.obj \ + $O\DLL.obj \ + $O\ErrorMsg.obj \ + $O\FileDir.obj \ + $O\FileFind.obj \ + $O\FileIO.obj \ + $O\FileLink.obj \ + $O\FileName.obj \ + $O\MemoryGlobal.obj \ + $O\MemoryLock.obj \ + $O\Menu.obj \ + $O\ProcessUtils.obj \ + $O\PropVariant.obj \ + $O\PropVariantConv.obj \ + $O\Registry.obj \ + $O\ResourceString.obj \ + $O\Shell.obj \ + $O\Synchronization.obj \ + $O\System.obj \ + $O\TimeUtils.obj \ + $O\Window.obj \ + + +WIN_CTRL_OBJS = \ + $O\ComboBox.obj \ + $O\Dialog.obj \ + $O\ListView.obj \ + $O\PropertyPage.obj \ + $O\Window2.obj \ + +7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ + $O\FilePathAutoRename.obj \ + $O\FileStreams.obj \ + $O\FilterCoder.obj \ + $O\LimitedStreams.obj \ + $O\MethodProps.obj \ + $O\ProgressUtils.obj \ + $O\PropId.obj \ + $O\StreamObjects.obj \ + $O\StreamUtils.obj \ + $O\UniqBlocks.obj \ + +UI_COMMON_OBJS = \ + $O\ArchiveExtractCallback.obj \ + $O\ArchiveName.obj \ + $O\ArchiveOpenCallback.obj \ + $O\CompressCall.obj \ + $O\DefaultName.obj \ + $O\EnumDirItems.obj \ + $O\ExtractingFilePath.obj \ + $O\HashCalc.obj \ + $O\LoadCodecs.obj \ + $O\OpenArchive.obj \ + $O\PropIDUtils.obj \ + $O\SetProperties.obj \ + $O\SortUtils.obj \ + $O\UpdateAction.obj \ + $O\UpdateCallback.obj \ + $O\UpdatePair.obj \ + $O\UpdateProduce.obj \ + $O\WorkDir.obj \ + $O\ZipRegistry.obj \ + +EXPLORER_OBJS = \ + $O\ContextMenu.obj \ + $O\RegistryContextMenu.obj \ + +GUI_OBJS = \ + $O\HashGUI.obj \ + $O\UpdateCallbackGUI2.obj \ + +COMPRESS_OBJS = \ + $O\CopyCoder.obj \ + +C_OBJS = $(C_OBJS) \ + $O\Alloc.obj \ + $O\CpuArch.obj \ + $O\Sort.obj \ + $O\Threads.obj \ + +!include "../../7zip.mak" diff --git a/CPP/7zip/UI/GUI/GUI.vcxproj b/CPP/7zip/UI/GUI/GUI.vcxproj deleted file mode 100644 index f49b9ecd..00000000 --- a/CPP/7zip/UI/GUI/GUI.vcxproj +++ /dev/null @@ -1,557 +0,0 @@ - - - - - DebugU - Win32 - - - DebugU - x64 - - - ReleaseU - Win32 - - - ReleaseU - x64 - - - - {D4BC12CF-49F2-474D-BAF6-EAC069DB7D6C} - 7zG - 10.0.17763.0 - - - - Application - v141 - false - Unicode - - - Application - v141 - false - Unicode - - - Application - v141 - false - Unicode - - - Application - v141 - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.27924.0 - - - false - C:\Program Files\7-Zip\ - $(SolutionDir)..\out\GUI - - - false - false - C:\Program Files\7-Zip\ - $(SolutionDir)..\out\GUI - - - true - C:\Program Files\7-Zip\ - $(SolutionDir)..\out\GUI - - - true - false - C:\Program Files\7-Zip\ - $(SolutionDir)..\out\GUI - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\ReleaseU/GUI.tlb - - - - MinSpace - OnlyExplicitInline - NDEBUG;UNICODE;_UNICODE;WIN32;_WINDOWS;LANG;WIN_LONG_PATH;EXTERNAL_CODECS;SUPPORT_DEVICE_FILE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - stdafx.h - .\ReleaseU/ - Level4 - true - true - FastCall - - - NDEBUG;%(PreprocessorDefinitions) - 0x0419 - - - odbc32.lib;odbccp32.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX86 - - - true - .\ReleaseU/GUI.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\ReleaseU/GUI.tlb - - - - MinSpace - OnlyExplicitInline - NDEBUG;UNICODE;WIN32;CPU=amd64;PLATFORM=x64;_WINDOWS;LANG;WIN_LONG_PATH;EXTERNAL_CODECS;SUPPORT_DEVICE_FILE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - stdafx.h - Level4 - true - true - FastCall - - - NDEBUG;%(PreprocessorDefinitions) - 0x0419 - - - odbc32.lib;odbccp32.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX64 - - - true - .\ReleaseU/GUI.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\DebugU/GUI.tlb - - - - Disabled - _DEBUG;UNICODE;WIN32;_WINDOWS;LANG;WIN_LONG_PATH;EXTERNAL_CODECS;SUPPORT_DEVICE_FILE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - .\DebugU/ - Level4 - true - true - EditAndContinue - FastCall - - - _DEBUG;%(PreprocessorDefinitions) - 0x0419 - - - odbc32.lib;odbccp32.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) - true - true - Windows - false - - MachineX86 - - - true - .\DebugU/GUI.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\DebugU/GUI.tlb - - - - Disabled - _DEBUG;UNICODE;WIN32;_WINDOWS;LANG;WIN_LONG_PATH;EXTERNAL_CODECS;SUPPORT_DEVICE_FILE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - .\DebugU/ - Level4 - true - true - ProgramDatabase - FastCall - - - _DEBUG;%(PreprocessorDefinitions) - 0x0419 - - - odbc32.lib;odbccp32.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) - true - true - Windows - false - - MachineX64 - - - true - .\DebugU/GUI.bsc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - \ No newline at end of file diff --git a/CPP/7zip/UI/GUI/makefile b/CPP/7zip/UI/GUI/makefile index b2c88afd..a9e9c29b 100644 --- a/CPP/7zip/UI/GUI/makefile +++ b/CPP/7zip/UI/GUI/makefile @@ -1,144 +1,145 @@ -PROG = 7zG.exe -CFLAGS = $(CFLAGS) \ - -DLANG \ - -DEXTERNAL_CODECS \ - -!IFDEF UNDER_CE -LIBS = $(LIBS) ceshell.lib Commctrl.lib -!ELSE -LIBS = $(LIBS) comctl32.lib htmlhelp.lib comdlg32.lib gdi32.lib -CFLAGS = $(CFLAGS) -DWIN_LONG_PATH -DSUPPORT_DEVICE_FILE -D_7ZIP_LARGE_PAGES -!ENDIF - -GUI_OBJS = \ - $O\BenchmarkDialog.obj \ - $O\CompressDialog.obj \ - $O\ExtractDialog.obj \ - $O\ExtractGUI.obj \ - $O\GUI.obj \ - $O\HashGUI.obj \ - $O\UpdateCallbackGUI.obj \ - $O\UpdateCallbackGUI2.obj \ - $O\UpdateGUI.obj \ - -COMMON_OBJS = \ - $O\CommandLineParser.obj \ - $O\CRC.obj \ - $O\IntToString.obj \ - $O\Lang.obj \ - $O\ListFileUtils.obj \ - $O\MyString.obj \ - $O\MyVector.obj \ - $O\NewHandler.obj \ - $O\StringConvert.obj \ - $O\StringToInt.obj \ - $O\UTFConvert.obj \ - $O\Wildcard.obj \ - -WIN_OBJS = \ - $O\Clipboard.obj \ - $O\CommonDialog.obj \ - $O\DLL.obj \ - $O\ErrorMsg.obj \ - $O\FileDir.obj \ - $O\FileFind.obj \ - $O\FileIO.obj \ - $O\FileLink.obj \ - $O\FileName.obj \ - $O\FileSystem.obj \ - $O\MemoryGlobal.obj \ - $O\MemoryLock.obj \ - $O\PropVariant.obj \ - $O\PropVariantConv.obj \ - $O\Registry.obj \ - $O\ResourceString.obj \ - $O\Shell.obj \ - $O\Synchronization.obj \ - $O\System.obj \ - $O\TimeUtils.obj \ - $O\Window.obj \ - -WIN_CTRL_OBJS = \ - $O\ComboBox.obj \ - $O\Dialog.obj \ - $O\ListView.obj \ - -7ZIP_COMMON_OBJS = \ - $O\CreateCoder.obj \ - $O\FilePathAutoRename.obj \ - $O\FileStreams.obj \ - $O\FilterCoder.obj \ - $O\LimitedStreams.obj \ - $O\MethodProps.obj \ - $O\ProgressUtils.obj \ - $O\PropId.obj \ - $O\StreamObjects.obj \ - $O\StreamUtils.obj \ - $O\UniqBlocks.obj \ - -UI_COMMON_OBJS = \ - $O\ArchiveCommandLine.obj \ - $O\ArchiveExtractCallback.obj \ - $O\ArchiveOpenCallback.obj \ - $O\Bench.obj \ - $O\DefaultName.obj \ - $O\EnumDirItems.obj \ - $O\Extract.obj \ - $O\ExtractingFilePath.obj \ - $O\HashCalc.obj \ - $O\LoadCodecs.obj \ - $O\OpenArchive.obj \ - $O\PropIDUtils.obj \ - $O\SetProperties.obj \ - $O\SortUtils.obj \ - $O\TempFiles.obj \ - $O\Update.obj \ - $O\UpdateAction.obj \ - $O\UpdateCallback.obj \ - $O\UpdatePair.obj \ - $O\UpdateProduce.obj \ - $O\WorkDir.obj \ - $O\ZipRegistry.obj \ - -AR_COMMON_OBJS = \ - $O\OutStreamWithCRC.obj \ - -FM_OBJS = \ - $O\EditDialog.obj \ - $O\ExtractCallback.obj \ - $O\FormatUtils.obj \ - $O\HelpUtils.obj \ - $O\LangUtils.obj \ - $O\ListViewDialog.obj \ - $O\OpenCallback.obj \ - $O\ProgramLocation.obj \ - $O\PropertyName.obj \ - $O\RegistryUtils.obj \ - $O\SplitUtils.obj \ - $O\StringUtils.obj \ - $O\OverwriteDialog.obj \ - $O\PasswordDialog.obj \ - $O\ProgressDialog2.obj \ - $O\ViewSettings.obj - -FM_OBJS = $(FM_OBJS) \ - $O\BrowseDialog.obj \ - $O\ComboDialog.obj \ - $O\SysIconUtils.obj \ - -EXPLORER_OBJS = \ - $O\MyMessages.obj \ - -COMPRESS_OBJS = \ - $O\CopyCoder.obj \ - -C_OBJS = \ - $O\Alloc.obj \ - $O\CpuArch.obj \ - $O\Sort.obj \ - $O\Threads.obj \ - -!include "../../Crc.mak" - - -!include "../../7zip.mak" +PROG = 7zG.exe +CFLAGS = $(CFLAGS) \ + -DLANG \ + -DEXTERNAL_CODECS \ + +!IFDEF UNDER_CE +LIBS = $(LIBS) ceshell.lib Commctrl.lib +!ELSE +LIBS = $(LIBS) comctl32.lib htmlhelp.lib comdlg32.lib gdi32.lib +CFLAGS = $(CFLAGS) -DWIN_LONG_PATH -DSUPPORT_DEVICE_FILE -D_7ZIP_LARGE_PAGES +!ENDIF + +GUI_OBJS = \ + $O\BenchmarkDialog.obj \ + $O\CompressDialog.obj \ + $O\ExtractDialog.obj \ + $O\ExtractGUI.obj \ + $O\GUI.obj \ + $O\HashGUI.obj \ + $O\UpdateCallbackGUI.obj \ + $O\UpdateCallbackGUI2.obj \ + $O\UpdateGUI.obj \ + +COMMON_OBJS = \ + $O\CommandLineParser.obj \ + $O\CRC.obj \ + $O\IntToString.obj \ + $O\Lang.obj \ + $O\ListFileUtils.obj \ + $O\MyString.obj \ + $O\MyVector.obj \ + $O\NewHandler.obj \ + $O\StringConvert.obj \ + $O\StringToInt.obj \ + $O\UTFConvert.obj \ + $O\Wildcard.obj \ + +WIN_OBJS = \ + $O\Clipboard.obj \ + $O\CommonDialog.obj \ + $O\DLL.obj \ + $O\ErrorMsg.obj \ + $O\FileDir.obj \ + $O\FileFind.obj \ + $O\FileIO.obj \ + $O\FileLink.obj \ + $O\FileName.obj \ + $O\FileSystem.obj \ + $O\MemoryGlobal.obj \ + $O\MemoryLock.obj \ + $O\PropVariant.obj \ + $O\PropVariantConv.obj \ + $O\Registry.obj \ + $O\ResourceString.obj \ + $O\Shell.obj \ + $O\Synchronization.obj \ + $O\System.obj \ + $O\TimeUtils.obj \ + $O\Window.obj \ + +WIN_CTRL_OBJS = \ + $O\ComboBox.obj \ + $O\Dialog.obj \ + $O\ListView.obj \ + +7ZIP_COMMON_OBJS = \ + $O\CreateCoder.obj \ + $O\FilePathAutoRename.obj \ + $O\FileStreams.obj \ + $O\FilterCoder.obj \ + $O\LimitedStreams.obj \ + $O\MethodProps.obj \ + $O\ProgressUtils.obj \ + $O\PropId.obj \ + $O\StreamObjects.obj \ + $O\StreamUtils.obj \ + $O\UniqBlocks.obj \ + +UI_COMMON_OBJS = \ + $O\ArchiveCommandLine.obj \ + $O\ArchiveExtractCallback.obj \ + $O\ArchiveOpenCallback.obj \ + $O\Bench.obj \ + $O\DefaultName.obj \ + $O\EnumDirItems.obj \ + $O\Extract.obj \ + $O\ExtractingFilePath.obj \ + $O\HashCalc.obj \ + $O\LoadCodecs.obj \ + $O\OpenArchive.obj \ + $O\PropIDUtils.obj \ + $O\SetProperties.obj \ + $O\SortUtils.obj \ + $O\TempFiles.obj \ + $O\Update.obj \ + $O\UpdateAction.obj \ + $O\UpdateCallback.obj \ + $O\UpdatePair.obj \ + $O\UpdateProduce.obj \ + $O\WorkDir.obj \ + $O\ZipRegistry.obj \ + +AR_COMMON_OBJS = \ + $O\OutStreamWithCRC.obj \ + +FM_OBJS = \ + $O\EditDialog.obj \ + $O\ExtractCallback.obj \ + $O\FormatUtils.obj \ + $O\HelpUtils.obj \ + $O\LangUtils.obj \ + $O\ListViewDialog.obj \ + $O\OpenCallback.obj \ + $O\ProgramLocation.obj \ + $O\PropertyName.obj \ + $O\RegistryUtils.obj \ + $O\SplitUtils.obj \ + $O\StringUtils.obj \ + $O\OverwriteDialog.obj \ + $O\PasswordDialog.obj \ + $O\ProgressDialog2.obj \ + $O\ViewSettings.obj + +FM_OBJS = $(FM_OBJS) \ + $O\BrowseDialog.obj \ + $O\ComboDialog.obj \ + $O\SysIconUtils.obj \ + +EXPLORER_OBJS = \ + $O\MyMessages.obj \ + +COMPRESS_OBJS = \ + $O\CopyCoder.obj \ + +C_OBJS = \ + $O\Alloc.obj \ + $O\CpuArch.obj \ + $O\DllSecur.obj \ + $O\Sort.obj \ + $O\Threads.obj \ + +!include "../../Crc.mak" + + +!include "../../7zip.mak" diff --git a/CPP/Common/MyWindows.h b/CPP/Common/MyWindows.h index 6bce5d39..7ec52c91 100644 --- a/CPP/Common/MyWindows.h +++ b/CPP/Common/MyWindows.h @@ -96,8 +96,6 @@ typedef LONG SCODE; #define E_OUTOFMEMORY ((HRESULT)0x8007000EL) #define E_INVALIDARG ((HRESULT)0x80070057L) -#define ERROR_NEGATIVE_SEEK -1 -#define HRESULT_FROM_WIN32(e) ((HRESULT)(e)) #ifdef _MSC_VER #define STDMETHODCALLTYPE __stdcall diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd deleted file mode 100644 index a5f956d1..00000000 --- a/CPP/build-x64.cmd +++ /dev/null @@ -1,103 +0,0 @@ -@echo off - -set ROOT=%cd%\7zip -if not defined OUTDIR set OUTDIR=%ROOT%\bin64 -if not defined ERRFILE set ERRFILE=%cd%\error.txt -mkdir %OUTDIR% - -set OPTS=CPU=AMD64 MY_STATIC_LINK=1 /NOLOGO -set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02" - -cd %ROOT%\Bundles\Format7zExtract -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zxa.dll" >> %ERRFILE% -copy AMD64\7zxa.dll %OUTDIR%\7zxa.dll - -cd %ROOT%\Bundles\Format7z -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.dll" >> %ERRFILE% -copy AMD64\7za.dll %OUTDIR%\7za.dll - -cd %ROOT%\Bundles\Format7zF -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> %ERRFILE% -copy AMD64\7z.dll %OUTDIR%\7z.dll - -cd %ROOT%\UI\FileManager -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE% -copy AMD64\7zFM.exe %OUTDIR%\7zFM.exe - -cd %ROOT%\UI\GUI -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> %ERRFILE% -copy AMD64\7zG.exe %OUTDIR%\7zG.exe - -cd %ROOT%\UI\Explorer -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> %ERRFILE% -copy AMD64\7-zip.dll %OUTDIR%\7-zip.dll - -cd %ROOT%\Bundles\SFXWin -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> %ERRFILE% -copy AMD64\7z.sfx %OUTDIR%\7z.sfx - -cd %ROOT%\Bundles\Codec_brotli -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ brotli-x64.dll" >> %ERRFILE% -copy AMD64\brotli.dll %OUTDIR%\brotli-x64.dll - -cd %ROOT%\Bundles\Codec_lizard -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ lizard-x64.dll" >> %ERRFILE% -copy AMD64\lizard.dll %OUTDIR%\lizard-x64.dll - -cd %ROOT%\Bundles\Codec_lz4 -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ lz4-x64.dll" >> %ERRFILE% -copy AMD64\lz4.dll %OUTDIR%\lz4-x64.dll - -cd %ROOT%\Bundles\Codec_lz5 -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ lz5-x64.dll" >> %ERRFILE% -copy AMD64\lz5.dll %OUTDIR%\lz5-x64.dll - -cd %ROOT%\Bundles\Codec_zstd -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ zstd-x64.dll" >> %ERRFILE% -copy AMD64\zstd.dll %OUTDIR%\zstd-x64.dll - -cd %ROOT%\Bundles\Codec_flzma2 -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ flzma2-x64.dll" >> %ERRFILE% -copy AMD64\flzma2.dll %OUTDIR%\flzma2-x64.dll - -cd %ROOT%\..\..\C\Util\7zipInstall -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ Install-x64.exe" >> %ERRFILE% -copy AMD64\7zipInstall.exe %OUTDIR%\Install-x64.exe - -cd %ROOT%\..\..\C\Util\7zipUninstall -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> %ERRFILE% -copy AMD64\7zipUninstall.exe %OUTDIR%\Uninstall.exe - -set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02" -cd %ROOT%\UI\Console -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> %ERRFILE% -copy AMD64\7z.exe %OUTDIR%\7z.exe - -cd %ROOT%\Bundles\SFXCon -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> %ERRFILE% -copy AMD64\7zCon.sfx %OUTDIR%\7zCon.sfx - -cd %ROOT%\Bundles\Alone -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.exe" >> %ERRFILE% -copy AMD64\7za.exe %OUTDIR%\7za.exe - -:ende -cd %ROOT%\.. diff --git a/README.md b/README.md index da7f9bdd..21330375 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,13 @@ -# Git archive of 7-zip releases +# Jame's Easy-Zip *almost* (continued) -Because 7-zip [doesn't](https://github.com/7z) have a public repository, and their code is released only as archives on SourceForge, I maintain a git-ified copy here. +I really like James Hoo's branch of the 7-zip utility. It has features that have repeatedly been begged for, but haven't been implemented by Igor Pavlov. The man is nothing but dedicated towards making things smaller, but he has no interest in UI. + +This branch implements: + +- Deleting archives after extraction. +- Recalling/Storing output history +- Icons in the context menu +- Opening the output folder after extraction. + +There are some missing features from [Jame's 16.05 version](http://www.e7z.org/), namely the second about Easy-7zip dialog. -The [tagged releases](https://github.com/pornel/7z/releases) and the [original branch](https://github.com/pornel/7z/tree/original) contain pure 7-zip releases, without any modifications like this readme. diff --git a/build.cmd b/build.cmd index 3c971582..4582266c 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,5 @@ @echo off -set OPTS=CPU=AMD64 MY_STATIC_LINK=1 _SFX=1 PLATFORM=x64 +set OPTS=_SFX=1 PLATFORM=x64 set LFLAGS=/DEBUG /SUBSYSTEM:WINDOWS,"5.02" @echo ^_^_^_^_^_ ^_ ^_ ^_^_ ^_^_ @@ -127,6 +127,5 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> errorfile.txt popd -cd /d %~dp0out -powershell -Command "& { Copy-Item .\*\*.exe,.\*\*.dll,.\*\*.lib,.\*\*.pdb -Destination . }" +powershell -Command Copy-Item .\out\*\*.exe,.\out\*\*.dll,.\out\*\*.pdb,.\out\*\*.sfx -Destination .\out\ -Verbose -Force explorer.exe %~dp0out \ No newline at end of file