From aca0bd27548eab90b04a5db684fed8a8b02ecd94 Mon Sep 17 00:00:00 2001
From: DavidXanatos <xanatosdavid@gmail.com>
Date: Thu, 12 May 2022 23:04:07 +0200
Subject: [PATCH] 1.0.22

---
 CHANGELOG.md                    | 9 +++++++++
 Sandboxie/core/drv/syscall_64.c | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d84c5f88..86e55743 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 
+## [1.0.22 / 5.55.22] - 2022-05-xx
+
+
+### Fixed
+- fixed sandman crash issue [#1846](https://github.com/sandboxie-plus/Sandboxie/issues/1846)
+- fixed issue with windows server 2022 build 20348
+
+
+
 ## [1.0.21 / 5.55.21] - 2022-05-10
 
 ### Added
diff --git a/Sandboxie/core/drv/syscall_64.c b/Sandboxie/core/drv/syscall_64.c
index 140366d4..b96cdd48 100644
--- a/Sandboxie/core/drv/syscall_64.c
+++ b/Sandboxie/core/drv/syscall_64.c
@@ -111,8 +111,8 @@ _FX void *Syscall_GetMasterServiceTable(void)
 
     ExFreePoolWithTag(ptr, tzuk);
 
-    //MasterTable lookup for windows 11
-    if (Driver_OsBuild >= 22563) {
+    //MasterTable lookup for windows 11 insider 22563 or server 2022 20348
+    if (Driver_OsBuild >= 20348) {
 
         ULONG_PTR kernel_base = nt;
         RtlInitUnicodeString(&uni, L"KeAddSystemServiceTable");