From 02e9517144de5d82c6983c0c25816874c5cb3e0a Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Tue, 26 Mar 2024 09:49:54 +0100
Subject: [PATCH] 1.13.5

---
 CHANGELOG.md                  |  9 +++++++++
 Sandboxie/common/my_version.h |  4 ++--
 Sandboxie/core/drv/dyn_data.c | 10 +++++++++-
 SandboxiePlus/version.h       |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a99f743c38..1a9e2a2879 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 
+
+
+## [1.13.5 / 5.68.5] - 2024-03-??
+
+### Changed
+- on systems in test signing mode sandboxie will by default try outdated offsets
+
+
+
 ## [1.13.4 / 5.68.4] - 2024-03-25
 
 ### Added
diff --git a/Sandboxie/common/my_version.h b/Sandboxie/common/my_version.h
index b57d11b214..460f62218e 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,68,4
-#define MY_VERSION_STRING       "5.68.4"
+#define MY_VERSION_BINARY       5,68,5
+#define MY_VERSION_STRING       "5.68.5"
 #define MY_ABI_VERSION          0x56800
 
 // These #defines are used by either Resource Compiler or NSIS installer
diff --git a/Sandboxie/core/drv/dyn_data.c b/Sandboxie/core/drv/dyn_data.c
index b5a18653f3..803c18959c 100644
--- a/Sandboxie/core/drv/dyn_data.c
+++ b/Sandboxie/core/drv/dyn_data.c
@@ -1030,6 +1030,10 @@ _FX NTSTATUS Dyndata_LoadData()
             PSBIE_DYNCONFIG Data = (PSBIE_DYNCONFIG)((UCHAR*)Dyndata + Offset);
             if ((UCHAR*)Data > (UCHAR*)Dyndata + DyndataSize) continue;
 
+#ifdef DYN_DEBUG
+                DbgPrint("Sbie testing DYNDATA %d <= %d <= %d\r\n", Data->OsBuild_min, Driver_OsBuild, Data->OsBuild_max);
+#endif
+
             //
             // Find an exact match for the current Windows build
             //
@@ -1053,6 +1057,10 @@ _FX NTSTATUS Dyndata_LoadData()
 
         if (!DataMatch && DataExp)
         {
+            //
+            // Try detecting insider build
+            //
+
             if (GetRegDword(L"\\Registry\\Machine\\Software\\Microsoft\\WindowsSelfHost\\Applicability", L"EnablePreviewBuilds") != 0) 
             {
                 DbgPrint("Sbie detected insider build %d\r\n", Driver_OsBuild);
@@ -1067,7 +1075,7 @@ _FX NTSTATUS Dyndata_LoadData()
             // L"AllowOutdatedOffsets"
             //
 
-            else if(GetRegDword(path, L"AllowOutdatedOffsets"))
+            else if(GetRegDword(path, L"AllowOutdatedOffsets") || Driver_OsTestSigning)
             {
                 DataMatch = DataExp;
             }
diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h
index fa515231fe..0b7db0691a 100644
--- a/SandboxiePlus/version.h
+++ b/SandboxiePlus/version.h
@@ -2,7 +2,7 @@
 
 #define VERSION_MJR		1
 #define VERSION_MIN 	13
-#define VERSION_REV 	4
+#define VERSION_REV 	5
 #define VERSION_UPD 	0
 
 #ifndef STR