From a6a539a26953822fc110e367dfcf22441aeceeba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=E7=BC=96=E7=A8=8B=E7=9A=84=E5=8F=B6=E4=B8=80?= =?UTF-8?q?=E7=AC=91?= <92030377+love-code-yeyixiao@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:52:09 +0800 Subject: [PATCH 1/4] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cd4f5fa61..288dd7a6a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add option "AlertBeforeStart".When it is set,a prompt pops up before launching a new program into the sandbox using "Start.exe" and checks if the program that started "Start.exe" is a Sandboxie component itself,if it is not, a warning pops up. - ## [1.14.0 / 5.69.0] - 2024-05-17 ### Added From f0d3a3a9639ec77b3dfce0f2894940882e4aa134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=E7=BC=96=E7=A8=8B=E7=9A=84=E5=8F=B6=E4=B8=80?= =?UTF-8?q?=E7=AC=91?= <92030377+love-code-yeyixiao@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:55:10 +0800 Subject: [PATCH 2/4] Update sandman_zh_CN.ts --- SandboxiePlus/SandMan/sandman_zh_CN.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SandboxiePlus/SandMan/sandman_zh_CN.ts b/SandboxiePlus/SandMan/sandman_zh_CN.ts index 38e56cf97b..d7d5dd69af 100644 --- a/SandboxiePlus/SandMan/sandman_zh_CN.ts +++ b/SandboxiePlus/SandMan/sandman_zh_CN.ts @@ -4300,7 +4300,7 @@ This file is part of Sandboxie and all changed done to it will be reverted next <br />you need to be on the Great Patreon level or higher to unlock this feature. - <br />你需要在Patreon赞助上成为Great或更高级别以便解锁这个功能。 + <br />你需要在Patreon赞助上成为Great或更高级别的赞助者以便解锁这个功能。 From 77feffb4eeca53bd2bb95bac2b278683755e79a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=E7=BC=96=E7=A8=8B=E7=9A=84=E5=8F=B6=E4=B8=80?= =?UTF-8?q?=E7=AC=91?= <92030377+love-code-yeyixiao@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:53:32 +0800 Subject: [PATCH 3/4] Update gui.c --- Sandboxie/core/dll/gui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Sandboxie/core/dll/gui.c b/Sandboxie/core/dll/gui.c index 7311f00cd1..f26631d0c5 100644 --- a/Sandboxie/core/dll/gui.c +++ b/Sandboxie/core/dll/gui.c @@ -1071,6 +1071,7 @@ _FX BOOLEAN Gui_ConnectToWindowStationAndDesktop(HMODULE User32) // privilege, so access to the window station object // would have to validate each object directory in the // path, and this would fail with our process token. + // // // to work around this, we issue a special request to // SbieDrv through NtSetInformationThread which causes From 90f2c6e7781988051dbf0b207384e5c2380fea28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=E7=BC=96=E7=A8=8B=E7=9A=84=E5=8F=B6=E4=B8=80?= =?UTF-8?q?=E7=AC=91?= <92030377+love-code-yeyixiao@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:56:19 +0800 Subject: [PATCH 4/4] Update main.yml --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e5df136fcc..c5d83262a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: - branches: [ master ] + branches: [master, experimental] paths-ignore: # Case-sensitive paths to ignore on push events - '.editorconfig' @@ -35,7 +35,7 @@ on: - '**/AUTHORS' - '**/COPYING' pull_request: - branches: [ master ] + branches: [master, experimental] paths-ignore: # Case-sensitive paths to ignore on pull events - '.editorconfig' @@ -150,7 +150,7 @@ jobs: run: Installer\get_assets.cmd - name: Upload installer assets - if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' + if: github.repository_owner == 'sandboxie-plus' uses: actions/upload-artifact@v4 with: name: Assets @@ -159,7 +159,7 @@ jobs: retention-days: 60 - name: Upload Sandboxie x64 - if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' + if: github.repository_owner == 'sandboxie-plus' uses: actions/upload-artifact@v4 with: name: Sandboxie_x64 @@ -253,7 +253,7 @@ jobs: run: Installer\copy_build.cmd ARM64 - name: Upload Sandboxie ARM64 - if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' + if: github.repository_owner == 'sandboxie-plus' uses: actions/upload-artifact@v4 with: name: Sandboxie_ARM64 @@ -322,7 +322,7 @@ jobs: run: Installer\copy_build.cmd x86 - name: Upload Sandboxie x86 - if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' + if: github.repository_owner == 'sandboxie-plus' uses: actions/upload-artifact@v4 with: name: Sandboxie_x86