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

Merge pull request #3713 from love-code-yeyixiao/master 

Update Sandman
This commit is contained in:
DavidXanatos 2024-03-17 13:23:05 +01:00 committed by GitHub
parent b7800e64a8 b5fdcf5fea
commit 447c5cac63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 301 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
SandboxiePlus/SandMan/Forms/OptionsWindow.ui
View File

@ -55,7 +55,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabsGeneral"> <widget class="QTabWidget" name="tabsGeneral">
<property name="currentIndex"> <property name="currentIndex">
<number>3</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tabOptions"> <widget class="QWidget" name="tabOptions">
<attribute name="title"> <attribute name="title">
@ -284,30 +284,7 @@
<attribute name="title"> <attribute name="title">
<string>File Options</string> <string>File Options</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_30">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_28"> <layout class="QGridLayout" name="gridLayout_28">
<item row="11" column="0" colspan="2">
<widget class="QLabel" name="lblRawDisk">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>Disk/File access</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="5">
<widget class="QCheckBox" name="chkUseVolumeSerialNumbers">
<property name="text">
<string>Use volume serial numbers for drives, like: \drive\C~1234-ABCD</string>
</property>
</widget>
</item>
<item row="13" column="1"> <item row="13" column="1">
<widget class="QLabel" name="label_37"> <widget class="QLabel" name="label_37">
<property name="maximumSize"> <property name="maximumSize">
@ -321,19 +298,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="2" colspan="5">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="1" colspan="4"> <item row="5" column="1" colspan="4">
<widget class="QCheckBox" name="chkEncrypt"> <widget class="QCheckBox" name="chkEncrypt">
<property name="text"> <property name="text">
@ -341,12 +305,18 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1" colspan="6"> <item row="14" column="3">
<widget class="QCheckBox" name="chkAutoEmpty"> <spacer name="horizontalSpacer_4">
<property name="text"> <property name="orientation">
<string>Auto delete content when last sandboxed process terminates</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
<size>
<width>410</width>
<height>13</height>
</size>
</property>
</spacer>
</item> </item>
<item row="6" column="2" colspan="4"> <item row="6" column="2" colspan="4">
<widget class="QLabel" name="lblCrypto"> <widget class="QLabel" name="lblCrypto">
@ -361,20 +331,30 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="3"> <item row="13" column="2" colspan="4">
<widget class="QLabel" name="lblDelete"> <widget class="QCheckBox" name="chkRawDiskNotify">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="text"> <property name="text">
<string>Box Delete options</string> <string>Warn when an application opens a harddrive handle</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="5">
<widget class="QToolButton" name="btnPassword">
<property name="text">
<string>Set Password</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3">
<widget class="QLabel" name="lblScheme">
<property name="text">
<string>Virtualization scheme</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="cmbVersion"/>
</item>
<item row="14" column="1"> <item row="14" column="1">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
@ -383,19 +363,40 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>52</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="12" column="1" colspan="6"> <item row="11" column="0" colspan="2">
<widget class="QLabel" name="lblRawDisk">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>Disk/File access</string>
</property>
</widget>
</item>
<item row="12" column="1" colspan="5">
<widget class="QCheckBox" name="chkRawDiskRead"> <widget class="QCheckBox" name="chkRawDiskRead">
<property name="text"> <property name="text">
<string>Allow elevated sandboxed applications to read the harddrive</string> <string>Allow elevated sandboxed applications to read the harddrive</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1" colspan="6"> <item row="0" column="2" colspan="4">
<widget class="QLabel" name="lblWhenEmpty">
<property name="text">
<string>The box structure can only be changed when the sandbox is empty</string>
</property>
</widget>
</item>
<item row="10" column="1" colspan="4">
<widget class="QCheckBox" name="chkProtectBox"> <widget class="QCheckBox" name="chkProtectBox">
<property name="toolTip"> <property name="toolTip">
<string>Partially checked means prevent box removal but not content deletion.</string> <string>Partially checked means prevent box removal but not content deletion.</string>
@ -408,6 +409,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1" colspan="5">
<widget class="QCheckBox" name="chkAutoEmpty">
<property name="text">
<string>Auto delete content when last sandboxed process terminates</string>
</property>
</widget>
</item>
<item row="7" column="2" colspan="4"> <item row="7" column="2" colspan="4">
<widget class="QLabel" name="lblImDisk"> <widget class="QLabel" name="lblImDisk">
<property name="text"> <property name="text">
@ -415,16 +423,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="5">
<widget class="QCheckBox" name="chkSeparateUserFolders">
<property name="text">
<string>Separate user folders</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="lblStructure"> <widget class="QLabel" name="lblStructure">
<property name="font"> <property name="font">
@ -439,6 +437,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="4">
<widget class="QCheckBox" name="chkSeparateUserFolders">
<property name="text">
<string>Separate user folders</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="1" colspan="4"> <item row="4" column="1" colspan="4">
<widget class="QCheckBox" name="chkRamBox"> <widget class="QCheckBox" name="chkRamBox">
<property name="text"> <property name="text">
@ -446,39 +454,27 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="2" colspan="5"> <item row="8" column="0" colspan="3">
<widget class="QCheckBox" name="chkRawDiskNotify"> <widget class="QLabel" name="lblDelete">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="text"> <property name="text">
<string>Warn when an application opens a harddrive handle</string> <string>Box Delete options</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="3" column="1" colspan="5">
<widget class="QComboBox" name="cmbVersion"/> <widget class="QCheckBox" name="chkUseVolumeSerialNumbers">
</item>
<item row="5" column="5">
<widget class="QToolButton" name="btnPassword">
<property name="text"> <property name="text">
<string>Set Password</string> <string>Use volume serial numbers for drives, like: \drive\C~1234-ABCD</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2">
<widget class="QLabel" name="lblScheme">
<property name="text">
<string>Virtualization scheme</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="4">
<widget class="QLabel" name="lblWhenEmpty">
<property name="text">
<string>The box structure can only be changed when the sandbox is empty</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tabMigration"> <widget class="QWidget" name="tabMigration">
@ -4522,8 +4518,8 @@ instead of &quot;*&quot;.</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>75</width> <width>98</width>
<height>16</height> <height>28</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="dbgLayout"> <layout class="QGridLayout" name="dbgLayout">

104
SandboxiePlus/SandMan/Forms/SettingsWindow.ui
View File

@ -48,7 +48,7 @@
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>5</number>
</property> </property>
<widget class="QWidget" name="tabGeneral"> <widget class="QWidget" name="tabGeneral">
<attribute name="title"> <attribute name="title">
@ -449,7 +449,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabsShell"> <widget class="QTabWidget" name="tabsShell">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tabWindows"> <widget class="QWidget" name="tabWindows">
<attribute name="title"> <attribute name="title">
@ -1689,6 +1689,7 @@
<widget class="QLabel" name="lblCertGuide"> <widget class="QLabel" name="lblCertGuide">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
<kerning>true</kerning> <kerning>true</kerning>
</font> </font>
@ -1940,7 +1941,7 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabsAdvanced"> <widget class="QTabWidget" name="tabsAdvanced">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tabSandbox"> <widget class="QWidget" name="tabSandbox">
<attribute name="title"> <attribute name="title">
@ -2159,24 +2160,8 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<attribute name="title"> <attribute name="title">
<string>Sandboxie.ini Presets</string> <string>Sandboxie.ini Presets</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_21">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_19"> <layout class="QGridLayout" name="gridLayout_19">
<item row="3" column="2"> <item row="7" column="0">
<widget class="QPushButton" name="btnSetPassword">
<property name="text">
<string>Change Password</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="chkPassRequired">
<property name="text">
<string>Password must be entered in order to make changes</string>
</property>
</widget>
</item>
<item row="6" column="1">
<spacer name="verticalSpacer_7"> <spacer name="verticalSpacer_7">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -2184,11 +2169,59 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>211</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="6" column="2">
<widget class="QCheckBox" name="chkClearPass">
<property name="text">
<string>Clear password when main window becomes hidden</string>
</property>
</widget>
</item>
<item row="5" column="2" colspan="2">
<widget class="QCheckBox" name="chkAdminOnlyFP">
<property name="text">
<string>Only Administrator user accounts can use Pause Forcing Programs command</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="chkWatchConfig">
<property name="text">
<string>Watch Sandboxie.ini for changes</string>
</property>
</widget>
</item>
<item row="3" column="3" rowspan="2">
<widget class="QPushButton" name="btnSetPassword">
<property name="text">
<string>Change Password</string>
</property>
</widget>
</item>
<item row="4" column="1" rowspan="2">
<spacer name="horizontalSpacer_23">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>140</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="chkAdminOnly">
<property name="text">
<string>Only Administrator user accounts can make changes</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QLabel" name="lblProtection"> <widget class="QLabel" name="lblProtection">
<property name="font"> <property name="font">
@ -2203,36 +2236,13 @@ Unlike the preview channel, it does not include untested, potentially breaking,
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="2">
<widget class="QCheckBox" name="chkAdminOnly"> <widget class="QCheckBox" name="chkPassRequired">
<property name="text"> <property name="text">
<string>Only Administrator user accounts can make changes</string> <string>Password must be entered in order to make changes</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QCheckBox" name="chkWatchConfig">
<property name="text">
<string>Watch Sandboxie.ini for changes</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QCheckBox" name="chkAdminOnlyFP">
<property name="text">
<string>Only Administrator user accounts can use Pause Forcing Programs command</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="chkClearPass">
<property name="text">
<string>Clear password when main window becomes hidden</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

1
SandboxiePlus/SandMan/SandMan.cpp
View File

@ -2283,7 +2283,6 @@ void CSandMan::OnBoxClosed(const CSandBoxPtr& pBox)
AddAsyncOp(pProgress, true, tr("Executing OnBoxTerminate: %1").arg(Value2)); AddAsyncOp(pProgress, true, tr("Executing OnBoxTerminate: %1").arg(Value2));
} }
} }
if (!pBox->GetBool("NeverDelete", false)) if (!pBox->GetBool("NeverDelete", false))
{ {
if (pBox->GetBool("AutoDelete", false)) if (pBox->GetBool("AutoDelete", false))

2
SandboxiePlus/SandMan/SandManTray.cpp
View File

@ -537,7 +537,7 @@ void CSandMan::OnSysTray(QSystemTrayIcon::ActivationReason Reason)
} }
} }
void CSandMan::OnBoxMenu(const QPoint & point) void CSandMan::OnBoxMenu(const QPoint& point)
{ {
QTreeWidgetItem* pItem = m_pTrayBoxes->currentItem(); QTreeWidgetItem* pItem = m_pTrayBoxes->currentItem();
if (!pItem) if (!pItem)

22
SandboxiePlus/SandMan/Windows/OptionsAdvanced.cpp
View File

@ -106,6 +106,7 @@ void COptionsWindow::CreateAdvanced()
connect(ui.chkLessConfidential, SIGNAL(clicked(bool)), this, SLOT(OnLessConfidentialChanged())); connect(ui.chkLessConfidential, SIGNAL(clicked(bool)), this, SLOT(OnLessConfidentialChanged()));
connect(ui.chkProtectWindow, SIGNAL(clicked(bool)), this, SLOT(OnProtectChanged())); connect(ui.chkProtectWindow, SIGNAL(clicked(bool)), this, SLOT(OnProtectChanged()));
connect(ui.chkBlockCapture, SIGNAL(clicked(bool)), this, SLOT(OnCaptureChanged())); connect(ui.chkBlockCapture, SIGNAL(clicked(bool)), this, SLOT(OnCaptureChanged()));
//connect(ui.chkLockWhenClose, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged()));
connect(ui.chkNotifyProtect, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged())); connect(ui.chkNotifyProtect, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged()));
connect(ui.treeInjectDll, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(OnToggleInjectDll(QTreeWidgetItem *, int))); connect(ui.treeInjectDll, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(OnToggleInjectDll(QTreeWidgetItem *, int)));
@ -265,8 +266,14 @@ void COptionsWindow::LoadAdvanced()
ui.chkNotifyProtect->setChecked(m_pBox->GetBool("NotifyBoxProtected", false)); ui.chkNotifyProtect->setChecked(m_pBox->GetBool("NotifyBoxProtected", false));
ui.chkProtectWindow->setChecked(m_pBox->GetBool("IsProtectScreen")); ui.chkProtectWindow->setChecked(m_pBox->GetBool("IsProtectScreen"));
ui.chkBlockCapture->setChecked(m_pBox->GetBool("IsBlockCapture")); QString str = m_pBox->GetText("OpenWinClass", "");
ui.chkBlockCapture->setChecked(m_pBox->GetBool("IsBlockCapture")&& QString::compare(str, "*") != 0);
ui.chkBlockCapture->setCheckable(QString::compare(str, "*") != 0);
/*ui.chkLockWhenClose->setChecked(m_pBox->GetBool("LockWhenClose", false));
ui.chkLockWhenClose->setCheckable(m_pBox->GetBool("UseFileImage", false));
ui.chkLockWhenClose->setEnabled(m_pBox->GetBool("UseFileImage", false));
*/
QStringList Users = m_pBox->GetText("Enabled").split(","); QStringList Users = m_pBox->GetText("Enabled").split(",");
ui.lstUsers->clear(); ui.lstUsers->clear();
if (Users.count() > 1) if (Users.count() > 1)
@ -471,6 +478,7 @@ void COptionsWindow::SaveAdvanced()
WriteAdvancedCheck(ui.chkProtectWindow, "IsProtectScreen", "y", "n"); WriteAdvancedCheck(ui.chkProtectWindow, "IsProtectScreen", "y", "n");
WriteAdvancedCheck(ui.chkBlockCapture, "IsBlockCapture", "y", "n"); WriteAdvancedCheck(ui.chkBlockCapture, "IsBlockCapture", "y", "n");
//WriteAdvancedCheck(ui.chkLockWhenClose, "LockWhenClose", "y", "n");
QStringList Users; QStringList Users;
for (int i = 0; i < ui.lstUsers->count(); i++) for (int i = 0; i < ui.lstUsers->count(); i++)
@ -1245,8 +1253,12 @@ void COptionsWindow::OnCaptureChanged()
if (ui.chkBlockCapture->checkState()) { if (ui.chkBlockCapture->checkState()) {
ui.chkProtectWindow->setChecked(FALSE); ui.chkProtectWindow->setChecked(FALSE);
ui.chkProtectWindow->setCheckable(FALSE); ui.chkProtectWindow->setCheckable(FALSE);
} else ui.chkProtectWindow->setEnabled(FALSE);
}
else {
ui.chkProtectWindow->setCheckable(TRUE); ui.chkProtectWindow->setCheckable(TRUE);
ui.chkProtectWindow->setEnabled(TRUE);
}
OnAdvancedChanged(); OnAdvancedChanged();
} }
@ -1255,7 +1267,11 @@ void COptionsWindow::OnProtectChanged()
if (ui.chkProtectWindow->checkState()) { if (ui.chkProtectWindow->checkState()) {
ui.chkBlockCapture->setChecked(FALSE); ui.chkBlockCapture->setChecked(FALSE);
ui.chkBlockCapture->setCheckable(FALSE); ui.chkBlockCapture->setCheckable(FALSE);
} else ui.chkBlockCapture->setEnabled(FALSE);
}
else {
ui.chkBlockCapture->setCheckable(TRUE); ui.chkBlockCapture->setCheckable(TRUE);
ui.chkBlockCapture->setEnabled(TRUE);
}
OnAdvancedChanged(); OnAdvancedChanged();
} }

2
SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
View File

@ -429,6 +429,7 @@ CSettingsWindow::CSettingsWindow(QWidget* parent)
connect(ui.btnSetPassword, SIGNAL(clicked(bool)), this, SLOT(OnSetPassword())); connect(ui.btnSetPassword, SIGNAL(clicked(bool)), this, SLOT(OnSetPassword()));
connect(ui.chkAdminOnlyFP, SIGNAL(stateChanged(int)), this, SLOT(OnProtectionChange())); connect(ui.chkAdminOnlyFP, SIGNAL(stateChanged(int)), this, SLOT(OnProtectionChange()));
connect(ui.chkClearPass, SIGNAL(stateChanged(int)), this, SLOT(OnProtectionChange())); connect(ui.chkClearPass, SIGNAL(stateChanged(int)), this, SLOT(OnProtectionChange()));
m_ProtectionChanged = false; m_ProtectionChanged = false;
// //
@ -1663,6 +1664,7 @@ void CSettingsWindow::SaveSettings()
WriteAdvancedCheck(ui.chkAdminOnlyFP, "ForceDisableAdminOnly", "y", ""); WriteAdvancedCheck(ui.chkAdminOnlyFP, "ForceDisableAdminOnly", "y", "");
WriteAdvancedCheck(ui.chkClearPass, "ForgetPassword", "y", ""); WriteAdvancedCheck(ui.chkClearPass, "ForgetPassword", "y", "");
} }
if (m_WarnProgsChanged) if (m_WarnProgsChanged)