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

#3810

This commit is contained in:
DavidXanatos 2024-04-13 18:11:50 +02:00
parent cd5104e678
commit 3731ef3142
8 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -13,7 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- fixed When I change the BlockDNS and BlockPorts options, the Apply button is not activated [#3807](https://github.com/sandboxie-plus/Sandboxie/issues/3807)
- fixed troubleshooting wizard broke with new qt [#3810](https://github.com/sandboxie-plus/Sandboxie/discussions/3810)
## [1.13.5 / 5.68.5] - 2024-04-10

20
SandboxiePlus/MiscHelpers/Archive/ArchiveFS.cpp
View File

@ -182,7 +182,23 @@ QAbstractFileEngine::FileFlags C7zFileEngine::fileFlags(FileFlags type) const
QString C7zFileEngine::fileName(FileName file) const
{
return _filename;
auto filename = Split2(_filename, "/", true);
if (filename.second.isEmpty()) {
filename.second = filename.first;
filename.first.clear();
}
switch (file)
{
case BaseName:
case AbsoluteName:
return filename.second;
case PathName:
case AbsolutePathName:
return filename.first;
//default:
//case DefaultName:
}
return _filename;
}
QDateTime C7zFileEngine::fileTime(FileTime time) const
@ -306,4 +322,4 @@ QAbstractFileEngine* C7zFileEngineHandler::create(const QString& filename) const
return new C7zFileEngine(filename, m_pArchive, &m_Mutex);
return NULL;
}
}

4
SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj
View File

@ -76,7 +76,7 @@
<Import Project="$(QtMsBuild)\qt_defaults.props" />
</ImportGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>core;core-private;network;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="QtSettings">
@ -84,7 +84,7 @@
<QtModules>core;core-private;network;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>core;core-private;network;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="QtSettings">

4
SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj
View File

@ -76,7 +76,7 @@
<Import Project="$(QtMsBuild)\qt_defaults.props" />
</ImportGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>concurrent;core</QtModules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="QtSettings">
@ -84,7 +84,7 @@
<QtModules>concurrent;core</QtModules>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>concurrent;core</QtModules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="QtSettings">

4
SandboxiePlus/QtSingleApp/qtsingleapp/qtsingleapp/qtsingleapp.vcxproj
View File

@ -67,7 +67,7 @@
<Import Project="$(QtMsBuild)\qt_defaults.props" />
</ImportGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>core;network;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -75,7 +75,7 @@
<QtModules>core;network;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>core;network;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

5
SandboxiePlus/SandMan/Engine/ScriptManager.cpp
View File

@ -92,7 +92,8 @@ void CScriptManager::LoadIssues(const QString& IssueDir)
//QDir Dir(IssueDir);
//foreach(const QFileInfo & Info, Dir.entryInfoList(QStringList() << "*.js", QDir::Files)) {
foreach(const QString & FileName, ListDir(IssueDir, QStringList() << "*.js")) {
auto List = ListDir(IssueDir, QStringList() << "*.js");
foreach(const QString & FileName, List) {
QFileInfo Info(IssueDir + FileName);
QString Script = ReadFileAsString(Info.filePath());
@ -249,4 +250,4 @@ void CScriptManager::OnDownload(const QString& Path, const QVariantMap& Params)
LoadIssues(IssueFS.Prefix() + "/");
emit IssuesUpdated();
}
}

4
SandboxiePlus/SandMan/SandMan.vcxproj
View File

@ -114,7 +114,7 @@
<Import Project="$(QtMsBuild)\qt_defaults.props" />
</ImportGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>core;network;gui;widgets;qml;winextras;concurrent;widgets-private;qml-private</QtModules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="QtSettings">
@ -126,7 +126,7 @@
<QtModules>concurrent;core;gui;network;widgets;winextras</QtModules>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>core;network;gui;widgets;qml;winextras;concurrent;widgets-private;qml-private</QtModules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="QtSettings">

4
SandboxiePlus/UGlobalHotkey/uglobalhotkey.vcxproj
View File

@ -92,7 +92,7 @@
<QtModules>core;gui;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="QtSettings">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>core;gui;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -100,7 +100,7 @@
<QtModules>core;gui;widgets</QtModules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="QtSettings">
<QtInstall>msvc2019_64</QtInstall>
<QtInstall>Qt5.15.13_msvc2019_64</QtInstall>
<QtModules>core;gui;widgets</QtModules>
</PropertyGroup>
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">