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

1.6.1b

This commit is contained in:
DavidXanatos 2022-12-16 13:08:49 +01:00
parent 77140eb14e
commit ce729a4ef6
10 changed files with 178 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
- added game/presentation mode [#2534](https://github.com/sandboxie-plus/Sandboxie/issues/2534)
- added option to pick a custom box icon
### Fixed
- fixed support settign page not showing version updates properly

24
SandboxiePlus/SandMan/Helpers/WinHelper.cpp Normal file
View File

@ -0,0 +1,24 @@
#include "stdafx.h"
#include "WinHelper.h"
#include <windows.h>
#include <Shlwapi.h>
#include <Shlobj.h>
QImage LoadWindowsIcon(const QString& Path, quint32 Index)
{
std::wstring path = QString(Path).replace("/", "\\").toStdWString();
HICON icon = ExtractIconW(NULL, path.c_str(), Index);
QImage Icon = QImage::fromHICON(icon);
DestroyIcon(icon);
return Icon;
}
bool PickWindowsIcon(QWidget* pParent, QString& Path, quint32& Index)
{
wchar_t iconPath[MAX_PATH] = { 0 };
Path.toWCharArray(iconPath);
BOOL Ret = PickIconDlg((HWND)pParent->window()->winId(), iconPath, MAX_PATH, (int*)&Index);
Path = QString::fromWCharArray(iconPath);
return !!Ret;
}

5
SandboxiePlus/SandMan/Helpers/WinHelper.h Normal file
View File

@ -0,0 +1,5 @@
#pragma once
QImage LoadWindowsIcon(const QString& Path, quint32 Index);
bool PickWindowsIcon(QWidget* pParent, QString& Path, quint32& Index);

18
SandboxiePlus/SandMan/Models/SbieModel.cpp
View File

@ -2,6 +2,7 @@
#include "SbieModel.h"
#include "../../MiscHelpers/Common/Common.h"
#include "../SandMan.h"
#include "../Helpers/WinHelper.h"
CSbieModel::CSbieModel(QObject *parent)
: CTreeItemModel(parent)
@ -223,12 +224,17 @@ QList<QVariant> CSbieModel::Sync(const QMap<QString, CSandBoxPtr>& BoxList, cons
int boxColor = pBoxEx->GetColor();
QIcon Icon;
QString Action = pBox->GetText("DblClickAction");
if (!Action.isEmpty() && Action.left(1) != "!")
QString BoxIcon = pBox->GetText("BoxIcon");
if (!BoxIcon.isEmpty())
{
if (pNode->Action != Action || (pNode->busyState || Busy) || pNode->boxDel != boxDel) {
Icon = m_IconProvider.icon(QFileInfo(pBoxEx->GetCommandFile(Action)));
pNode->Action = Action;
if (pNode->BoxIcon != BoxIcon || (pNode->busyState || Busy) || pNode->boxDel != boxDel)
{
StrPair PathIndex = Split2(BoxIcon, ",");
if (!PathIndex.second.isEmpty() && !PathIndex.second.contains("."))
Icon = QIcon(QPixmap::fromImage(LoadWindowsIcon(PathIndex.first, PathIndex.second.toInt())));
else
Icon = QIcon(QPixmap(BoxIcon));
pNode->BoxIcon = BoxIcon;
}
}
else if (pNode->inUse != inUse || pNode->bOpen != bOpen || (pNode->busyState || Busy) || pNode->boxType != boxType || pNode->boxColor != boxColor || pNode->boxDel != boxDel)
@ -243,7 +249,7 @@ QList<QVariant> CSbieModel::Sync(const QMap<QString, CSandBoxPtr>& BoxList, cons
Icon = theGUI->GetColorIcon(boxColor, inUse);
else
Icon = theGUI->GetBoxIcon(boxType, inUse);
pNode->Action.clear();
pNode->BoxIcon.clear();
}
if (!Icon.isNull())

2
SandboxiePlus/SandMan/Models/SbieModel.h
View File

@ -77,7 +77,7 @@ protected:
bool boxDel;
int boxColor;
int OrderNumber;
QString Action;
QString BoxIcon;
CBoxedProcessPtr pProcess;
};

2
SandboxiePlus/SandMan/SandMan.pri
View File

@ -19,6 +19,7 @@ HEADERS += ./stdafx.h \
./Helpers/FindTool.h \
./Helpers/FullScreen.h \
./Helpers/WinAdmin.h \
./Helpers/WinHelper.h \
./Helpers/ReadDirectoryChanges.h \
./Helpers/ReadDirectoryChangesPrivate.h \
./Windows/NewBoxWindow.h \
@ -49,6 +50,7 @@ SOURCES += ./main.cpp \
./Helpers/FindTool.cpp \
./Helpers/FullScreen.cpp \
./Helpers/WinAdmin.cpp \
./Helpers/WinHelper.cpp \
./Helpers/ReadDirectoryChanges.cpp \
./Helpers/ReadDirectoryChangesPrivate.cpp \
./Helpers/WindowFromPointEx.cpp \

2
SandboxiePlus/SandMan/SandMan.vcxproj
View File

@ -212,6 +212,7 @@
<ClCompile Include="Helpers\ReadDirectoryChangesPrivate.cpp" />
<ClCompile Include="Helpers\WinAdmin.cpp" />
<ClCompile Include="Helpers\WindowFromPointEx.cpp" />
<ClCompile Include="Helpers\WinHelper.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Models\MonitorModel.cpp" />
<ClCompile Include="Models\TraceModel.cpp" />
@ -345,6 +346,7 @@
<ClInclude Include="Helpers\ThreadSafeQueue.h" />
<ClInclude Include="Helpers\WinAdmin.h" />
<QtMoc Include="Models\MonitorModel.h" />
<ClInclude Include="Helpers\WinHelper.h" />
<ClInclude Include="resource.h" />
<QtMoc Include="SbiePlusAPI.h" />
<QtMoc Include="SbieProcess.h" />

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

@ -180,6 +180,9 @@
<ClCompile Include="Helpers\FullScreen.cpp">
<Filter>Helpers</Filter>
</ClCompile>
<ClCompile Include="Helpers\WinHelper.cpp">
<Filter>Helpers</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
@ -209,6 +212,9 @@
<ClInclude Include="Helpers\FullScreen.h">
<Filter>Helpers</Filter>
</ClInclude>
<ClInclude Include="Helpers\WinHelper.h">
<Filter>Helpers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<QtMoc Include="SandMan.h">

119
SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
View File

@ -7,6 +7,7 @@
#include "../MiscHelpers/Common/ComboInputDialog.h"
#include "../MiscHelpers/Common/SettingsWidgets.h"
#include "Helpers/WinAdmin.h"
#include "Helpers/WinHelper.h"
class CCertBadge: public QLabel
{
@ -98,12 +99,27 @@ void COptionsWindow::CreateGeneral()
ui.btnBorderColor->setPopupMode(QToolButton::MenuButtonPopup);
QMenu* pColorMenu = new QMenu(this);
QWidgetAction* pActionWidget = new QWidgetAction(this);
QWidget* pIconWidget = new QWidget(this);
QHBoxLayout* pIconLayout = new QHBoxLayout(pIconWidget);
pIconLayout->setContentsMargins(0, 0, 0, 0);
m_pUseIcon = new QCheckBox(tr("Custom icon"));
connect(m_pUseIcon, SIGNAL(clicked(bool)), this, SLOT(OnUseIcon(bool)));
pIconLayout->addWidget(m_pUseIcon);
m_pPickIcon = new QToolButton(this);
m_pPickIcon->setText("...");
connect(m_pPickIcon, SIGNAL(clicked(bool)), this, SLOT(OnPickIcon()));
pIconLayout->addWidget(m_pPickIcon);
pActionWidget->setDefaultWidget(pIconWidget);
pColorMenu->addAction(pActionWidget);
pColorMenu->addSeparator();
m_pColorSlider = new QSlider(Qt::Horizontal, this);
m_pColorSlider->setMinimum(0);
m_pColorSlider->setMaximum(359);
m_pColorSlider->setMinimumHeight(16);
connect(m_pColorSlider, SIGNAL(valueChanged(int)), this, SLOT(OnColorSlider(int)));
QWidgetAction* pActionWidget = new QWidgetAction(this);
pActionWidget = new QWidgetAction(this);
pActionWidget->setDefaultWidget(m_pColorSlider);
pColorMenu->addAction(pActionWidget);
ui.btnBorderColor->setMenu(pColorMenu);
@ -115,7 +131,7 @@ void COptionsWindow::CreateGeneral()
connect(ui.chkShowForRun, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
connect(ui.chkPinToTray, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
connect(ui.cmbDblClick, SIGNAL(currentIndexChanged(int)), this, SLOT(OnGeneralChanged()));
connect(ui.cmbDblClick, SIGNAL(currentIndexChanged(int)), this, SLOT(OnActionChanged()));
connect(ui.chkBlockNetShare, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
connect(ui.chkBlockNetParam, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
@ -174,6 +190,18 @@ void COptionsWindow::LoadGeneral()
if (!BorderWidth) BorderWidth = 6;
ui.spinBorderWidth->setValue(BorderWidth);
m_BoxIcon = m_pBox->GetText("BoxIcon");
m_pUseIcon->setChecked(!m_BoxIcon.isEmpty());
m_pPickIcon->setEnabled(!m_BoxIcon.isEmpty());
StrPair PathIndex = Split2(m_BoxIcon, ",");
if (!PathIndex.second.isEmpty() && !PathIndex.second.contains("."))
ui.btnBorderColor->setIcon(QPixmap::fromImage(LoadWindowsIcon(PathIndex.first, PathIndex.second.toInt())));
else if (!m_BoxIcon.isEmpty())
ui.btnBorderColor->setIcon(QPixmap(m_BoxIcon));
else
ui.btnBorderColor->setIcon(QIcon());
ui.chkShowForRun->setChecked(m_pBox->GetBool("ShowForRunIn", true));
ui.chkPinToTray->setChecked(m_pBox->GetBool("PinToTray", false));
@ -255,6 +283,12 @@ void COptionsWindow::SaveGeneral()
BorderCfg.append(QString::number(ui.spinBorderWidth->value()));
WriteText("BorderColor", BorderCfg.join(","));
if(m_pUseIcon->isChecked())
WriteText("BoxIcon", m_BoxIcon);
else
m_pBox->DelValue("BoxIcon");
WriteAdvancedCheck(ui.chkShowForRun, "ShowForRunIn", "", "n");
WriteAdvancedCheck(ui.chkPinToTray, "PinToTray", "y", "");
@ -370,6 +404,53 @@ void COptionsWindow::OnSecurityMode()
OnAccessChanged(); // for rule specificity
}
void COptionsWindow::OnUseIcon(bool bUse)
{
if (bUse) {
if (m_BoxIcon.isEmpty()) {
QString ActionFile = GetActionFile();
if (!ActionFile.isEmpty()) {
ui.btnBorderColor->setIcon(QPixmap::fromImage(LoadWindowsIcon(ActionFile, 0)));
m_BoxIcon = QString("%1,0").arg(ActionFile);
}
}
if (m_BoxIcon.isEmpty()) {
if (!OnPickIcon())
m_pUseIcon->setChecked(false);
}
}
else
ui.btnBorderColor->setIcon(QPixmap());
m_pPickIcon->setEnabled(m_pUseIcon->isChecked());
m_GeneralChanged = true;
OnOptChanged();
}
bool COptionsWindow::OnPickIcon()
{
QString Path;
quint32 Index = 0;
StrPair PathIndex = Split2(m_BoxIcon, ",");
if (!PathIndex.second.isEmpty() && !PathIndex.second.contains(".")) {
Path = PathIndex.first;
Index = PathIndex.second.toInt();
}
if (!PickWindowsIcon(this, Path, Index))
return false;
ui.btnBorderColor->setIcon(QPixmap::fromImage(LoadWindowsIcon(Path, Index)));
m_BoxIcon = QString("%1,%2").arg(Path).arg(Index);
m_GeneralChanged = true;
OnOptChanged();
return true;
}
void COptionsWindow::OnPickColor()
{
QColor color = QColorDialog::getColor(m_BorderColor, this, tr("Select color"));
@ -409,6 +490,40 @@ void COptionsWindow::UpdateBoxColor()
ui.btnBorderColor->setStyleSheet("background-color: " + m_BorderColor.name());
}
QString COptionsWindow::GetActionFile()
{
QString Action = ui.cmbDblClick->currentData().toString();
if (Action.isEmpty()) Action = ui.cmbDblClick->currentText();
if (!Action.isEmpty() && Action.left(1) != "!") {
CSandBoxPlus* pBoxEx = qobject_cast<CSandBoxPlus*>(m_pBox.data());
if (pBoxEx) {
QString Path = pBoxEx->GetCommandFile(Action);
ui.btnBorderColor->setIcon(QPixmap::fromImage(LoadWindowsIcon(Path, 0)));
return Path;
}
}
return QString();
}
void COptionsWindow::OnActionChanged()
{
if (m_HoldChange)
return;
QString ActionFile = GetActionFile();
if (!ActionFile.isEmpty()) {
ui.btnBorderColor->setIcon(QPixmap::fromImage(LoadWindowsIcon(ActionFile, 0)));
m_BoxIcon = QString("%1,0").arg(ActionFile);
}
else {
ui.btnBorderColor->setIcon(QPixmap());
m_BoxIcon.clear();
}
m_GeneralChanged = true;
OnOptChanged();
}
void COptionsWindow::OnBrowsePath()
{
QString Value = QFileDialog::getOpenFileName(this, tr("Select Program"), "", tr("Executables (*.exe *.cmd)")).replace("/", "\\");

8
SandboxiePlus/SandMan/Windows/OptionsWindow.h
View File

@ -46,6 +46,8 @@ private slots:
void OnOptChanged();
void OnUseIcon(bool bUse);
bool OnPickIcon();
void OnPickColor();
void OnColorSlider(int value);
@ -193,6 +195,7 @@ private slots:
void OnGeneralChanged();
void OnPSTChanged();
void OnActionChanged();
void OnSecurityMode();
void OnStartChanged() { m_StartChanged = true; OnOptChanged(); }
//void OnRestrictionChanged() { m_RestrictionChanged = true; OnOptChanged(); }
@ -301,6 +304,8 @@ protected:
void SetBoxColor(const QColor& color);
void UpdateBoxColor();
QString GetActionFile();
void SetProgramItem(QString Program, QTreeWidgetItem* pItem, int Column, const QString& Sufix = QString());
QString SelectProgram(bool bOrGroup = true);
@ -451,6 +456,7 @@ protected:
bool m_ConfigDirty;
QColor m_BorderColor;
QString m_BoxIcon;
bool m_HoldBoxType;
@ -510,6 +516,8 @@ private:
void WriteTextList(const QString& Setting, const QStringList& List);
Ui::OptionsWindow ui;
QCheckBox* m_pUseIcon;
QToolButton* m_pPickIcon;
QSlider* m_pColorSlider;
struct SDbgOpt {