diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..41421952 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,36 @@ +name: CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + strategy: + matrix: + platform: [Win32, x64] + runs-on: windows-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup msbuild + uses: microsoft/setup-msbuild@v1 + + - name: Build Driver + run: msbuild /t:build Sandboxie\SandboxDrv.sln /p:Configuration="SbieRelease" /p:Platform=${{ matrix.platform }} + + - name: Upload Sandboxie + uses: actions/upload-artifact@v2 + with: + name: Sandboxie (${{ matrix.platform }}) + path: | + Sandboxie/Bin/${{ matrix.platform }}/SbieRelease + !**/*.pdb + !**/*.exp + !**/*.ilk + !**/*.iobj + !**/*.lib + !**/*.cer diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f1c6b538 --- /dev/null +++ b/.gitignore @@ -0,0 +1,368 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +SbieDebug +SbieRelease +MsgSbieDebug +MsgSbieRelease +Sandboxie/msgs/Text-English-1033.txt + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd diff --git a/Sandboxie/ReadMe.txt b/Sandboxie/ReadMe.txt index a2232913..7a5af15c 100644 --- a/Sandboxie/ReadMe.txt +++ b/Sandboxie/ReadMe.txt @@ -3,10 +3,9 @@ SANDBOXIE BUILD INSTRUCTIONS Please note: there is another ReadMe.txt in the \install\ folder that explains how to create the Sandboxie installers. -1) Sandboxie builds under MS Visual Studio 2015. -2) Install the MS Windows Device Driver Kit (DDK) 7.1.0. - https://www.microsoft.com/en-us/download/details.aspx?id=11800 - In the DDK setup, all you need to check is "Build Environments" +1) Sandboxie builds under MS Visual Studio 2019. +2) Install the Windows Driver Kit (WDK) for Windows 10, version 2004. + https://go.microsoft.com/fwlink/?linkid=2128854 3) The VS Solution File, Sandbox.sln, is in the source code root. Open this SLN in Visual Studio. Source Projects (in aplhabetical order) diff --git a/Sandboxie/SboxHostDll/SboxHostDll.vcxproj b/Sandboxie/SboxHostDll/SboxHostDll.vcxproj index fba6a4f4..988d7a9e 100644 --- a/Sandboxie/SboxHostDll/SboxHostDll.vcxproj +++ b/Sandboxie/SboxHostDll/SboxHostDll.vcxproj @@ -22,34 +22,34 @@ {3A42A9F3-E0C7-4633-9570-381802D6647D} Win32Proj SboxHostDll - 8.1 + 10.0 DynamicLibrary true Unicode - v140 + v142 DynamicLibrary true Unicode - v140 + v142 DynamicLibrary false true Unicode - v140 + v142 DynamicLibrary false true Unicode - v140 + v142 diff --git a/Sandboxie/apps/com/BITS/SandboxBITS.vcxproj b/Sandboxie/apps/com/BITS/SandboxBITS.vcxproj index 64f57505..0f169ae2 100644 --- a/Sandboxie/apps/com/BITS/SandboxBITS.vcxproj +++ b/Sandboxie/apps/com/BITS/SandboxBITS.vcxproj @@ -21,28 +21,28 @@ Win32Proj {E40CC819-6990-DA28-3E1F-6708BC98E37B} - 8.1 + 10.0 Application true - v140 + v142 Application true - v140 + v142 Application false - v140 + v142 Application false - v140 + v142 diff --git a/Sandboxie/apps/com/Crypto/SandboxCrypto.vcxproj b/Sandboxie/apps/com/Crypto/SandboxCrypto.vcxproj index 326564d1..f9b7b6ab 100644 --- a/Sandboxie/apps/com/Crypto/SandboxCrypto.vcxproj +++ b/Sandboxie/apps/com/Crypto/SandboxCrypto.vcxproj @@ -21,28 +21,28 @@ Win32Proj {41453A79-CA9B-ABCA-981C-5242AFC72DDF} - 8.1 + 10.0 Application true - v140 + v142 Application true - v140 + v142 Application false - v140 + v142 Application false - v140 + v142 diff --git a/Sandboxie/apps/com/DcomLaunch/SboxDcomLaunch.vcxproj b/Sandboxie/apps/com/DcomLaunch/SboxDcomLaunch.vcxproj index 49c73b03..132c6683 100644 --- a/Sandboxie/apps/com/DcomLaunch/SboxDcomLaunch.vcxproj +++ b/Sandboxie/apps/com/DcomLaunch/SboxDcomLaunch.vcxproj @@ -21,28 +21,28 @@ Win32Proj {8055A629-631E-84F5-8F3C-1908F264C81D} - 8.1 + 10.0 Application true - v140 + v142 Application true - v140 + v142 Application false - v140 + v142 Application false - v140 + v142 diff --git a/Sandboxie/apps/com/RpcSs/SandboxRpcSs.vcxproj b/Sandboxie/apps/com/RpcSs/SandboxRpcSs.vcxproj index bf8b2318..35d5b343 100644 --- a/Sandboxie/apps/com/RpcSs/SandboxRpcSs.vcxproj +++ b/Sandboxie/apps/com/RpcSs/SandboxRpcSs.vcxproj @@ -21,28 +21,28 @@ Win32Proj {5410C534-4858-C748-86AD-0567A2451FDE} - 8.1 + 10.0 Application true - v140 + v142 Application true - v140 + v142 Application false - v140 + v142 Application false - v140 + v142 diff --git a/Sandboxie/apps/com/WUAU/SandboxWUAU.vcxproj b/Sandboxie/apps/com/WUAU/SandboxWUAU.vcxproj index c2c4d606..b8a94724 100644 --- a/Sandboxie/apps/com/WUAU/SandboxWUAU.vcxproj +++ b/Sandboxie/apps/com/WUAU/SandboxWUAU.vcxproj @@ -21,34 +21,34 @@ {42DB5510-0268-4655-B483-B9D6E4E48D62} SandboxWUAU - 8.1 + 10.0 Application true MultiByte - v140 + v142 Application true MultiByte - v140 + v142 Application false true MultiByte - v140 + v142 Application false true MultiByte - v140 + v142 diff --git a/Sandboxie/apps/common/Common.vcxproj b/Sandboxie/apps/common/Common.vcxproj index 80feae4f..698d8efc 100644 --- a/Sandboxie/apps/common/Common.vcxproj +++ b/Sandboxie/apps/common/Common.vcxproj @@ -20,28 +20,28 @@ {67579365-ED6A-C1E4-E0A3-4A7C9F14072D} - 8.1 + 10.0 StaticLibrary true - v140 + v142 StaticLibrary true - v140 + v142 StaticLibrary false - v140 + v142 StaticLibrary false - v140 + v142 diff --git a/Sandboxie/apps/control/Control.vcxproj b/Sandboxie/apps/control/Control.vcxproj index 60008cd0..01f8a27d 100644 --- a/Sandboxie/apps/control/Control.vcxproj +++ b/Sandboxie/apps/control/Control.vcxproj @@ -22,7 +22,7 @@ {D16E291A-1F8A-4B19-AE07-0AF8CB7CCBD0} Control SbieControl - 8.1 + 10.0 @@ -32,7 +32,7 @@ Static false false - v140 + v142 Application @@ -41,7 +41,7 @@ Static false false - v140 + v142 Application @@ -50,7 +50,7 @@ Unicode Static false - v140 + v142 Application @@ -59,7 +59,7 @@ Unicode Static false - v140 + v142 diff --git a/Sandboxie/apps/ini/SbieIni.vcxproj b/Sandboxie/apps/ini/SbieIni.vcxproj index 0db89f95..724fac54 100644 --- a/Sandboxie/apps/ini/SbieIni.vcxproj +++ b/Sandboxie/apps/ini/SbieIni.vcxproj @@ -34,34 +34,34 @@ {B8D7002B-0468-44E7-93A7-94327A5D7C7A} Win32Proj SbieIni - 8.1 + 10.0 Application true Unicode - v140 + v142 Application true Unicode - v140 + v142 Application false true Unicode - v140 + v142 Application false true Unicode - v140 + v142 diff --git a/Sandboxie/apps/ldr/SbieLdr.vcxproj b/Sandboxie/apps/ldr/SbieLdr.vcxproj index fed2a7d4..4916c3d9 100644 --- a/Sandboxie/apps/ldr/SbieLdr.vcxproj +++ b/Sandboxie/apps/ldr/SbieLdr.vcxproj @@ -31,34 +31,34 @@ {352AA425-D224-4F23-AF1D-D54AFADDDB22} Win32Proj SbieLdr - 8.1 + 10.0 Application true Unicode - v140 + v142 Application true Unicode - v140 + v142 Application false true Unicode - v140 + v142 Application false true Unicode - v140 + v142 diff --git a/Sandboxie/apps/start/Start.vcxproj b/Sandboxie/apps/start/Start.vcxproj index d1bc4f2b..f8673155 100644 --- a/Sandboxie/apps/start/Start.vcxproj +++ b/Sandboxie/apps/start/Start.vcxproj @@ -21,32 +21,32 @@ Win32Proj {8B9E1B9D-FB3C-3009-9196-4315871BCD73} - 8.1 + 10.0 Application true Static - v140 + v142 Application true Static - v140 + v142 Application false Static - v140 + v142 Application false Static - v140 + v142 diff --git a/Sandboxie/core/dll/SboxDll.vcxproj b/Sandboxie/core/dll/SboxDll.vcxproj index 159a4a8b..0771ed82 100644 --- a/Sandboxie/core/dll/SboxDll.vcxproj +++ b/Sandboxie/core/dll/SboxDll.vcxproj @@ -22,7 +22,7 @@ Win32Proj SboxDll {8E0EAA5B-6F5B-E0E2-338A-453EF2B548E4} - 8.1 + 10.0 @@ -30,28 +30,28 @@ true false Unicode - v140 + v142 DynamicLibrary true false Unicode - v140 + v142 DynamicLibrary false false Unicode - v140 + v142 DynamicLibrary false false Unicode - v140 + v142 @@ -71,22 +71,22 @@ .dll SbieDll - C:\WinDDK\7600.16385.1\lib\wnet\i386 + $(WindowsSDK_LibraryPath_x86) .dll SbieDll - C:\WinDDK\7600.16385.1\lib\wnet\amd64 + $(WindowsSDK_LibraryPath_x64) .dll SbieDll - C:\WinDDK\7600.16385.1\lib\wnet\i386 + $(WindowsSDK_LibraryPath_x86) .dll SbieDll - C:\WinDDK\7600.16385.1\lib\wnet\amd64 + $(WindowsSDK_LibraryPath_x64) diff --git a/Sandboxie/core/drv/SboxDrv.vcxproj b/Sandboxie/core/drv/SboxDrv.vcxproj index d3d59044..41199724 100644 --- a/Sandboxie/core/drv/SboxDrv.vcxproj +++ b/Sandboxie/core/drv/SboxDrv.vcxproj @@ -21,7 +21,7 @@ Win32Proj {4019C5EB-8D1E-40E4-B7D1-5601B4B27288} - 10.0.17763.0 + 10.0.19041.0 diff --git a/Sandboxie/core/drv/ipc_spl.c b/Sandboxie/core/drv/ipc_spl.c index 105d5458..b557fa29 100644 --- a/Sandboxie/core/drv/ipc_spl.c +++ b/Sandboxie/core/drv/ipc_spl.c @@ -296,7 +296,7 @@ _FX NTSTATUS Ipc_Api_CopyRpcPortName(enum ENUM_DYNAMIC_PORT_TYPE ePortType, WCHA if (Ipc_Dynamic_Ports[ePortType].pPortLock) { KeEnterCriticalRegion(); - ExAcquireResourceExclusive(Ipc_Dynamic_Ports[ePortType].pPortLock, TRUE); + ExAcquireResourceExclusiveLite(Ipc_Dynamic_Ports[ePortType].pPortLock, TRUE); if (pSrcPortName && (*pSrcPortName)) { diff --git a/Sandboxie/core/low/LowLevel.vcxproj b/Sandboxie/core/low/LowLevel.vcxproj index f41adf14..bc19ecd7 100644 --- a/Sandboxie/core/low/LowLevel.vcxproj +++ b/Sandboxie/core/low/LowLevel.vcxproj @@ -13,7 +13,7 @@ {255002EC-9FC7-422E-B497-BE2CC5012B2D} LowLevel - 8.1 + 10.0 @@ -21,14 +21,14 @@ false true MultiByte - v140 + v142 DynamicLibrary false true MultiByte - v140 + v142 diff --git a/Sandboxie/core/svc/SboxSvc.vcxproj b/Sandboxie/core/svc/SboxSvc.vcxproj index 491c40f7..d5a92415 100644 --- a/Sandboxie/core/svc/SboxSvc.vcxproj +++ b/Sandboxie/core/svc/SboxSvc.vcxproj @@ -21,7 +21,7 @@ Win32Proj {2D3DBCAE-883E-54A6-F8F6-11228D989033} - 8.1 + 10.0 @@ -32,7 +32,7 @@ Application true - v140 + v142 Application @@ -42,7 +42,7 @@ Application true - v140 + v142 Application @@ -52,7 +52,7 @@ Application false - v140 + v142 Application @@ -62,7 +62,7 @@ Application false - v140 + v142 diff --git a/Sandboxie/install/kmdutil/kmdutil.vcxproj b/Sandboxie/install/kmdutil/kmdutil.vcxproj index d5d70d9f..5cc33cc7 100644 --- a/Sandboxie/install/kmdutil/kmdutil.vcxproj +++ b/Sandboxie/install/kmdutil/kmdutil.vcxproj @@ -22,32 +22,32 @@ {0BF4988E-2325-4426-8CDC-BD221E4FB68C} Win32Proj KmdUtil - 8.1 + 10.0 Application true Unicode - v140 + v142 Application true Unicode - v140 + v142 Application false Unicode - v140 + v142 Application false Unicode - v140 + v142 diff --git a/Sandboxie/msgs/Parse.vcxproj b/Sandboxie/msgs/Parse.vcxproj index b66122cc..ea6dee3a 100644 --- a/Sandboxie/msgs/Parse.vcxproj +++ b/Sandboxie/msgs/Parse.vcxproj @@ -9,11 +9,11 @@ Win32Proj {7BA01954-12F1-4CEE-BA97-FAD3250D9776} - 8.1 + 10.0 - v140 + v142 diff --git a/Sandboxie/msgs/SboxMsg.vcxproj b/Sandboxie/msgs/SboxMsg.vcxproj index b756854a..c391de7e 100644 --- a/Sandboxie/msgs/SboxMsg.vcxproj +++ b/Sandboxie/msgs/SboxMsg.vcxproj @@ -13,18 +13,18 @@ Win32Proj {63B0DDD2-5E3B-EF38-F711-9652D2EB73B3} - 8.1 + 10.0 DynamicLibrary false - v140 + v142 DynamicLibrary false - v140 + v142 diff --git a/SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj b/SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj index 8cee9887..d09fc27c 100644 --- a/SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj +++ b/SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj @@ -21,28 +21,28 @@ {7AB8215A-59A4-4B8B-8090-16C87A860429} QtVS_v302 - 10.0.17763.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild DynamicLibrary - v140 + v142 false DynamicLibrary - v140 + v142 false DynamicLibrary - v141 + v142 false DynamicLibrary - v140 + v142 false diff --git a/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj b/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj index 3053e492..0850251e 100644 --- a/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj +++ b/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj @@ -21,28 +21,28 @@ {1433EC85-BDA4-402E-BEC1-48611206A64A} QtVS_v302 - 8.1 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild DynamicLibrary - v140 + v142 false DynamicLibrary - v141 + v142 false DynamicLibrary - v141 + v142 false DynamicLibrary - v140 + v142 false diff --git a/SandboxiePlus/QtSingleApp/qtsingleapp/qtsingleapp/qtsingleapp.vcxproj b/SandboxiePlus/QtSingleApp/qtsingleapp/qtsingleapp/qtsingleapp.vcxproj index 43a4f9e9..7b049a9a 100644 --- a/SandboxiePlus/QtSingleApp/qtsingleapp/qtsingleapp/qtsingleapp.vcxproj +++ b/SandboxiePlus/QtSingleApp/qtsingleapp/qtsingleapp/qtsingleapp.vcxproj @@ -21,25 +21,25 @@ {B12702AD-ABFB-343A-A199-8E24837244A3} QtVS_v302 - 8.1 + 10.0 QtSingleApp DynamicLibrary - v140 + v142 DynamicLibrary - v140 + v142 DynamicLibrary - v140 + v142 DynamicLibrary - v140 + v142 diff --git a/SandboxiePlus/SandMan/SandMan.vcxproj b/SandboxiePlus/SandMan/SandMan.vcxproj index 1eea6baf..8ee5b719 100644 --- a/SandboxiePlus/SandMan/SandMan.vcxproj +++ b/SandboxiePlus/SandMan/SandMan.vcxproj @@ -21,28 +21,28 @@ {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F} QtVS_v302 - 8.1 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild Application - v140 + v142 false Application - v140 + v142 false Application - v140 + v142 false Application - v140 + v142 false diff --git a/SandboxiePlus/SandboxiePlus.sln b/SandboxiePlus/SandboxiePlus.sln index 37cc7741..ecdf0f6d 100644 --- a/SandboxiePlus/SandboxiePlus.sln +++ b/SandboxiePlus/SandboxiePlus.sln @@ -25,43 +25,43 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 + Debug|Win32 = Debug|Win32 Release|x64 = Release|x64 - Release|x86 = Release|x86 + Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Debug|x64.ActiveCfg = Debug|x64 {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Debug|x64.Build.0 = Debug|x64 - {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Debug|x86.ActiveCfg = Debug|Win32 - {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Debug|x86.Build.0 = Debug|Win32 + {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Debug|Win32.Build.0 = Debug|Win32 {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Release|x64.ActiveCfg = Release|x64 {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Release|x64.Build.0 = Release|x64 - {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Release|x86.ActiveCfg = Release|Win32 - {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Release|x86.Build.0 = Release|Win32 + {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Release|Win32.ActiveCfg = Release|Win32 + {B7A8576D-A08A-4A97-84E8-013DAF4D4F1F}.Release|Win32.Build.0 = Release|Win32 {1433EC85-BDA4-402E-BEC1-48611206A64A}.Debug|x64.ActiveCfg = Debug|x64 {1433EC85-BDA4-402E-BEC1-48611206A64A}.Debug|x64.Build.0 = Debug|x64 - {1433EC85-BDA4-402E-BEC1-48611206A64A}.Debug|x86.ActiveCfg = Debug|Win32 - {1433EC85-BDA4-402E-BEC1-48611206A64A}.Debug|x86.Build.0 = Debug|Win32 + {1433EC85-BDA4-402E-BEC1-48611206A64A}.Debug|Win32.ActiveCfg = Debug|Win32 + {1433EC85-BDA4-402E-BEC1-48611206A64A}.Debug|Win32.Build.0 = Debug|Win32 {1433EC85-BDA4-402E-BEC1-48611206A64A}.Release|x64.ActiveCfg = Release|x64 {1433EC85-BDA4-402E-BEC1-48611206A64A}.Release|x64.Build.0 = Release|x64 - {1433EC85-BDA4-402E-BEC1-48611206A64A}.Release|x86.ActiveCfg = Release|Win32 - {1433EC85-BDA4-402E-BEC1-48611206A64A}.Release|x86.Build.0 = Release|Win32 + {1433EC85-BDA4-402E-BEC1-48611206A64A}.Release|Win32.ActiveCfg = Release|Win32 + {1433EC85-BDA4-402E-BEC1-48611206A64A}.Release|Win32.Build.0 = Release|Win32 {7AB8215A-59A4-4B8B-8090-16C87A860429}.Debug|x64.ActiveCfg = Debug|x64 {7AB8215A-59A4-4B8B-8090-16C87A860429}.Debug|x64.Build.0 = Debug|x64 - {7AB8215A-59A4-4B8B-8090-16C87A860429}.Debug|x86.ActiveCfg = Debug|Win32 - {7AB8215A-59A4-4B8B-8090-16C87A860429}.Debug|x86.Build.0 = Debug|Win32 + {7AB8215A-59A4-4B8B-8090-16C87A860429}.Debug|Win32.ActiveCfg = Debug|Win32 + {7AB8215A-59A4-4B8B-8090-16C87A860429}.Debug|Win32.Build.0 = Debug|Win32 {7AB8215A-59A4-4B8B-8090-16C87A860429}.Release|x64.ActiveCfg = Release|x64 {7AB8215A-59A4-4B8B-8090-16C87A860429}.Release|x64.Build.0 = Release|x64 - {7AB8215A-59A4-4B8B-8090-16C87A860429}.Release|x86.ActiveCfg = Release|Win32 - {7AB8215A-59A4-4B8B-8090-16C87A860429}.Release|x86.Build.0 = Release|Win32 + {7AB8215A-59A4-4B8B-8090-16C87A860429}.Release|Win32.ActiveCfg = Release|Win32 + {7AB8215A-59A4-4B8B-8090-16C87A860429}.Release|Win32.Build.0 = Release|Win32 {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|x64 {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.Build.0 = Debug|x64 - {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x86.ActiveCfg = Debug|Win32 - {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x86.Build.0 = Debug|Win32 + {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|Win32.ActiveCfg = Debug|Win32 + {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|Win32.Build.0 = Debug|Win32 {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|x64 {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.Build.0 = Release|x64 - {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.ActiveCfg = Release|Win32 - {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.Build.0 = Release|Win32 + {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.ActiveCfg = Release|Win32 + {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE