mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie

This commit is contained in:
DavidXanatos 2024-11-21 18:01:03 +01:00
parent eff0abc6d9 b8fd2d12e8
commit 99e85cce73
8 changed files with 231 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
.github/workflows/main.yml vendored
View File

@ -1,4 +1,4 @@
name: CI (Qt 5)
name: CI
on:
workflow_dispatch:
@ -190,6 +190,111 @@ jobs:
Installer/SbiePlus_x64/*
retention-days: 60
Build_ARM64:
runs-on: windows-2019
timeout-minutes: 45
steps:
- name: Checkout code
uses: actions/checkout@v4.1.7
- name: Load Variables from buildVariables.cmd
shell: cmd
run: |
@echo on
call "${{ github.workspace }}\Installer\buildVariables.cmd" build_qt6
echo qt6_version=%qt6_version% >> %GITHUB_ENV%
- name: Setup msbuild
uses: microsoft/setup-msbuild@v2
#
# Compile Sandboxie Core
#
- name: Build Sandboxie x86 (DLLs & svc)
run: msbuild /t:build Sandboxie\SandboxDll.sln /p:Configuration="SbieRelease" /p:Platform=Win32 -maxcpucount:8
- name: Build Sandboxie ARM64 (all)
run: msbuild /t:build Sandboxie\Sandbox.sln /p:Configuration="SbieRelease" /p:Platform=ARM64 -maxcpucount:8
- name: Build Sandboxie ARM64EC (DLL)
run: msbuild /t:build Sandboxie\SandboxDll.sln /p:Configuration="SbieRelease" /p:Platform=ARM64EC -maxcpucount:8
#
# Prepare Qt Framework for ARM64 (we also need Qt x64 for some utilities like qmake)
#
- name: Install Qt6 x64
uses: jurplel/install-qt-action@v4.1.1
with:
# version: '6.2.4'
version: '${{ env.qt6_version }}'
# dir: ..
# arch: ${{ matrix.qt-target }}
arch: 'win64_msvc2019_64'
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
tools: 'tools_opensslv3_x64'
cache: true
- name: Install Qt6 ARM64
uses: jurplel/install-qt-action@v4.1.1
with:
# version: '6.2.4'
version: '${{ env.qt6_version }}'
# dir: ..
# arch: ${{ matrix.qt-target }}
arch: 'win64_msvc2019_arm64'
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
tools: 'tools_opensslv3_x64'
cache: true
- name: Installing Jom
# if: steps.cache-qt.outputs.cache-hit != 'true'
run: SandboxiePlus\install_jom.cmd
#
# Compile Sandboxie Plus
#
- name: Build Sandboxie-Plus ARM64
run: SandboxiePlus\qmake_plus.cmd ARM64 build_qt6
- name: Build SbieShell ARM64
run: msbuild /t:restore,build -p:RestorePackagesConfig=true SandboxiePlus\SbieShell\SbieShell.sln /p:Configuration="Release" /p:Platform=ARM64
#
# Compile Sandboxie Tools
#
- name: Build Sandboxie-Tools ARM64
run: msbuild /t:build SandboxieTools\SandboxieTools.sln /p:Configuration="Release" /p:Platform=ARM64 -maxcpucount:8
#
# Merge everything together
#
- name: Add missing languages for Qt6 (issue 1528)
run: Installer\fix_qt5_languages.cmd x64 build_qt6
- name: Get openssl binaries
run: Installer\get_openssl.cmd
- name: Get 7z binaries
run: Installer\get_7zip.cmd
- name: Merging Build
run: Installer\copy_build.cmd ARM64 build_qt6
- name: Upload Sandboxie ARM64
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
uses: actions/upload-artifact@v4.4.3
with:
name: Sandboxie_ARM64
path: |
Installer/SbiePlus_a64/*
retention-days: 60
Build_x86:
runs-on: windows-2019
timeout-minutes: 45
@ -257,3 +362,113 @@ jobs:
path: |
Installer/SbiePlus_x86/*
retention-days: 60
Build_x64_Qt6:
runs-on: windows-2019
timeout-minutes: 45
steps:
- name: Checkout code
uses: actions/checkout@v4.1.7
- name: Load Variables from buildVariables.cmd
shell: cmd
run: |
@echo on
call "${{ github.workspace }}\Installer\buildVariables.cmd" build_qt6
echo qt6_version=%qt6_version% >> %GITHUB_ENV%
echo qt_version=%qt6_version% >> %GITHUB_ENV%
- name: Setup msbuild
uses: microsoft/setup-msbuild@v2
#
# Compile Sandboxie Core
#
- name: Build Sandboxie x86 (DLLs & svc)
run: msbuild /t:build Sandboxie\SandboxDll.sln /p:Configuration="SbieRelease" /p:Platform=Win32 -maxcpucount:8
- name: Build Sandboxie x64 (all)
run: msbuild /t:build Sandboxie\Sandbox.sln /p:Configuration="SbieRelease" /p:Platform=x64 -maxcpucount:8
#
# Prepare Qt Framework
#
- name: Install Qt6 x64
uses: jurplel/install-qt-action@v4.1.1
with:
# version: '6.2.4'
version: '${{ env.qt6_version }}'
# dir: ..
# arch: ${{ matrix.qt-target }}
arch: 'win64_msvc2019_64'
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
tools: 'tools_opensslv3_x64'
cache: true
# - name: Install Qt5 x64
# run: SandboxiePlus\install_qt.cmd x64
- name: Installing Jom
# if: steps.cache-qt.outputs.cache-hit != 'true'
run: SandboxiePlus\install_jom.cmd
#
# Compile Sandboxie Plus
#
- name: Build Sandboxie-Plus x64
run: SandboxiePlus\qmake_plus.cmd x64 build_qt6
- name: Build SbieShell x64
run: msbuild /t:restore,build -p:RestorePackagesConfig=true SandboxiePlus\SbieShell\SbieShell.sln /p:Configuration="Release" /p:Platform=x64
#
# Compile Sandboxie Tools
#
- name: Build Sandboxie-Tools x64
run: msbuild /t:build SandboxieTools\SandboxieTools.sln /p:Configuration="Release" /p:Platform=x64 -maxcpucount:8
#
# Merge everything together
#
# - name: Add Windows 7 compatible Qt6 DLLs
# run: Installer\fix_qt6_win7.cmd
- name: Add missing languages for Qt6 (issue 1528)
run: Installer\fix_qt5_languages.cmd x64 build_qt6
- name: Get openssl binaries
run: Installer\get_openssl.cmd
- name: Get 7z binaries
run: Installer\get_7zip.cmd
- name: Merging Build
run: Installer\copy_build.cmd x64 build_qt6
- name: Collect installer assets
run: Installer\get_assets.cmd
# - name: Upload installer assets
# #if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
# uses: actions/upload-artifact@v4.4.3
# with:
# name: Assets
# path: |
# Installer/Assets/*
# retention-days: 60
- name: Upload Sandboxie x64 Qt6
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
uses: actions/upload-artifact@v4.4.3
with:
name: Sandboxie_x64_Qt6
path: |
Installer/SbiePlus_x64/*
retention-days: 60

298
.github/workflows/main_qt6.yml vendored
View File

@ -1,298 +0,0 @@
name: CI (Qt 6)
on:
workflow_dispatch:
push:
branches: [master, experimental]
paths-ignore:
# Case-sensitive paths to ignore on push events
- '.editorconfig'
- '.gitattributes'
- '.gitignore'
- 'MergeDbg.cmd'
- 'TestCI.cmd'
- '.github/codeql/codeql-config.yml'
- '.github/ISSUE_TEMPLATE/**'
- '.github/workflows/codeql.yml'
- '.github/workflows/codespell.yml'
- '.github/workflows/hash.yml'
- '.github/workflows/lupdate.yml'
- '.github/workflows/stale.yml'
- '.github/workflows/test.yml'
- '.github/workflows/winget.yml'
- '.github/FUNDING.yml'
- '.github/dependabot.yml'
- 'Sandboxie/msgs/report/*.txt'
- '**/*.md'
- '**/*.html'
- '**/*.png'
- '**/*.bmp'
- '**/LICENSE*'
- '**/license*'
- '**/README*'
- '**/ReadMe*'
- '**/INSTALL*'
- '**/AUTHORS'
- '**/COPYING'
pull_request:
branches: [master, experimental]
paths-ignore:
# Case-sensitive paths to ignore on pull events
- '.editorconfig'
- '.gitattributes'
- '.gitignore'
- 'MergeDbg.cmd'
- 'TestCI.cmd'
- '.github/codeql/codeql-config.yml'
- '.github/ISSUE_TEMPLATE/**'
- '.github/workflows/codeql.yml'
- '.github/workflows/codespell.yml'
- '.github/workflows/hash.yml'
- '.github/workflows/lupdate.yml'
- '.github/workflows/stale.yml'
- '.github/workflows/test.yml'
- '.github/workflows/winget.yml'
- '.github/FUNDING.yml'
- '.github/dependabot.yml'
- 'Sandboxie/msgs/report/*.txt'
- '**/*.md'
- '**/*.html'
- '**/*.png'
- '**/*.bmp'
- '**/LICENSE*'
- '**/license*'
- '**/README*'
- '**/ReadMe*'
- '**/INSTALL*'
- '**/AUTHORS'
- '**/COPYING'
env:
forbuildVariables: use Installer\buildVariables.cmd file
#qt_version: 5.15.16
#qt6_version: 6.6.3
#openssl_version: 3.4.0
#ghSsl_user: xanasoft
#ghSsl_repo: openssl-builds
#ghQt6Win7_user: DavidXanatos
#ghQt6Win7_repo: qtbase
#ghQtBuilds_user: xanasoft
#ghQtBuilds_repo: qt-builds
#ghQtBuilds_hash_x86: 502e9a36a52918af4e116cd74c16c6c260d029087aaeee3775ab0e5d3f6a2705
#ghQtBuilds_hash_x64: 673c288feeabd11ec66f9f454d49cde3945cbd3e3f71283b7a6c4df0893b19f2
jobs:
Build_x64:
runs-on: windows-2019
timeout-minutes: 45
steps:
- name: Checkout code
uses: actions/checkout@v4.1.7
- name: Load Variables from buildVariables.cmd
shell: cmd
run: |
@echo on
call "${{ github.workspace }}\Installer\buildVariables.cmd" build_qt6
echo qt6_version=%qt6_version% >> %GITHUB_ENV%
echo qt_version=%qt6_version% >> %GITHUB_ENV%
- name: Setup msbuild
uses: microsoft/setup-msbuild@v2
#
# Compile Sandboxie Core
#
- name: Build Sandboxie x86 (DLLs & svc)
run: msbuild /t:build Sandboxie\SandboxDll.sln /p:Configuration="SbieRelease" /p:Platform=Win32 -maxcpucount:8
- name: Build Sandboxie x64 (all)
run: msbuild /t:build Sandboxie\Sandbox.sln /p:Configuration="SbieRelease" /p:Platform=x64 -maxcpucount:8
#
# Prepare Qt Framework
#
- name: Install Qt6 x64
uses: jurplel/install-qt-action@v4.1.1
with:
# version: '6.2.4'
version: '${{ env.qt6_version }}'
# dir: ..
# arch: ${{ matrix.qt-target }}
arch: 'win64_msvc2019_64'
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
tools: 'tools_opensslv3_x64'
cache: true
# - name: Install Qt5 x64
# run: SandboxiePlus\install_qt.cmd x64
- name: Installing Jom
# if: steps.cache-qt.outputs.cache-hit != 'true'
run: SandboxiePlus\install_jom.cmd
#
# Compile Sandboxie Plus
#
- name: Build Sandboxie-Plus x64
run: SandboxiePlus\qmake_plus.cmd x64 build_qt6
- name: Build SbieShell x64
run: msbuild /t:restore,build -p:RestorePackagesConfig=true SandboxiePlus\SbieShell\SbieShell.sln /p:Configuration="Release" /p:Platform=x64
#
# Compile Sandboxie Tools
#
- name: Build Sandboxie-Tools x64
run: msbuild /t:build SandboxieTools\SandboxieTools.sln /p:Configuration="Release" /p:Platform=x64 -maxcpucount:8
#
# Merge everything together
#
# - name: Add Windows 7 compatible Qt6 DLLs
# run: Installer\fix_qt6_win7.cmd
- name: Add missing languages for Qt6 (issue 1528)
run: Installer\fix_qt5_languages.cmd x64 build_qt6
- name: Get openssl binaries
run: Installer\get_openssl.cmd
- name: Get 7z binaries
run: Installer\get_7zip.cmd
- name: Merging Build
run: Installer\copy_build.cmd x64 build_qt6
- name: Collect installer assets
run: Installer\get_assets.cmd
- name: Upload installer assets
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
uses: actions/upload-artifact@v4.4.3
with:
name: Assets
path: |
Installer/Assets/*
retention-days: 60
- name: Upload Sandboxie x64 Qt6
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
uses: actions/upload-artifact@v4.4.3
with:
name: Sandboxie_x64_Qt6
path: |
Installer/SbiePlus_x64/*
retention-days: 60
Build_ARM64:
runs-on: windows-2019
timeout-minutes: 45
steps:
- name: Checkout code
uses: actions/checkout@v4.1.7
- name: Load Variables from buildVariables.cmd
shell: cmd
run: |
@echo on
call "${{ github.workspace }}\Installer\buildVariables.cmd" build_qt6
echo qt6_version=%qt6_version% >> %GITHUB_ENV%
- name: Setup msbuild
uses: microsoft/setup-msbuild@v2
#
# Compile Sandboxie Core
#
- name: Build Sandboxie x86 (DLLs & svc)
run: msbuild /t:build Sandboxie\SandboxDll.sln /p:Configuration="SbieRelease" /p:Platform=Win32 -maxcpucount:8
- name: Build Sandboxie ARM64 (all)
run: msbuild /t:build Sandboxie\Sandbox.sln /p:Configuration="SbieRelease" /p:Platform=ARM64 -maxcpucount:8
- name: Build Sandboxie ARM64EC (DLL)
run: msbuild /t:build Sandboxie\SandboxDll.sln /p:Configuration="SbieRelease" /p:Platform=ARM64EC -maxcpucount:8
#
# Prepare Qt Framework for ARM64 (we also need Qt x64 for some utilities like qmake)
#
- name: Install Qt6 x64
uses: jurplel/install-qt-action@v4.1.1
with:
# version: '6.2.4'
version: '${{ env.qt6_version }}'
# dir: ..
# arch: ${{ matrix.qt-target }}
arch: 'win64_msvc2019_64'
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
tools: 'tools_opensslv3_x64'
cache: true
- name: Install Qt6 ARM64
uses: jurplel/install-qt-action@v4.1.1
with:
# version: '6.2.4'
version: '${{ env.qt6_version }}'
# dir: ..
# arch: ${{ matrix.qt-target }}
arch: 'win64_msvc2019_arm64'
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
tools: 'tools_opensslv3_x64'
cache: true
- name: Installing Jom
# if: steps.cache-qt.outputs.cache-hit != 'true'
run: SandboxiePlus\install_jom.cmd
#
# Compile Sandboxie Plus
#
- name: Build Sandboxie-Plus ARM64
run: SandboxiePlus\qmake_plus.cmd ARM64 build_qt6
- name: Build SbieShell ARM64
run: msbuild /t:restore,build -p:RestorePackagesConfig=true SandboxiePlus\SbieShell\SbieShell.sln /p:Configuration="Release" /p:Platform=ARM64
#
# Compile Sandboxie Tools
#
- name: Build Sandboxie-Tools ARM64
run: msbuild /t:build SandboxieTools\SandboxieTools.sln /p:Configuration="Release" /p:Platform=ARM64 -maxcpucount:8
#
# Merge everything together
#
- name: Add missing languages for Qt6 (issue 1528)
run: Installer\fix_qt5_languages.cmd x64 build_qt6
- name: Get openssl binaries
run: Installer\get_openssl.cmd
- name: Get 7z binaries
run: Installer\get_7zip.cmd
- name: Merging Build
run: Installer\copy_build.cmd ARM64 build_qt6
- name: Upload Sandboxie ARM64
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
uses: actions/upload-artifact@v4.4.3
with:
name: Sandboxie_ARM64
path: |
Installer/SbiePlus_a64/*
retention-days: 60

4
Sandboxie/msgs/Text-German-1031.txt
View File

@ -226,6 +226,10 @@ SBIE1319 Druckerwarteschlangendruck zu Datei, %2 %3 verhindert
SBIE1320 Um zu erlauben, dass die Druckerwarteschlange für diesen Prozess außerhalb der Sandbox schreiben darf, doppelklicken Sie bitte auf diese Nachricht
.
1321;pop;inf;01
SBIE1321 Programm '%2' wurde in die Sandbox %3 gezwungen
.
1399;pop;inf;01
%0
.

3
SandboxiePlus/SandMan/SandMan.pri
View File

@ -114,7 +114,8 @@ FORMS += ./Forms/SelectBoxWindow.ui \
./Forms/ExtractDialog.ui \
./Forms/TestProxyDialog.ui
TRANSLATIONS += sandman_de.ts \
TRANSLATIONS += sandman_ar.ts \
sandman_de.ts \
sandman_en.ts \
sandman_es.ts \
sandman_fr.ts \

1
SandboxiePlus/SandMan/SandMan.vcxproj
View File

@ -519,6 +519,7 @@
</ItemGroup>
<ItemGroup>
<None Include="Resources\finder.cur" />
<None Include="sandman_ar.ts" />
<None Include="sandman_cs.ts" />
<None Include="sandman_de.ts" />
<None Include="sandman_en.ts" />

3
SandboxiePlus/SandMan/SandMan.vcxproj.filters
View File

@ -447,6 +447,9 @@
</QtUic>
</ItemGroup>
<ItemGroup>
<None Include="sandman_ar.ts">
<Filter>Translation Files</Filter>
</None>
<None Include="sandman_de.ts">
<Filter>Translation Files</Filter>
</None>

8
SandboxiePlus/SandMan/sandman_de.ts
View File

@ -7645,7 +7645,7 @@ an Stelle von &quot;*&quot;.</translation>
<message>
<location filename="Forms/OptionsWindow.ui" line="5028"/>
<source>Hide Disk Serial Number</source>
<translation>Verberge die Seriennummer der Disk</translation>
<translation>Verberge die Seriennummer der Festplatte</translation>
</message>
<message>
<location filename="Forms/OptionsWindow.ui" line="5035"/>
@ -7685,7 +7685,7 @@ an Stelle von &quot;*&quot;.</translation>
<message>
<location filename="Forms/OptionsWindow.ui" line="4998"/>
<source>Hide the host software&apos;s uninstall key (see tooltip)</source>
<translation>Verberge den Deinstallationsschlüssel der Software auf dem Host (siehe Tooltip)</translation>
<translation>Verberge den Deinstallationsschlüssel von auf dem Host installierter Software (siehe Tooltip)</translation>
</message>
<message>
<location filename="Forms/OptionsWindow.ui" line="5068"/>
@ -8016,7 +8016,7 @@ Dies wird gemacht, um bösartige Prozesse innerhalb der Sandbox daran zu hindern
<message>
<location filename="Forms/OptionsWindow.ui" line="1473"/>
<source>Open Window Station (improves compatibility by reducing desktop isolation)</source>
<translation>Öffne Window Station (verbessert die Kompatibilität durch Verringerung der Desktop-Isolierung)</translation>
<translation>Öffne Window Station (verbessert die Kompatibilität durch Verringerung der Desktop-Isolation)</translation>
</message>
<message>
<location filename="Forms/OptionsWindow.ui" line="1820"/>
@ -9920,7 +9920,7 @@ Anders als der Vorschaukanal, enthält es keine ungetesteten, möglicherweise fe
<message>
<location filename="Forms/SettingsWindow.ui" line="2519"/>
<source>Issue message 1321 when a processes has been forced in to a sandbox</source>
<translation type="unfinished"></translation>
<translation>Gebe Nachricht 1321 aus, wenn ein Prozess in eine Sandbox gezwungen wurde</translation>
</message>
<message>
<location filename="Forms/SettingsWindow.ui" line="2529"/>

2
TRANSLATING.md
View File

@ -21,7 +21,7 @@ To achieve this goal, Sandboxie has established a translation program that enabl
|Farsi|Yes|No|No|
|Finnish|Yes|No|No|
|French|Yes - Sep 11, 2023|Yes - Jun 20, 2024|No|
|German|Yes - Nov 17, 2024|Yes - Nov 17, 2024|Yes - Jun 25, 2024|
|German|Yes - Nov 21, 2024|Yes - Nov 21, 2024|Yes - Jun 25, 2024|
|Greek|Yes|No|No|
|Hebrew|Yes|No|No|
|Hungarian|Yes|Yes - Nov 5, 2024|Yes - Nov 5, 2024|