From 59c3829c087a4045acf78c0921e53bc63c06b4a3 Mon Sep 17 00:00:00 2001
From: DavidXanatos <xanatosdavid@gmail.com>
Date: Sun, 2 Oct 2022 18:28:46 +0200
Subject: [PATCH] 1.4.1

---
 CHANGELOG.md                       | 12 +++++++++++-
 Sandboxie/common/my_version.h      |  4 ++--
 Sandboxie/core/dll/com.c           | 12 ++++++++++--
 Sandboxie/core/drv/ipc.c           | 12 ++++++++++--
 Sandboxie/core/drv/process_force.c |  2 +-
 SandboxiePlus/version.h            |  2 +-
 6 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e1431bf..2c00690a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 
-## [1.4.0 / 5.59.0] - 2022-??-??
+## [1.4.1 / 5.59.1] - 2022-10-??
+
+### Changed
+- In sbie 5.28 and later WinInetCache is open, this breks IE's source view, hence it can now be disabled with 'CloseWinInetCache=y'
+
+### Fixed
+- fixed WarnProcess and WarnFolder not working with certain configurations
+
+
+
+## [1.4.0 / 5.59.0] - 2022-09-30
 
 ### Added
 - added integrated run from start menu [#1836](https://github.com/sandboxie-plus/Sandboxie/issues/1836)
diff --git a/Sandboxie/common/my_version.h b/Sandboxie/common/my_version.h
index 28b766d2..ed65fa28 100644
--- a/Sandboxie/common/my_version.h
+++ b/Sandboxie/common/my_version.h
@@ -21,8 +21,8 @@
 #ifndef _MY_VERSION_H
 #define _MY_VERSION_H
 
-#define MY_VERSION_BINARY       5,59,0
-#define MY_VERSION_STRING       "5.59.0"
+#define MY_VERSION_BINARY       5,59,1
+#define MY_VERSION_STRING       "5.59.1"
 #define MY_VERSION_COMPAT		"5.58.0" // this refers to the driver ABI compatibility
 
 // These #defines are used by either Resource Compiler or NSIS installer
diff --git a/Sandboxie/core/dll/com.c b/Sandboxie/core/dll/com.c
index 5dbe6e71..5198614a 100644
--- a/Sandboxie/core/dll/com.c
+++ b/Sandboxie/core/dll/com.c
@@ -449,13 +449,21 @@ _FX BOOLEAN SbieDll_IsOpenClsid(
 
         if (memcmp(rclsid, &CLSID_WinMgmt,              sizeof(GUID)) == 0 ||
             memcmp(rclsid, &CLSID_NetworkListManager,   sizeof(GUID)) == 0 ||
-            memcmp(rclsid, &CLSID_ShellServiceHostBrokerProvider, sizeof(GUID)) == 0 ||
-            ((Dll_OsBuild >= 10240) && memcmp(rclsid, &CLSID_WinInetCache, sizeof(GUID)) == 0))
+            memcmp(rclsid, &CLSID_ShellServiceHostBrokerProvider, sizeof(GUID)) == 0)
         {
 
             return TRUE;
         }
 
+        // 
+        // Sbie builds after 5.27-1 broke IE's source view and cache,
+        // by opening WinInetCache here and in Ipc_InitPaths.
+        // with CloseWinInetCache=y this change can be undone
+        //
+
+        if (((Dll_OsBuild >= 10240) && memcmp(rclsid, &CLSID_WinInetCache, sizeof(GUID)) == 0) && !SbieApi_QueryConfBool(NULL, L"CloseWinInetCache", FALSE)) // this breaks IE view source
+            return TRUE;
+
         //
         // initialize list of user-configured CLSID exclusions
         //
diff --git a/Sandboxie/core/drv/ipc.c b/Sandboxie/core/drv/ipc.c
index 88152a9b..e7b71421 100644
--- a/Sandboxie/core/drv/ipc.c
+++ b/Sandboxie/core/drv/ipc.c
@@ -568,8 +568,6 @@ _FX BOOLEAN Ipc_InitPaths(PROCESS* proc)
     };
     static const WCHAR* openpaths_windows10[] = {
         L"*\\BaseNamedObjects*\\CoreMessagingRegistrar",
-        L"\\RPC Control\\webcache_*",
-        L"*\\BaseNamedObjects\\windows_webcache_counters_*",
         L"*\\BaseNamedObjects\\[CoreUI]-*",
         // open paths 11
         L"*\\BaseNamedObjects\\SM*:WilStaging_*", // 22449.1000 accesses this before sbiedll load
@@ -679,6 +677,16 @@ _FX BOOLEAN Ipc_InitPaths(PROCESS* proc)
             ok = Process_AddPath(proc, &proc->open_ipc_paths, NULL,
                 TRUE, openpaths_windows10[i], FALSE);
         }
+
+        if (!Conf_Get_Boolean(proc->box->name, L"CloseWinInetCache", 0, FALSE)) { // this breaks IE view source, see SbieDll_IsOpenClsid
+            
+            static const WCHAR* webcache_ = L"\\RPC Control\\webcache_*";
+            static const WCHAR* windows_webcache_counters_ = L"*\\BaseNamedObjects\\windows_webcache_counters_*";
+            if (ok) ok = Process_AddPath(proc, &proc->open_ipc_paths, NULL,
+                FALSE, webcache_, FALSE);
+            if (ok) ok = Process_AddPath(proc, &proc->open_ipc_paths, NULL,
+                FALSE, windows_webcache_counters_, FALSE);
+        }
     }
 
     if (ok) {
diff --git a/Sandboxie/core/drv/process_force.c b/Sandboxie/core/drv/process_force.c
index ff625095..d46aab18 100644
--- a/Sandboxie/core/drv/process_force.c
+++ b/Sandboxie/core/drv/process_force.c
@@ -315,7 +315,7 @@ _FX BOX *Process_GetForcedStartBox(
 
 			box = (BOX *)-1;
 		}
-		else if ((force_alert == 1) && Conf_Get_Boolean(NULL, L"NotifyForceProcessDisabled", 0, FALSE))
+		else if ((force_alert == 0) || ((force_alert == 1) && Conf_Get_Boolean(NULL, L"NotifyForceProcessDisabled", 0, FALSE)))
 		{
 			Log_Msg_Process(MSG_1301, ImageName, NULL, SessionId, ProcessId);
 		}
diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h
index bb38408c..8a65b579 100644
--- a/SandboxiePlus/version.h
+++ b/SandboxiePlus/version.h
@@ -2,7 +2,7 @@
 
 #define VERSION_MJR		1
 #define VERSION_MIN 	4
-#define VERSION_REV 	0
+#define VERSION_REV 	1
 #define VERSION_UPD 	0
 
 #ifndef STR