Update 7-Zip to 24.05

WinMerge · May 19, 2024 · d2762ea · d2762ea
1 parent 89a1a4d
commit d2762ea
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 4 deletions.
diff --git a/ArchiveSupport/Merge7z/BuildArc.cmd b/ArchiveSupport/Merge7z/BuildArc.cmd
@@ -1,7 +1,7 @@
 pushd "%~dp0"
 
 setlocal
-set MERGE7z_VERSION=2301.1
+set MERGE7z_VERSION=2405.1
 set PATH="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%PATH%
 set DISTDIR=..\..\Build\Releases
 

diff --git a/ArchiveSupport/Merge7z/Merge7z.cpp b/ArchiveSupport/Merge7z/Merge7z.cpp
@@ -323,7 +323,7 @@ void Format7zDLL::Interface::Updater::Init(HWND hwndParent)
 {
 	(outArchive = format->GetOutArchive()) -> AddRef();
 	static_cast<IOutStream*>(file = new COutFileStream) -> AddRef();
-	if COMPLAIN(!file->Create(path, true))
+	if COMPLAIN(!file->Create_ALWAYS(path))
 	{
 		Complain(ERROR_CANNOT_MAKE, path);
 	}

diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vcxproj
@@ -550,9 +550,12 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.h" />
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.h" />
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h" />
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Explorer\MyMessages.h" />
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\MemDialog.h" />
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.h" />
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.h" />
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\System.h" />
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\TimeUtils.h" />
     <ClInclude Include="Merge7z.h" />
     <ClInclude Include="Merge7zCommon.h" />
     <ClInclude Include="StdAfx.h" />
@@ -619,9 +622,12 @@
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.cpp" />
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.cpp" />
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp" />
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Explorer\MyMessages.cpp" />
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\MemDialog.cpp" />
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.cpp" />
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.cpp" />
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\System.cpp" />
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\TimeUtils.cpp" />
     <ClCompile Include="..\..\Externals\sevenzip\C\7zCrcOpt.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj.filters b/ArchiveSupport/Merge7z/Merge7z.vcxproj.filters
@@ -240,6 +240,15 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\System.h">
       <Filter>Windows</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\TimeUtils.h">
+      <Filter>Extract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\MemDialog.h">
+      <Filter>7zip Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Explorer\MyMessages.h">
+      <Filter>7zip Common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Merge7z.cpp">
@@ -452,6 +461,15 @@
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\System.cpp">
       <Filter>Windows</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\TimeUtils.cpp">
+      <Filter>Extract</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\MemDialog.cpp">
+      <Filter>7zip Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Explorer\MyMessages.cpp">
+      <Filter>7zip Common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Gui\resource.rc">

diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.cpp b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
@@ -56,6 +56,8 @@ DATE:		BY:					DESCRIPTION:
 #include "stdafx.h"
 #include "Merge7zCommon.h"
 
+bool g_DisableUserQuestions;
+
 void ReloadLang(); //Implemented in /*/FileManager/LangUtils.cpp
 
 using namespace NWindows;
@@ -723,6 +725,7 @@ DEFINE_FORMAT(CLzmaHandler,		0A, "lzma", "");
 DEFINE_FORMAT(CLzma86Handler,	0B, "lzma86", "");
 DEFINE_FORMAT(CXzHandler,		0C, "xz", "\xFD" "7zXZ" "\0");
 //DEFINE_FORMAT(CPpmdHandler,	0D, "ppmd", "");
+DEFINE_FORMAT(CZstdHandler,		0E,  "zst tzst", "\x28\xB5\x2F\xFD");
 
 //DEFINE_FORMAT(CCOFFHandler,	C6, "obj", "L\x01");
 //DEFINE_FORMAT(CExtHandler,	C7, "ext ext2 ext3 ext4", "");
@@ -1012,6 +1015,17 @@ void NExtract::Save_ShowPassword(bool)
 {
 }
 
+UInt32 NExtract::Read_LimitGB()
+{
+	return (UInt32)(Int32)-1;
+}
+
+
+void NExtract::Save_LimitGB(UInt32 limit_GB)
+{
+}
+
+
 /**
  * @brief Export instance of Merge7z interface.
  */

diff --git a/Externals/sevenzip b/Externals/sevenzip
diff --git a/Externals/versions.txt b/Externals/versions.txt
@@ -15,7 +15,7 @@ This file lists versions of the external components we are using.
   - rapidjson: 1.1.1
 - Google C++ Testing Framework: 1.14.0
 - GNU patch: 2.7.6-1
-- 7-zip: 23.01
+- 7-zip: 24.05
 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
 - html-tidy5: 5.4.0
 - jq: 1.7.1