From bfcdc3720fdf6be7af0ce7df8d298cffc9d2f16b Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Sat, 7 Sep 2024 09:59:25 +0200
Subject: [PATCH] 1.14.8

---
 CHANGELOG.md                                  | 12 ++++++++++++
 SandboxiePlus/MiscHelpers/Archive/Archive.cpp |  9 +++++----
 SandboxiePlus/MiscHelpers/Archive/Archive.h   |  1 +
 SandboxiePlus/SandMan/SbiePlusAPI.cpp         |  3 +++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd53a258c7..9f7bcdb6ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## [1.14.8 / 5.69.8] - 2024-09-??
+
+### Changed
+- allowed users to import/export boxes with .zip files.
+
+### Fixed
+- fixed a cert issue
+
+
+
 ## [1.14.7 / 5.69.7] - 2024-09-05
 
 ### Added
@@ -23,6 +34,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - fixed NtQueryDirectoryObject (should not return "STATUS_MORE_ENTRIES") as this is an easy sandbox detection [#4201](https://github.com/sandboxie-plus/Sandboxie/issues/4201)
 
 
+
 ## [1.14.6 / 5.69.6] - 2024-07-30
 
 ### Added
diff --git a/SandboxiePlus/MiscHelpers/Archive/Archive.cpp b/SandboxiePlus/MiscHelpers/Archive/Archive.cpp
index e128f8e118..fcac62fd98 100644
--- a/SandboxiePlus/MiscHelpers/Archive/Archive.cpp
+++ b/SandboxiePlus/MiscHelpers/Archive/Archive.cpp
@@ -255,21 +255,22 @@ bool CArchive::Update(QMap<int, QIODevice*> *FileList, bool bDelete, const SComp
 		*/
 		const wchar_t *names[] =
 		{
-			L"s",
 			L"x",
 			//L"mt",
+			L"s",
 			L"he"
 		};
 		const int kNumProps = sizeof(names) / sizeof(names[0]);
 		NWindows::NCOM::CPropVariant values[kNumProps] =
 		{
-			(Params ? Params->bSolid : false),		// solid mode OFF
 			(UInt32)(Params ? Params->iLevel : 5),	// compression level = 9 - ultra
 			//(UInt32)8,							// set number of CPU threads
-			true									// file name encryption (7z only)
+			// 7z only
+			(Params ? Params->bSolid : false),		// solid mode OFF
+			(Params ? Params->b7z : false)		    // file name encryption
 		};
 
-		if(setProperties->SetProperties(names, values, kNumProps) != S_OK)
+		if(setProperties->SetProperties(names, values, Params->b7z ? kNumProps : (kNumProps - 2)) != S_OK)
 		{
 			TRACE(L"ISetProperties failed");
 			Q_ASSERT(0);
diff --git a/SandboxiePlus/MiscHelpers/Archive/Archive.h b/SandboxiePlus/MiscHelpers/Archive/Archive.h
index 7d5c22eacb..865e2607c4 100644
--- a/SandboxiePlus/MiscHelpers/Archive/Archive.h
+++ b/SandboxiePlus/MiscHelpers/Archive/Archive.h
@@ -20,6 +20,7 @@ struct SCompressParams
 {
 	int iLevel = 0;
 	bool bSolid = false;
+	bool b7z = false;
 };
 
 class MISCHELPERS_EXPORT CArchive
diff --git a/SandboxiePlus/SandMan/SbiePlusAPI.cpp b/SandboxiePlus/SandMan/SbiePlusAPI.cpp
index edb2f3d7f3..76d82ea9d0 100644
--- a/SandboxiePlus/SandMan/SbiePlusAPI.cpp
+++ b/SandboxiePlus/SandMan/SbiePlusAPI.cpp
@@ -234,9 +234,12 @@ void CSandBoxPlus::ExportBoxAsync(const CSbieProgressPtr& pProgress, const QStri
 	if (vParams.contains("password"))
 		Archive.SetPassword(vParams["password"].toString());
 
+	SArcInfo Info = GetArcInfo(ExportPath);
+
     SCompressParams Params;
 	Params.iLevel = vParams["level"].toInt();
 	Params.bSolid = vParams["solid"].toBool();
+	Params.b7z = Info.FormatIndex == 1;
 
 	SB_STATUS Status = SB_OK;
 	if (!Archive.Update(&Files, true, &Params, &Attributes))