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

Update Sandman

This commit is contained in:
love-code-yeyixiao 2024-03-17 11:14:03 +08:00
parent fb2a9b4dbd
commit c6d4836737
3 changed files with 211 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
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,11 +284,9 @@
<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"> <item row="0" column="0">
<widget class="QLabel" name="lblRawDisk"> <widget class="QLabel" name="lblStructure">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -297,7 +295,34 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Disk/File access</string> <string>Box Structure</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>
<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="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> </property>
</widget> </widget>
</item> </item>
@ -308,32 +333,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="4" column="1" colspan="4">
<widget class="QLabel" name="label_37"> <widget class="QCheckBox" name="chkRamBox">
<property name="maximumSize">
<size>
<width>20</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string/> <string>Store the sandbox content in a Ram Disk</string>
</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,10 +347,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1" colspan="6"> <item row="5" column="5">
<widget class="QCheckBox" name="chkAutoEmpty"> <widget class="QToolButton" name="btnPassword">
<property name="text"> <property name="text">
<string>Auto delete content when last sandboxed process terminates</string> <string>Set Password</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -361,6 +367,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2" colspan="4">
<widget class="QLabel" name="lblImDisk">
<property name="text">
<string>&lt;a href=&quot;addon://ImDisk&quot;&gt;Install ImDisk&lt;/a&gt; driver to enable Ram Disk and Disk Image support.</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="3"> <item row="8" column="0" colspan="3">
<widget class="QLabel" name="lblDelete"> <widget class="QLabel" name="lblDelete">
<property name="font"> <property name="font">
@ -375,27 +388,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="9" column="1" colspan="5">
<spacer name="verticalSpacer_2"> <widget class="QCheckBox" name="chkAutoEmpty">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="12" column="1" colspan="6">
<widget class="QCheckBox" name="chkRawDiskRead">
<property name="text"> <property name="text">
<string>Allow elevated sandboxed applications to read the harddrive</string> <string>Auto delete content when last sandboxed process terminates</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1" colspan="6"> <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,25 +408,15 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2" colspan="4"> <item row="11" column="1" colspan="5">
<widget class="QLabel" name="lblImDisk"> <widget class="QCheckBox" name="chkLockWhenClose">
<property name="text"> <property name="text">
<string>&lt;a href=&quot;addon://ImDisk&quot;&gt;Install ImDisk&lt;/a&gt; driver to enable Ram Disk and Disk Image support.</string> <string>Lock the encrypted sandbox when all processes in the sandbox terminate.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="5"> <item row="12" column="0" colspan="2">
<widget class="QCheckBox" name="chkSeparateUserFolders"> <widget class="QLabel" name="lblRawDisk">
<property name="text">
<string>Separate user folders</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lblStructure">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -435,49 +425,62 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Box Structure</string> <string>Disk/File access</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" colspan="4"> <item row="13" column="1" colspan="5">
<widget class="QCheckBox" name="chkRamBox"> <widget class="QCheckBox" name="chkRawDiskRead">
<property name="text"> <property name="text">
<string>Store the sandbox content in a Ram Disk</string> <string>Allow elevated sandboxed applications to read the harddrive</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="2" colspan="5"> <item row="14" column="1">
<widget class="QLabel" name="label_37">
<property name="maximumSize">
<size>
<width>20</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="14" column="2" colspan="4">
<widget class="QCheckBox" name="chkRawDiskNotify"> <widget class="QCheckBox" name="chkRawDiskNotify">
<property name="text"> <property name="text">
<string>Warn when an application opens a harddrive handle</string> <string>Warn when an application opens a harddrive handle</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="15" column="1">
<widget class="QComboBox" name="cmbVersion"/> <spacer name="verticalSpacer_2">
</item> <property name="orientation">
<item row="5" column="5"> <enum>Qt::Vertical</enum>
<widget class="QToolButton" name="btnPassword">
<property name="text">
<string>Set Password</string>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item row="1" column="1" colspan="2"> <width>20</width>
<widget class="QLabel" name="lblScheme"> <height>52</height>
<property name="text"> </size>
<string>Virtualization scheme</string>
</property> </property>
</widget> </spacer>
</item> </item>
<item row="0" column="2" colspan="4"> <item row="15" column="3">
<widget class="QLabel" name="lblWhenEmpty"> <spacer name="horizontalSpacer_4">
<property name="text"> <property name="orientation">
<string>The box structure can only be changed when the sandbox is empty</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
</layout> <width>410</width>
<height>13</height>
</size>
</property>
</spacer>
</item> </item>
</layout> </layout>
</widget> </widget>

7
SandboxiePlus/SandMan/SandMan.cpp
View File

@ -2283,7 +2283,12 @@ 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("LockWhenClose", false)) {
if (!pBox->GetMountRoot().isEmpty()) {
pBox->TerminateAll();
pBox->ImBoxUnmount();
}
}
if (!pBox->GetBool("NeverDelete", false)) if (!pBox->GetBool("NeverDelete", false))
{ {
if (pBox->GetBool("AutoDelete", false)) if (pBox->GetBool("AutoDelete", false))

9
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,7 +266,12 @@ 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("OpenWindowClass", "");
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));
QStringList Users = m_pBox->GetText("Enabled").split(","); QStringList Users = m_pBox->GetText("Enabled").split(",");
ui.lstUsers->clear(); ui.lstUsers->clear();
@ -471,6 +477,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++)