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

1.0.10

This commit is contained in:
DavidXanatos 2022-02-04 22:08:25 +01:00
parent f3ce95b5e3
commit cf1de5fbdb
14 changed files with 521 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
SandboxiePlus/QSbieAPI/SbieUtils.cpp
View File

@ -212,12 +212,12 @@ QString CSbieUtils::GetContextMenuStartCmd()
return QString::fromWCharArray(path); return QString::fromWCharArray(path);
} }
void CSbieUtils::AddContextMenu(const QString& StartPath, const QString& IconPath) void CSbieUtils::AddContextMenu(const QString& StartPath, const QString& RunStr, const QString& ExploreStr, const QString& IconPath)
{ {
wstring start_path = L"\"" + StartPath.toStdWString() + L"\""; wstring start_path = L"\"" + StartPath.toStdWString() + L"\"";
wstring icon_path = L"\"" + (IconPath.isEmpty() ? StartPath : IconPath).toStdWString() + L"\""; wstring icon_path = L"\"" + (IconPath.isEmpty() ? StartPath : IconPath).toStdWString() + L"\"";
CreateShellEntry(L"*", L"Run &Sandboxed", icon_path, start_path + L" /box:__ask__ \"%1\" %*"); CreateShellEntry(L"*", L"sandbox", RunStr.toStdWString(), icon_path, start_path + L" /box:__ask__ \"%1\" %*");
wstring explorer_path(512, L'\0'); wstring explorer_path(512, L'\0');
@ -242,13 +242,13 @@ void CSbieUtils::AddContextMenu(const QString& StartPath, const QString& IconPat
explorer_path.append(L"\\explorer.exe"); explorer_path.append(L"\\explorer.exe");
} }
CreateShellEntry(L"Folder", L"Explore &Sandboxed", icon_path, start_path + L" /box:__ask__ " + explorer_path + L" \"%1\""); CreateShellEntry(L"Folder", L"sandbox", ExploreStr.toStdWString(), icon_path, start_path + L" /box:__ask__ " + explorer_path + L" \"%1\"");
} }
void CSbieUtils::CreateShellEntry(const wstring& classname, const wstring& cmdtext, const wstring& iconpath, const wstring& startcmd) void CSbieUtils::CreateShellEntry(const wstring& classname, const wstring& key, const wstring& cmdtext, const wstring& iconpath, const wstring& startcmd)
{ {
HKEY hkey; HKEY hkey;
LONG rc = RegCreateKeyEx(HKEY_CURRENT_USER, (L"software\\classes\\" + classname + L"\\shell\\sandbox").c_str(), 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL); LONG rc = RegCreateKeyEx(HKEY_CURRENT_USER, (L"software\\classes\\" + classname + L"\\shell\\" + key).c_str(), 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL);
if (rc != 0) if (rc != 0)
return; return;
@ -259,7 +259,7 @@ void CSbieUtils::CreateShellEntry(const wstring& classname, const wstring& cmdte
if (rc != 0) if (rc != 0)
return; return;
rc = RegCreateKeyEx(HKEY_CURRENT_USER, (L"software\\classes\\" + classname + L"\\shell\\sandbox\\command").c_str(), 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL); rc = RegCreateKeyEx(HKEY_CURRENT_USER, (L"software\\classes\\" + classname + L"\\shell\\" + key + L"\\command").c_str(), 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL);
if (rc != 0) if (rc != 0)
return; return;
@ -274,6 +274,32 @@ void CSbieUtils::RemoveContextMenu()
RegDeleteTreeW(HKEY_CURRENT_USER, L"software\\classes\\folder\\shell\\sandbox"); RegDeleteTreeW(HKEY_CURRENT_USER, L"software\\classes\\folder\\shell\\sandbox");
} }
bool CSbieUtils::HasContextMenu2()
{
const wchar_t* key = L"Software\\Classes\\*\\shell\\unbox\\command";
HKEY hkey;
LONG rc = RegOpenKeyEx(HKEY_CURRENT_USER, key, 0, KEY_READ, &hkey);
if (rc != 0)
return false;
RegCloseKey(hkey);
return true;
}
void CSbieUtils::AddContextMenu2(const QString& StartPath, const QString& RunStr, const QString& IconPath)
{
wstring start_path = L"\"" + StartPath.toStdWString() + L"\"";
wstring icon_path = L"\"" + (IconPath.isEmpty() ? StartPath : IconPath).toStdWString() + L"\",-104";
CreateShellEntry(L"*", L"unbox", RunStr.toStdWString(), icon_path, start_path + L" /disable_force \"%1\" %*");
}
void CSbieUtils::RemoveContextMenu2()
{
RegDeleteTreeW(HKEY_CURRENT_USER, L"software\\classes\\*\\shell\\unbox");
}
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Shortcuts // Shortcuts

8
SandboxiePlus/QSbieAPI/SbieUtils.h
View File

@ -27,9 +27,13 @@ public:
static bool IsInstalled(EComponent Component); static bool IsInstalled(EComponent Component);
static QString GetContextMenuStartCmd(); static QString GetContextMenuStartCmd();
static void AddContextMenu(const QString& StartPath, const QString& IconPath = QString()); static void AddContextMenu(const QString& StartPath, const QString& RunStr, const QString& ExploreStr, const QString& IconPath = QString());
static void RemoveContextMenu(); static void RemoveContextMenu();
static bool HasContextMenu2();
static void AddContextMenu2(const QString& StartPath, const QString& RunStr, const QString& IconPath = QString());
static void RemoveContextMenu2();
static bool CreateShortcut(class CSbieAPI* pApi, QString LinkPath, const QString &LinkName, const QString &boxname, const QString &arguments, const QString &iconPath = QString(), int iconIndex = 0, const QString &workdir = QString(), bool bRunElevated = false); static bool CreateShortcut(class CSbieAPI* pApi, QString LinkPath, const QString &LinkName, const QString &boxname, const QString &arguments, const QString &iconPath = QString(), int iconIndex = 0, const QString &workdir = QString(), bool bRunElevated = false);
static bool GetStartMenuShortcut(class CSbieAPI* pApi, QString &BoxName, QString &LinkPath, QString &IconPath, quint32& IconIndex, QString &WorkDir); static bool GetStartMenuShortcut(class CSbieAPI* pApi, QString &BoxName, QString &LinkPath, QString &IconPath, quint32& IconIndex, QString &WorkDir);
@ -43,7 +47,7 @@ private:
static void Install(EComponent Component, QStringList& Ops); static void Install(EComponent Component, QStringList& Ops);
static void Uninstall(EComponent Component, QStringList& Ops); static void Uninstall(EComponent Component, QStringList& Ops);
static void CreateShellEntry(const wstring& classname, const wstring& cmdtext, const wstring& iconpath, const wstring& startcmd); static void CreateShellEntry(const wstring& classname, const wstring& key, const wstring& cmdtext, const wstring& iconpath, const wstring& startcmd);
}; };

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

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>659</width> <width>659</width>
<height>479</height> <height>498</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -808,107 +808,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_6">
<attribute name="title">
<string>Auto Start</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Here you can specify programs and/or services that are to be started automatically in the sandbox when it is activated</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="4">
<widget class="QTreeWidget" name="treeAutoStart">
<column>
<property name="text">
<string>Type</string>
</property>
</column>
<column>
<property name="text">
<string>Program/Service</string>
</property>
</column>
</widget>
</item>
<item row="4" column="1">
<widget class="QToolButton" name="btnDelAuto">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="btnAddAutoExe">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Add program</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="btnAddAutoSvc">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Add service</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -2329,17 +2228,23 @@ The process match level has a higher priority than the specificity and describes
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
<attribute name="title"> <attribute name="title">
<string>Auto Exec</string> <string>Triggers</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_35"> <layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="1"> <item row="10" column="1">
<widget class="QPushButton" name="btnAddAutoExec"> <spacer name="verticalSpacer_4">
<property name="text"> <property name="orientation">
<string>Add Command</string> <enum>Qt::Vertical</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item> </item>
<item row="2" column="1"> <item row="4" column="1">
<spacer name="verticalSpacer_18"> <spacer name="verticalSpacer_18">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -2352,25 +2257,188 @@ The process match level has a higher priority than the specificity and describes
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="1"> <item row="12" column="1">
<widget class="QPushButton" name="btnDelAutoExec"> <widget class="QToolButton" name="btnDelAuto">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Remove</string> <string>Remove</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="1" column="0" rowspan="12">
<widget class="QLabel" name="label_33"> <widget class="QTreeWidget" name="treeTriggers">
<column>
<property name="text">
<string>Event</string>
</property>
</column>
<column>
<property name="text">
<string>Action</string>
</property>
</column>
<column>
<property name="text">
<string/>
</property>
</column>
</widget>
</item>
<item row="6" column="1">
<widget class="QToolButton" name="btnAddAutoExec">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Here you can specify a list of commands that are executed every time the sandbox is initially populated.</string> <string>Run Command</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QToolButton" name="btnAddAutoSvc">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Start Service</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_33">
<property name="toolTip">
<string>This events are executed each time a boxed is started</string>
</property>
<property name="text">
<string>On Box Start</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="btnAddAutoRun">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Run Command</string>
</property>
</widget>
</item>
<item row="7" column="1">
<spacer name="verticalSpacer_21">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="1">
<widget class="QLabel" name="label_67">
<property name="toolTip">
<string>This commands are run UNBOXED just before the box content is deleted</string>
</property>
<property name="text">
<string>On Box Delete</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QToolButton" name="btnAddDeleteCmd">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Run Command</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="label_66">
<property name="toolTip">
<string>This commands are only executed when a box gets initialized, to have them re-run the box content must be deleted.</string>
</property>
<property name="text">
<string>On Box Init</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Here you can specify actions to be executed automatically on various box events.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" rowspan="3"> <item row="11" column="1">
<widget class="QListWidget" name="lstAutoExec"/> <widget class="QCheckBox" name="chkShowTriggersTmpl">
<property name="text">
<string>Show Templates</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -2715,8 +2783,8 @@ instead of &quot;*&quot;.</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>98</width> <width>63</width>
<height>28</height> <height>16</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="dbgLayout"> <layout class="QGridLayout" name="dbgLayout">
@ -3054,8 +3122,8 @@ Please note that this values are currently user specific and saved globally for
<tabstop>chkNoCopyWarn</tabstop> <tabstop>chkNoCopyWarn</tabstop>
<tabstop>chkAutoEmpty</tabstop> <tabstop>chkAutoEmpty</tabstop>
<tabstop>chkProtectBox</tabstop> <tabstop>chkProtectBox</tabstop>
<tabstop>treeAutoStart</tabstop> <tabstop>treeTriggers</tabstop>
<tabstop>btnAddAutoExe</tabstop> <tabstop>btnAddAutoRun</tabstop>
<tabstop>btnAddAutoSvc</tabstop> <tabstop>btnAddAutoSvc</tabstop>
<tabstop>btnDelAuto</tabstop> <tabstop>btnDelAuto</tabstop>
<tabstop>treeGroups</tabstop> <tabstop>treeGroups</tabstop>
@ -3102,9 +3170,6 @@ Please note that this values are currently user specific and saved globally for
<tabstop>tabsAdvanced</tabstop> <tabstop>tabsAdvanced</tabstop>
<tabstop>chkPreferExternalManifest</tabstop> <tabstop>chkPreferExternalManifest</tabstop>
<tabstop>chkNoWindowRename</tabstop> <tabstop>chkNoWindowRename</tabstop>
<tabstop>lstAutoExec</tabstop>
<tabstop>btnAddAutoExec</tabstop>
<tabstop>btnDelAutoExec</tabstop>
<tabstop>chkHideOtherBoxes</tabstop> <tabstop>chkHideOtherBoxes</tabstop>
<tabstop>lstProcesses</tabstop> <tabstop>lstProcesses</tabstop>
<tabstop>btnAddProcess</tabstop> <tabstop>btnAddProcess</tabstop>

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

@ -45,7 +45,7 @@
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tabGeneral"> <widget class="QWidget" name="tabGeneral">
<attribute name="title"> <attribute name="title">
@ -229,19 +229,6 @@
<layout class="QGridLayout" name="gridLayout_14"> <layout class="QGridLayout" name="gridLayout_14">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_13"> <layout class="QGridLayout" name="gridLayout_13">
<item row="5" column="0">
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="font"> <property name="font">
@ -256,33 +243,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QCheckBox" name="chkAutoStart">
<property name="text">
<string>Start UI with Windows</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QCheckBox" name="chkAlwaysDefault">
<property name="text">
<string>Always use DefaultBox</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="3">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="font"> <property name="font">
@ -297,10 +257,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2"> <item row="1" column="1" colspan="2">
<widget class="QCheckBox" name="chkSvcStart"> <widget class="QCheckBox" name="chkAutoStart">
<property name="text"> <property name="text">
<string>Start UI when a sandboxed process is started</string> <string>Start UI with Windows</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -311,6 +271,66 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1" colspan="2">
<widget class="QCheckBox" name="chkSvcStart">
<property name="text">
<string>Start UI when a sandboxed process is started</string>
</property>
</widget>
</item>
<item row="6" column="2" colspan="2">
<widget class="QCheckBox" name="chkShellMenu2">
<property name="text">
<string>Add 'Run Un-Sandboxed' to the context menu</string>
</property>
</widget>
</item>
<item row="5" column="2" colspan="2">
<widget class="QCheckBox" name="chkAlwaysDefault">
<property name="text">
<string>Always use DefaultBox</string>
</property>
</widget>
</item>
<item row="7" column="2" colspan="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="1">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

39
SandboxiePlus/SandMan/SandMan.cpp
View File

@ -463,7 +463,7 @@ void CSandMan::CreateMenus()
m_pMenuOptions = menuBar()->addMenu(tr("&Options")); m_pMenuOptions = menuBar()->addMenu(tr("&Options"));
m_pMenuSettings = m_pMenuOptions->addAction(CSandMan::GetIcon("Settings"), tr("Global Settings"), this, SLOT(OnSettings())); m_pMenuSettings = m_pMenuOptions->addAction(CSandMan::GetIcon("Settings"), tr("Global Settings"), this, SLOT(OnSettings()));
m_pMenuResetMsgs = m_pMenuOptions->addAction(tr("Reset all hidden messages"), this, SLOT(OnResetMsgs())); m_pMenuResetMsgs = m_pMenuOptions->addAction(tr("Reset all hidden messages"), this, SLOT(OnResetMsgs()));
m_pMenuResetGUI = m_pMenuOptions->addAction(tr("Reset all GUI elements"), this, SLOT(OnResetGUI())); m_pMenuResetGUI = m_pMenuOptions->addAction(tr("Reset all GUI options"), this, SLOT(OnResetGUI()));
m_pMenuOptions->addSeparator(); m_pMenuOptions->addSeparator();
m_pEditIni = m_pMenuOptions->addAction(CSandMan::GetIcon("EditIni"), tr("Edit ini file"), this, SLOT(OnEditIni())); m_pEditIni = m_pMenuOptions->addAction(CSandMan::GetIcon("EditIni"), tr("Edit ini file"), this, SLOT(OnEditIni()));
m_pReloadIni = m_pMenuOptions->addAction(CSandMan::GetIcon("ReloadIni"), tr("Reload ini file"), this, SLOT(OnReloadIni())); m_pReloadIni = m_pMenuOptions->addAction(CSandMan::GetIcon("ReloadIni"), tr("Reload ini file"), this, SLOT(OnReloadIni()));
@ -881,6 +881,33 @@ void CSandMan::timerEvent(QTimerEvent* pEvent)
} }
} }
void CSandMan::DoDeleteCmd(const CSandBoxPtr &pBox)
{
foreach(const QString& Value, pBox->GetTextList("OnBoxDelete", true, false, true)) {
QString Value2 = Value;
QRegExp rx("%([a-zA-Z0-9 ]+)%");
for(int pos = 0; (pos = rx.indexIn(Value, pos)) != -1; ) {
QString var = rx.cap(1);
QString val;
if (var.compare("Sandbox", Qt::CaseInsensitive) == 0)
val = pBox->GetFileRoot();
else if (var.compare("SandboxName", Qt::CaseInsensitive) == 0)
val = pBox->GetName();
else
val = theAPI->SbieIniGet(pBox->GetName(), "%" + var + "%", 0x80000000); // CONF_JUST_EXPAND
Value2.replace("%" + var + "%", val);
pos += rx.matchedLength();
}
// todo add progress dialog
QProcess Process;
Process.execute(Value2);
Process.waitForFinished();
}
}
void CSandMan::OnBoxClosed(const QString& BoxName) void CSandMan::OnBoxClosed(const QString& BoxName)
{ {
CSandBoxPtr pBox = theAPI->GetBoxByName(BoxName); CSandBoxPtr pBox = theAPI->GetBoxByName(BoxName);
@ -894,6 +921,8 @@ void CSandMan::OnBoxClosed(const QString& BoxName)
if(!theGUI->OpenRecovery(pBox, DeleteShapshots, true)) // unless no files are found than continue silently if(!theGUI->OpenRecovery(pBox, DeleteShapshots, true)) // unless no files are found than continue silently
return; return;
DoDeleteCmd(pBox);
SB_PROGRESS Status; SB_PROGRESS Status;
if (!DeleteShapshots && pBox->HasSnapshots()) { // in auto delete mdoe always return to last snapshot if (!DeleteShapshots && pBox->HasSnapshots()) { // in auto delete mdoe always return to last snapshot
QString Current; QString Current;
@ -979,10 +1008,8 @@ void CSandMan::OnStatusChanged()
theAPI->GetUserSettings()->SetText("SbieCtrl_AutoStartAgent", "SandMan.exe"); theAPI->GetUserSettings()->SetText("SbieCtrl_AutoStartAgent", "SandMan.exe");
QString cmd = CSbieUtils::GetContextMenuStartCmd(); QString cmd = CSbieUtils::GetContextMenuStartCmd();
if (!cmd.isEmpty() && !cmd.contains("sandman.exe", Qt::CaseInsensitive)) { if (!cmd.isEmpty() && !cmd.contains("SandMan.exe", Qt::CaseInsensitive))
CSbieUtils::AddContextMenu(QApplication::applicationDirPath().replace("/", "\\") + "\\SandMan.exe", CSettingsWindow__AddContextMenu();
QApplication::applicationDirPath().replace("/", "\\") + "\\Start.exe");
}
} }
m_pBoxView->Clear(); m_pBoxView->Clear();
@ -1785,7 +1812,7 @@ void CSandMan::OnResetGUI()
LoadState(); LoadState();
show(); SafeShow(this);
} }
void CSandMan::OnEditIni() void CSandMan::OnEditIni()

2
SandboxiePlus/SandMan/SandMan.h
View File

@ -38,6 +38,8 @@ public:
SB_PROGRESS RecoverFiles(const QList<QPair<QString, QString>>& FileList, int Action = 0); SB_PROGRESS RecoverFiles(const QList<QPair<QString, QString>>& FileList, int Action = 0);
void DoDeleteCmd(const CSandBoxPtr &pBox);
bool AddAsyncOp(const CSbieProgressPtr& pProgress, bool bWait = false); bool AddAsyncOp(const CSbieProgressPtr& pProgress, bool bWait = false);
static QString FormatError(const SB_STATUS& Error); static QString FormatError(const SB_STATUS& Error);
static void CheckResults(QList<SB_STATUS> Results); static void CheckResults(QList<SB_STATUS> Results);

4
SandboxiePlus/SandMan/Views/SbieView.cpp
View File

@ -991,8 +991,10 @@ void CSbieView::OnSandBoxAction(QAction* Action)
, tr("Also delete all Snapshots"), &DeleteShapshots, QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::Yes) != QDialogButtonBox::Yes) , tr("Also delete all Snapshots"), &DeleteShapshots, QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::Yes) != QDialogButtonBox::Yes)
return; return;
foreach(const CSandBoxPtr & pBox, SandBoxes) foreach(const CSandBoxPtr &pBox, SandBoxes)
{ {
theGUI->DoDeleteCmd(pBox);
SB_PROGRESS Status; SB_PROGRESS Status;
if (!DeleteShapshots && pBox->HasSnapshots()) { if (!DeleteShapshots && pBox->HasSnapshots()) {
QString Default = pBox->GetDefaultSnapshot(); QString Default = pBox->GetDefaultSnapshot();

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

@ -101,7 +101,7 @@ void CNewBoxWindow::CreateBox()
pBox->SetBool("NoSecurityIsolation", true); pBox->SetBool("NoSecurityIsolation", true);
//pBox->SetBool("RunServicesAsSystem", true); //pBox->SetBool("RunServicesAsSystem", true);
pBox->SetBool("UsePrivacyMode", BoxType == CSandBoxPlus::eAppBoxPlus); pBox->SetBool("UsePrivacyMode", BoxType == CSandBoxPlus::eAppBoxPlus);
pBox->InsertText("Template", "NoUACProxy"); //pBox->InsertText("Template", "NoUACProxy"); // proxy is always needed for exes in the box
break; break;
} }
} }

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

@ -48,8 +48,13 @@ void COptionsWindow::CreateAdvanced()
connect(ui.chkDbgTrace, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged())); connect(ui.chkDbgTrace, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged()));
connect(ui.chkErrTrace, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged())); connect(ui.chkErrTrace, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged()));
connect(ui.treeStop, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(OnTriggerChanged(QTreeWidgetItem *, int)));
connect(ui.btnAddAutoRun, SIGNAL(clicked(bool)), this, SLOT(OnAddAutoRun()));
connect(ui.btnAddAutoSvc, SIGNAL(clicked(bool)), this, SLOT(OnAddAutoSvc()));
connect(ui.btnAddAutoExec, SIGNAL(clicked(bool)), this, SLOT(OnAddAutoExec())); connect(ui.btnAddAutoExec, SIGNAL(clicked(bool)), this, SLOT(OnAddAutoExec()));
connect(ui.btnDelAutoExec, SIGNAL(clicked(bool)), this, SLOT(OnDelAutoExec())); connect(ui.btnAddDeleteCmd, SIGNAL(clicked(bool)), this, SLOT(OnAddDeleteCmd()));
connect(ui.btnDelAuto, SIGNAL(clicked(bool)), this, SLOT(OnDelAuto()));
connect(ui.chkShowTriggersTmpl, SIGNAL(clicked(bool)), this, SLOT(OnShowTriggersTmpl()));
connect(ui.chkHideOtherBoxes, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged())); connect(ui.chkHideOtherBoxes, SIGNAL(clicked(bool)), this, SLOT(OnAdvancedChanged()));
connect(ui.btnAddProcess, SIGNAL(clicked(bool)), this, SLOT(OnAddProcess())); connect(ui.btnAddProcess, SIGNAL(clicked(bool)), this, SLOT(OnAddProcess()));
@ -85,11 +90,6 @@ void COptionsWindow::LoadAdvanced()
ui.chkOpenLsaEndpoint->setChecked(m_pBox->GetBool("OpenLsaEndpoint", false)); ui.chkOpenLsaEndpoint->setChecked(m_pBox->GetBool("OpenLsaEndpoint", false));
QStringList AutoExec = m_pBox->GetTextList("AutoExec", m_Template);
ui.lstAutoExec->clear();
ui.lstAutoExec->addItems(AutoExec);
bool bGlobalNoMon = m_pBox->GetAPI()->GetGlobalSettings()->GetBool("DisableResourceMonitor", false); bool bGlobalNoMon = m_pBox->GetAPI()->GetGlobalSettings()->GetBool("DisableResourceMonitor", false);
ui.chkDisableMonitor->setChecked(m_pBox->GetBool("DisableResourceMonitor", bGlobalNoMon)); ui.chkDisableMonitor->setChecked(m_pBox->GetBool("DisableResourceMonitor", bGlobalNoMon));
ReadAdvancedCheck("CallTrace", ui.chkCallTrace, "*"); ReadAdvancedCheck("CallTrace", ui.chkCallTrace, "*");
@ -106,6 +106,20 @@ void COptionsWindow::LoadAdvanced()
if (pBoxPlus) if (pBoxPlus)
ui.chkApiTrace->setChecked(pBoxPlus->HasLogApi()); ui.chkApiTrace->setChecked(pBoxPlus->HasLogApi());
// triggers
ui.treeTriggers->clear();
foreach(const QString & Value, m_pBox->GetTextList("StartProgram", m_Template))
AddTriggerItem(Value, eOnStartCmd);
foreach(const QString & Value, m_pBox->GetTextList("StartService", m_Template))
AddTriggerItem(Value, eOnStartSvc);
foreach(const QString & Value, m_pBox->GetTextList("AutoExec", m_Template))
AddTriggerItem(Value, eAutoExec);
foreach(const QString & Value, m_pBox->GetTextList("OnBoxDelete", m_Template))
AddTriggerItem(Value, eDeleteCmd);
ShowTriggersTmpl();
//
ui.chkHideOtherBoxes->setChecked(m_pBox->GetBool("HideOtherBoxes", false)); ui.chkHideOtherBoxes->setChecked(m_pBox->GetBool("HideOtherBoxes", false));
QStringList Processes = m_pBox->GetTextList("HideHostProcess", m_Template); QStringList Processes = m_pBox->GetTextList("HideHostProcess", m_Template);
ui.lstProcesses->clear(); ui.lstProcesses->clear();
@ -127,6 +141,37 @@ void COptionsWindow::LoadAdvanced()
m_AdvancedChanged = false; m_AdvancedChanged = false;
} }
void COptionsWindow::ShowTriggersTmpl(bool bUpdate)
{
if (ui.chkShowRecoveryTmpl->isChecked())
{
foreach(const QString& Template, m_pBox->GetTemplates())
{
foreach(const QString & Value, m_pBox->GetTextListTmpl("StartProgram", Template))
AddTriggerItem(Value, eOnStartCmd, Template);
foreach(const QString & Value, m_pBox->GetTextListTmpl("StartService", Template))
AddTriggerItem(Value, eOnStartSvc, Template);
foreach(const QString & Value, m_pBox->GetTextListTmpl("AutoExec", Template))
AddTriggerItem(Value, eAutoExec, Template);
foreach(const QString & Value, m_pBox->GetTextListTmpl("OnBoxDelete", Template))
AddTriggerItem(Value, eDeleteCmd, Template);
}
}
else if (bUpdate)
{
for (int i = 0; i < ui.treeRecovery->topLevelItemCount(); )
{
QTreeWidgetItem* pItem = ui.treeRecovery->topLevelItem(i);
int Type = pItem->data(0, Qt::UserRole).toInt();
if (Type == -1) {
delete pItem;
continue; // entry from template
}
i++;
}
}
}
void COptionsWindow::SaveAdvanced() void COptionsWindow::SaveAdvanced()
{ {
WriteAdvancedCheck(ui.chkPreferExternalManifest, "PreferExternalManifest", "y", ""); WriteAdvancedCheck(ui.chkPreferExternalManifest, "PreferExternalManifest", "y", "");
@ -151,11 +196,6 @@ void COptionsWindow::SaveAdvanced()
WriteAdvancedCheck(ui.chkOpenLsaEndpoint, "OpenLsaEndpoint", "y", ""); WriteAdvancedCheck(ui.chkOpenLsaEndpoint, "OpenLsaEndpoint", "y", "");
QStringList AutoExec;
for (int i = 0; i < ui.lstAutoExec->count(); i++)
AutoExec.append(ui.lstAutoExec->item(i)->text());
WriteTextList("AutoExec", AutoExec);
bool bGlobalNoMon = m_pBox->GetAPI()->GetGlobalSettings()->GetBool("DisableResourceMonitor", false); bool bGlobalNoMon = m_pBox->GetAPI()->GetGlobalSettings()->GetBool("DisableResourceMonitor", false);
WriteAdvancedCheck(ui.chkDisableMonitor, "DisableResourceMonitor", bGlobalNoMon ? "" : "y", bGlobalNoMon ? "n" : ""); WriteAdvancedCheck(ui.chkDisableMonitor, "DisableResourceMonitor", bGlobalNoMon ? "" : "y", bGlobalNoMon ? "n" : "");
WriteAdvancedCheck(ui.chkCallTrace, "CallTrace", "*"); WriteAdvancedCheck(ui.chkCallTrace, "CallTrace", "*");
@ -172,6 +212,27 @@ void COptionsWindow::SaveAdvanced()
if (pBoxPlus) if (pBoxPlus)
pBoxPlus->SetLogApi(ui.chkApiTrace->isChecked()); pBoxPlus->SetLogApi(ui.chkApiTrace->isChecked());
// triggers
QStringList StartProgram;
QStringList StartService;
QStringList DeleteCommand;
QStringList AutoExec;
for (int i = 0; i < ui.treeTriggers->topLevelItemCount(); i++) {
QTreeWidgetItem* pItem = ui.treeTriggers->topLevelItem(i);
switch (pItem->data(0, Qt::UserRole).toInt())
{
case eOnStartCmd: StartProgram.append(pItem->text(2)); break;
case eOnStartSvc: StartService.append(pItem->text(2)); break;
case eAutoExec: AutoExec.append(pItem->text(2)); break;
case eDeleteCmd: DeleteCommand.append(pItem->text(2)); break;
}
}
WriteTextList("StartProgram", StartProgram);
WriteTextList("StartService", StartService);
WriteTextList("AutoExec", AutoExec);
WriteTextList("OnBoxDelete", DeleteCommand);
//
WriteAdvancedCheck(ui.chkHideOtherBoxes, "HideOtherBoxes"); WriteAdvancedCheck(ui.chkHideOtherBoxes, "HideOtherBoxes");
QStringList Processes; QStringList Processes;
@ -264,27 +325,87 @@ void COptionsWindow::OnNoWindowRename()
OnOptChanged(); OnOptChanged();
} }
void COptionsWindow::OnAddAutoExec() // triggers
void COptionsWindow::AddTriggerItem(const QString& Value, ETriggerAction Type, const QString& Template)
{ {
QString Process = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter an auto exec command")); QTreeWidgetItem* pItem = new QTreeWidgetItem();
if (Process.isEmpty()) pItem->setData(0, Qt::UserRole, Template.isEmpty() ? Type : -1);
switch (Type)
{
case eOnStartCmd:
pItem->setText(0, tr("On Start"));
pItem->setText(1, tr("Run Command"));
break;
case eOnStartSvc:
pItem->setText(0, tr("On Start"));
pItem->setText(1, tr("Start Service"));
break;
case eAutoExec:
pItem->setText(0, tr("On Init"));
pItem->setText(1, tr("Run Command"));
break;
case eDeleteCmd:
pItem->setText(0, tr("On Delete"));
pItem->setText(1, tr("Run Command"));
break;
}
pItem->setText(2, Value);
pItem->setFlags(pItem->flags() | Qt::ItemIsEditable);
ui.treeTriggers->addTopLevelItem(pItem);
}
void COptionsWindow::OnAddAutoRun()
{
QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter the command line to be executed"), QLineEdit::Normal);
if (Value.isEmpty())
return; return;
ui.lstAutoExec->addItem(Process); AddTriggerItem(Value, eOnStartCmd);
m_AdvancedChanged = true; m_AdvancedChanged = true;
OnOptChanged(); OnOptChanged();
} }
void COptionsWindow::OnDelAutoExec() void COptionsWindow::OnAddAutoSvc()
{ {
foreach(QListWidgetItem * pItem, ui.lstAutoExec->selectedItems()) QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a service identifier"), QLineEdit::Normal);
delete pItem; if (Value.isEmpty())
return;
AddTriggerItem(Value, eOnStartSvc);
m_AdvancedChanged = true; m_AdvancedChanged = true;
OnOptChanged(); OnOptChanged();
} }
void COptionsWindow::OnAddAutoExec()
{
QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter the command line to be executed"), QLineEdit::Normal);
if (Value.isEmpty())
return;
AddTriggerItem(Value, eAutoExec);
m_AdvancedChanged = true;
OnOptChanged();
}
void COptionsWindow::OnAddDeleteCmd()
{
QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter the command line to be executed"), QLineEdit::Normal);
if (Value.isEmpty())
return;
AddTriggerItem(Value, eDeleteCmd);
m_AdvancedChanged = true;
OnOptChanged();
}
void COptionsWindow::OnDelAuto()
{
DeleteAccessEntry(ui.treeTriggers->currentItem());
m_AdvancedChanged = true;
OnOptChanged();
}
//
void COptionsWindow::OnAddProcess() void COptionsWindow::OnAddProcess()
{ {
QString Process = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a program file name")); QString Process = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a program file name"));

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

@ -90,14 +90,6 @@ void COptionsWindow::CreateGeneral()
ui.btnAddCmd->setPopupMode(QToolButton::MenuButtonPopup); ui.btnAddCmd->setPopupMode(QToolButton::MenuButtonPopup);
ui.btnAddCmd->setMenu(pRunBtnMenu); ui.btnAddCmd->setMenu(pRunBtnMenu);
connect(ui.btnDelCmd, SIGNAL(clicked(bool)), this, SLOT(OnDelCommand())); connect(ui.btnDelCmd, SIGNAL(clicked(bool)), this, SLOT(OnDelCommand()));
connect(ui.btnAddAutoExe, SIGNAL(clicked(bool)), this, SLOT(OnAddAutoCmd()));
QMenu* pAutoBtnMenu = new QMenu(ui.btnAddFile);
pAutoBtnMenu->addAction(tr("Browse for Program"), this, SLOT(OnAddAutoExe()));
ui.btnAddAutoExe->setPopupMode(QToolButton::MenuButtonPopup);
ui.btnAddAutoExe->setMenu(pAutoBtnMenu);
connect(ui.btnAddAutoSvc, SIGNAL(clicked(bool)), this, SLOT(OnDelAutoSvc()));
connect(ui.btnDelAuto, SIGNAL(clicked(bool)), this, SLOT(OnDelAuto()));
} }
void COptionsWindow::LoadGeneral() void COptionsWindow::LoadGeneral()
@ -131,12 +123,6 @@ void COptionsWindow::LoadGeneral()
//ui.chkOpenSmartCard->setChecked(m_pBox->GetBool("OpenSmartCard", true)); //ui.chkOpenSmartCard->setChecked(m_pBox->GetBool("OpenSmartCard", true));
//ui.chkOpenBluetooth->setChecked(m_pBox->GetBool("OpenBluetooth", false)); //ui.chkOpenBluetooth->setChecked(m_pBox->GetBool("OpenBluetooth", false));
ui.treeAutoStart->clear();
foreach(const QString & Value, m_pBox->GetTextList("StartCommand", m_Template))
AddAutoRunItem(Value, 0);
foreach(const QString & Value, m_pBox->GetTextList("StartService", m_Template))
AddAutoRunItem(Value, 1);
ui.treeRun->clear(); ui.treeRun->clear();
foreach(const QString& Value, m_pBox->GetTextList("RunCommand", m_Template)) foreach(const QString& Value, m_pBox->GetTextList("RunCommand", m_Template))
{ {
@ -193,18 +179,6 @@ void COptionsWindow::SaveGeneral()
//WriteAdvancedCheck(ui.chkOpenBluetooth, "OpenBluetooth", "y", ""); //WriteAdvancedCheck(ui.chkOpenBluetooth, "OpenBluetooth", "y", "");
QStringList StartProgram;
QStringList StartService;
for (int i = 0; i < ui.treeAutoStart->topLevelItemCount(); i++) {
QTreeWidgetItem* pItem = ui.treeAutoStart->topLevelItem(i);
if (pItem->data(0, Qt::UserRole).toInt())
StartService.append(pItem->text(1));
else
StartProgram.append(pItem->text(1));
}
WriteTextList("StartCommand", StartProgram);
WriteTextList("StartService", StartService);
QStringList RunCommands; QStringList RunCommands;
for (int i = 0; i < ui.treeRun->topLevelItemCount(); i++) { for (int i = 0; i < ui.treeRun->topLevelItemCount(); i++) {
QTreeWidgetItem* pItem = ui.treeRun->topLevelItem(i); QTreeWidgetItem* pItem = ui.treeRun->topLevelItem(i);
@ -257,60 +231,6 @@ void COptionsWindow::OnPickColor()
ui.btnBorderColor->setStyleSheet("background-color: " + m_BorderColor.name()); ui.btnBorderColor->setStyleSheet("background-color: " + m_BorderColor.name());
} }
void COptionsWindow::OnAddAutoCmd()
{
QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a program path"), QLineEdit::Normal);
if (Value.isEmpty())
return;
AddAutoRunItem(Value, 0);
m_GeneralChanged = true;
OnOptChanged();
}
void COptionsWindow::OnAddAutoExe()
{
QString Value = QFileDialog::getOpenFileName(this, tr("Select Program"), "", tr("Executables (*.exe *.cmd);;All files (*.*)")).replace("/", "\\");
if (Value.isEmpty())
return;
AddAutoRunItem(Value, 0);
m_GeneralChanged = true;
OnOptChanged();
}
void COptionsWindow::OnDelAutoSvc()
{
QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a service identifier"), QLineEdit::Normal);
if (Value.isEmpty())
return;
AddAutoRunItem(Value, 1);
m_GeneralChanged = true;
OnOptChanged();
}
void COptionsWindow::AddAutoRunItem(const QString& Value, int Type)
{
QTreeWidgetItem* pItem = new QTreeWidgetItem();
pItem->setText(0, Type ? tr("Service") : tr("Program"));
pItem->setData(0, Qt::UserRole, Type);
pItem->setText(1, Value);
pItem->setFlags(pItem->flags() | Qt::ItemIsEditable);
ui.treeAutoStart->addTopLevelItem(pItem);
}
void COptionsWindow::OnDelAuto()
{
QTreeWidgetItem* pItem = ui.treeAutoStart->currentItem();
if (!pItem)
return;
delete pItem;
m_GeneralChanged = true;
OnOptChanged();
}
void COptionsWindow::OnBrowsePath() void COptionsWindow::OnBrowsePath()
{ {
QString Value = QFileDialog::getOpenFileName(this, tr("Select Program"), "", tr("Executables (*.exe *.cmd)")).replace("/", "\\"); QString Value = QFileDialog::getOpenFileName(this, tr("Select Program"), "", tr("Executables (*.exe *.cmd)")).replace("/", "\\");
@ -401,7 +321,7 @@ void COptionsWindow::OnBoxTypChanged()
ui.chkMsiExemptions->setChecked(false); ui.chkMsiExemptions->setChecked(false);
//ui.chkRestrictServices->setChecked(true); //ui.chkRestrictServices->setChecked(true);
ui.chkPrivacy->setChecked(BoxType == CSandBoxPlus::eHardenedPlus); ui.chkPrivacy->setChecked(BoxType == CSandBoxPlus::eHardenedPlus);
SetTemplate("NoUACProxy", false); //SetTemplate("NoUACProxy", false);
//SetTemplate("DeviceSecurity", true); //SetTemplate("DeviceSecurity", true);
break; break;
case CSandBoxPlus::eDefaultPlus: case CSandBoxPlus::eDefaultPlus:
@ -412,7 +332,7 @@ void COptionsWindow::OnBoxTypChanged()
ui.chkMsiExemptions->setChecked(false); ui.chkMsiExemptions->setChecked(false);
//ui.chkRestrictServices->setChecked(true); //ui.chkRestrictServices->setChecked(true);
ui.chkPrivacy->setChecked(BoxType == CSandBoxPlus::eDefaultPlus); ui.chkPrivacy->setChecked(BoxType == CSandBoxPlus::eDefaultPlus);
SetTemplate("NoUACProxy", false); //SetTemplate("NoUACProxy", false);
//SetTemplate("DeviceSecurity", false); //SetTemplate("DeviceSecurity", false);
break; break;
case CSandBoxPlus::eAppBoxPlus: case CSandBoxPlus::eAppBoxPlus:
@ -420,7 +340,7 @@ void COptionsWindow::OnBoxTypChanged()
ui.chkNoSecurityIsolation->setChecked(true); ui.chkNoSecurityIsolation->setChecked(true);
//ui.chkRestrictServices->setChecked(false); //ui.chkRestrictServices->setChecked(false);
ui.chkPrivacy->setChecked(BoxType == CSandBoxPlus::eAppBoxPlus); ui.chkPrivacy->setChecked(BoxType == CSandBoxPlus::eAppBoxPlus);
SetTemplate("NoUACProxy", true); //SetTemplate("NoUACProxy", true);
//SetTemplate("DeviceSecurity", false); //SetTemplate("DeviceSecurity", false);
break; break;
} }

6
SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
View File

@ -297,8 +297,8 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
QByteArray QByteArray
Columns = theConf->GetBlob("OptionsWindow/Run_Columns"); Columns = theConf->GetBlob("OptionsWindow/Run_Columns");
if (!Columns.isEmpty()) ui.treeRun->header()->restoreState(Columns); if (!Columns.isEmpty()) ui.treeRun->header()->restoreState(Columns);
Columns = theConf->GetBlob("OptionsWindow/AutoRun_Columns"); Columns = theConf->GetBlob("OptionsWindow/Triggers_Columns");
if (!Columns.isEmpty()) ui.treeAutoStart->header()->restoreState(Columns); if (!Columns.isEmpty()) ui.treeTriggers->header()->restoreState(Columns);
Columns = theConf->GetBlob("OptionsWindow/Groups_Columns"); Columns = theConf->GetBlob("OptionsWindow/Groups_Columns");
if (!Columns.isEmpty()) ui.treeGroups->header()->restoreState(Columns); if (!Columns.isEmpty()) ui.treeGroups->header()->restoreState(Columns);
Columns = theConf->GetBlob("OptionsWindow/Forced_Columns"); Columns = theConf->GetBlob("OptionsWindow/Forced_Columns");
@ -330,7 +330,7 @@ COptionsWindow::~COptionsWindow()
theConf->SetBlob("OptionsWindow/Window_Geometry",saveGeometry()); theConf->SetBlob("OptionsWindow/Window_Geometry",saveGeometry());
theConf->SetBlob("OptionsWindow/Run_Columns", ui.treeRun->header()->saveState()); theConf->SetBlob("OptionsWindow/Run_Columns", ui.treeRun->header()->saveState());
theConf->SetBlob("OptionsWindow/AutoRun_Columns", ui.treeAutoStart->header()->saveState()); theConf->SetBlob("OptionsWindow/Triggers_Columns", ui.treeTriggers->header()->saveState());
theConf->SetBlob("OptionsWindow/Groups_Columns", ui.treeGroups->header()->saveState()); theConf->SetBlob("OptionsWindow/Groups_Columns", ui.treeGroups->header()->saveState());
theConf->SetBlob("OptionsWindow/Forced_Columns", ui.treeForced->header()->saveState()); theConf->SetBlob("OptionsWindow/Forced_Columns", ui.treeForced->header()->saveState());
theConf->SetBlob("OptionsWindow/Stop_Columns", ui.treeStop->header()->saveState()); theConf->SetBlob("OptionsWindow/Stop_Columns", ui.treeStop->header()->saveState());

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

@ -51,11 +51,6 @@ private slots:
void OnAddCommand(); void OnAddCommand();
void OnDelCommand(); void OnDelCommand();
void OnAddAutoCmd();
void OnAddAutoExe();
void OnDelAutoSvc();
void OnDelAuto();
void OnAddGroup(); void OnAddGroup();
void OnAddProg(); void OnAddProg();
void OnDelProg(); void OnDelProg();
@ -122,16 +117,23 @@ private slots:
void OnDelRecEntry(); void OnDelRecEntry();
void OnShowRecoveryTmpl() { LoadRecoveryListTmpl(true); } void OnShowRecoveryTmpl() { LoadRecoveryListTmpl(true); }
// advanced
void OnNoWindowRename();
void OnTriggerChanged() { m_AdvancedChanged = true; OnOptChanged(); }
void OnShowTriggersTmpl() { ShowTriggersTmpl(true); }
void OnAddAutoRun();
void OnAddAutoSvc();
void OnAddAutoExec(); void OnAddAutoExec();
void OnDelAutoExec(); void OnAddDeleteCmd();
void OnDelAuto();
void OnAddProcess(); void OnAddProcess();
void OnDelProcess(); void OnDelProcess();
void OnNoWindowRename();
void OnAddUser(); void OnAddUser();
void OnDelUser(); void OnDelUser();
//
void OnFilterTemplates() { ShowTemplates(); } void OnFilterTemplates() { ShowTemplates(); }
void OnTemplateClicked(QTreeWidgetItem* pItem, int Column); void OnTemplateClicked(QTreeWidgetItem* pItem, int Column);
@ -230,6 +232,13 @@ protected:
eWriteOnly eWriteOnly
}; };
enum ETriggerAction {
eOnStartCmd,
eOnStartSvc,
eAutoExec,
eDeleteCmd
};
void SetProgramItem(QString Program, QTreeWidgetItem* pItem, int Column); void SetProgramItem(QString Program, QTreeWidgetItem* pItem, int Column);
QString SelectProgram(bool bOrGroup = true); QString SelectProgram(bool bOrGroup = true);
@ -248,8 +257,6 @@ protected:
void SaveConfig(); void SaveConfig();
void UpdateCurrentTab(); void UpdateCurrentTab();
void AddAutoRunItem(const QString& Value, int Type);
void AddRunItem(const QString& Name, const QString& Command); void AddRunItem(const QString& Name, const QString& Command);
void CreateGeneral(); void CreateGeneral();
@ -324,10 +331,14 @@ protected:
void AddRecoveryEntry(const QString& Name, int type, const QString& Template = QString()); void AddRecoveryEntry(const QString& Name, int type, const QString& Template = QString());
void SaveRecoveryList(); void SaveRecoveryList();
// advanced
void CreateAdvanced(); void CreateAdvanced();
void LoadAdvanced(); void LoadAdvanced();
void SaveAdvanced(); void SaveAdvanced();
void UpdateBoxIsolation(); void UpdateBoxIsolation();
void ShowTriggersTmpl(bool bUpdate = false);
void AddTriggerItem(const QString& Value, ETriggerAction Type, const QString& Template = QString());
//
void CreateDebug(); void CreateDebug();
void LoadDebug(); void LoadDebug();

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

@ -203,13 +203,20 @@ void CSettingsWindow::closeEvent(QCloseEvent *e)
Qt::CheckState CSettingsWindow__IsContextMenu() Qt::CheckState CSettingsWindow__IsContextMenu()
{ {
QString cmd = CSbieUtils::GetContextMenuStartCmd(); QString cmd = CSbieUtils::GetContextMenuStartCmd();
if (cmd.contains("sandman.exe", Qt::CaseInsensitive)) if (cmd.contains("SandMan.exe", Qt::CaseInsensitive))
return Qt::Checked; // set up and sandman return Qt::Checked; // set up and sandman
if (!cmd.isEmpty()) // ... probably sbiectrl.exe if (!cmd.isEmpty()) // ... probably sbiectrl.exe
return Qt::PartiallyChecked; return Qt::PartiallyChecked;
return Qt::Unchecked; // not set up return Qt::Unchecked; // not set up
} }
void CSettingsWindow__AddContextMenu()
{
CSbieUtils::AddContextMenu(QApplication::applicationDirPath().replace("/", "\\") + "\\SandMan.exe",
CSettingsWindow::tr("Run &Sandboxed"), CSettingsWindow::tr("Explore &Sandboxed"),
QApplication::applicationDirPath().replace("/", "\\") + "\\Start.exe");
}
void CSettingsWindow::LoadSettings() void CSettingsWindow::LoadSettings()
{ {
ui.uiLang->setCurrentIndex(ui.uiLang->findData(theConf->GetString("Options/UiLanguage"))); ui.uiLang->setCurrentIndex(ui.uiLang->findData(theConf->GetString("Options/UiLanguage")));
@ -230,6 +237,7 @@ void CSettingsWindow::LoadSettings()
} }
ui.chkShellMenu->setCheckState(CSettingsWindow__IsContextMenu()); ui.chkShellMenu->setCheckState(CSettingsWindow__IsContextMenu());
ui.chkShellMenu2->setChecked(CSbieUtils::HasContextMenu2());
ui.chkAlwaysDefault->setChecked(theConf->GetBool("Options/RunInDefaultBox", false)); ui.chkAlwaysDefault->setChecked(theConf->GetBool("Options/RunInDefaultBox", false));
ui.chkDarkTheme->setCheckState(CSettingsWindow__Int2Chk(theConf->GetInt("Options/UseDarkTheme", 2))); ui.chkDarkTheme->setCheckState(CSettingsWindow__Int2Chk(theConf->GetInt("Options/UseDarkTheme", 2)));
@ -370,12 +378,21 @@ void CSettingsWindow::SaveSettings()
if (ui.chkShellMenu->checkState() != CSettingsWindow__IsContextMenu()) if (ui.chkShellMenu->checkState() != CSettingsWindow__IsContextMenu())
{ {
if (ui.chkShellMenu->isChecked()) { if (ui.chkShellMenu->isChecked())
CSbieUtils::AddContextMenu(QApplication::applicationDirPath().replace("/", "\\") + "\\SandMan.exe", CSettingsWindow__AddContextMenu();
QApplication::applicationDirPath().replace("/", "\\") + "\\Start.exe"); else
} else
CSbieUtils::RemoveContextMenu(); CSbieUtils::RemoveContextMenu();
} }
if (ui.chkShellMenu2->isChecked() != CSbieUtils::HasContextMenu2()) {
if (ui.chkShellMenu2->isChecked()) {
CSbieUtils::AddContextMenu2(QApplication::applicationDirPath().replace("/", "\\") + "\\Start.exe",
tr("Run &Un-Sandboxed"),
QApplication::applicationDirPath().replace("/", "\\") + "\\Start.exe");
} else
CSbieUtils::RemoveContextMenu2();
}
theConf->SetValue("Options/RunInDefaultBox", ui.chkAlwaysDefault->isChecked()); theConf->SetValue("Options/RunInDefaultBox", ui.chkAlwaysDefault->isChecked());
theConf->SetValue("Options/ShowNotifications", ui.chkNotifications->isChecked()); theConf->SetValue("Options/ShowNotifications", ui.chkNotifications->isChecked());

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

@ -87,6 +87,8 @@ private:
Ui::SettingsWindow ui; Ui::SettingsWindow ui;
}; };
void CSettingsWindow__AddContextMenu();
void WindowsMoveFile(const QString& from, const QString& to); void WindowsMoveFile(const QString& from, const QString& to);
extern quint32 g_FeatureFlags; extern quint32 g_FeatureFlags;