From 565492774453f01a17e02adc0718d5a56b01cd3d Mon Sep 17 00:00:00 2001 From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com> Date: Thu, 16 Jan 2025 22:08:05 +0100 Subject: [PATCH] 1.15.5 --- CHANGELOG.md | 1 + .../QSbieAPI/Sandboxie/SbieTemplates.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c8b181bd2..5e4b4d02a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - fixed Could not run x64 in ARM64 PC. [#4415](https://github.com/sandboxie-plus/Sandboxie/issues/4415) - fixed issue with process self termination - fixed msedge_elf.dll not found on windows 10 Arm64 +- fixed win10 ARM64 cannot be used [#3600](https://github.com/sandboxie-plus/Sandboxie/issues/3600) ### Added - Added HookTrace=y to debug api hooking diff --git a/SandboxiePlus/QSbieAPI/Sandboxie/SbieTemplates.cpp b/SandboxiePlus/QSbieAPI/Sandboxie/SbieTemplates.cpp index b3b232b545..3b6d8824dd 100644 --- a/SandboxiePlus/QSbieAPI/Sandboxie/SbieTemplates.cpp +++ b/SandboxiePlus/QSbieAPI/Sandboxie/SbieTemplates.cpp @@ -361,9 +361,9 @@ bool CSbieTemplates::CheckTemplate(const QString& Name) QString scan = pTemplate->GetText("Tmpl.Scan", QString(), false, false, true); BOOL scanIpc = (scan.indexOf(L'i') != -1); - BOOL scanWin = (scan.indexOf(L'w') != -1); - BOOL scanSvc = (scan.indexOf(L's') != -1); - if (!(scanIpc || scanWin || scanSvc)) + BOOL scanWindow = (scan.indexOf(L'w') != -1); + BOOL scanSoftware = (scan.indexOf(L's') != -1); + if (!(scanIpc || scanWindow || scanSoftware)) return false; QList> settings = pTemplate->GetIniSection(0, true); @@ -386,7 +386,7 @@ bool CSbieTemplates::CheckTemplate(const QString& Name) if (CheckObjects(value)) return true; } - else if (scanWin && ((setting.compare("OpenWinClass", Qt::CaseInsensitive) == 0 || setting.compare("Tmpl.ScanWinClass", Qt::CaseInsensitive) == 0))) + else if (scanWindow && ((setting.compare("OpenWinClass", Qt::CaseInsensitive) == 0 || setting.compare("Tmpl.ScanWinClass", Qt::CaseInsensitive) == 0))) { // skip to unspecific entries if(value.left(2).compare("*:") == 0) @@ -395,22 +395,22 @@ bool CSbieTemplates::CheckTemplate(const QString& Name) if (CheckClasses(value)) return true; } - else if (scanSvc && setting.compare("Tmpl.ScanService", Qt::CaseInsensitive) == 0) + else if (scanSoftware && setting.compare("Tmpl.ScanService", Qt::CaseInsensitive) == 0) { if (CheckServices(value)) return true; } - else if (scanSvc && setting.compare("Tmpl.ScanProduct", Qt::CaseInsensitive) == 0) + else if (scanSoftware && setting.compare("Tmpl.ScanProduct", Qt::CaseInsensitive) == 0) { if (CheckProducts(value)) return true; } - else if (scanSvc && setting.compare("Tmpl.ScanKey", Qt::CaseInsensitive) == 0) + else if (scanSoftware && setting.compare("Tmpl.ScanKey", Qt::CaseInsensitive) == 0) { if (CheckRegistryKey(value)) return true; } - else if (scanSvc && setting.compare("Tmpl.ScanFile", Qt::CaseInsensitive) == 0) + else if (scanSoftware && setting.compare("Tmpl.ScanFile", Qt::CaseInsensitive) == 0) { if (CheckFile(ExpandPath(value))) return true;