1.0.11
This commit is contained in:
parent
f54d0a271a
commit
48801788d8
20
CHANGELOG.md
20
CHANGELOG.md
|
@ -5,6 +5,26 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.0.11 / 5.55.11] - 2022-02-14
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- added optional tray notification when a box content gets auto deleted
|
||||||
|
- added FreeDownloadManager template
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- the asynchroniouse box operations introduced in the last build are due to a pupular request now disabled by default
|
||||||
|
- moved sys tray options from general to shell integration tab
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- fixed compatybility issue with SECUROM [#1597](https://github.com/sandboxie-plus/Sandboxie/issues/1597)
|
||||||
|
- fixed modality issue [#1615](https://github.com/sandboxie-plus/Sandboxie/issues/1615)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [1.0.10 / 5.55.10] - 2022-02-06
|
## [1.0.10 / 5.55.10] - 2022-02-06
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
#ifndef _MY_VERSION_H
|
#ifndef _MY_VERSION_H
|
||||||
#define _MY_VERSION_H
|
#define _MY_VERSION_H
|
||||||
|
|
||||||
#define MY_VERSION_BINARY 5,55,10
|
#define MY_VERSION_BINARY 5,55,11
|
||||||
#define MY_VERSION_STRING "5.55.10"
|
#define MY_VERSION_STRING "5.55.11"
|
||||||
#define MY_VERSION_COMPAT "5.55.0" // this refers to the driver ABI compatibility
|
#define MY_VERSION_COMPAT "5.55.0" // this refers to the driver ABI compatibility
|
||||||
|
|
||||||
// These #defines are used by either Resource Compiler or NSIS installer
|
// These #defines are used by either Resource Compiler or NSIS installer
|
||||||
|
|
|
@ -34,14 +34,21 @@ public:
|
||||||
{
|
{
|
||||||
if (*m_ptr && watchActive)
|
if (*m_ptr && watchActive)
|
||||||
{
|
{
|
||||||
free(*m_ptr);
|
HeapFree(GetProcessHeap(), 0, *m_ptr);
|
||||||
*m_ptr = 0;
|
*m_ptr = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void* Alloc(size_t size) {
|
||||||
|
return HeapAlloc(GetProcessHeap(), 0, size);
|
||||||
|
}
|
||||||
|
|
||||||
void disableWatch() { watchActive = false; }
|
void disableWatch() { watchActive = false; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define NEW(size) \
|
||||||
|
CMemPtr::Alloc(size)
|
||||||
|
|
||||||
#define WATCH(ptr) \
|
#define WATCH(ptr) \
|
||||||
CMemPtr watch_##ptr((void**)&ptr)
|
CMemPtr watch_##ptr((void**)&ptr)
|
||||||
|
|
||||||
|
|
|
@ -37,17 +37,6 @@
|
||||||
//HANDLE g_heap;
|
//HANDLE g_heap;
|
||||||
BOOL g_isWow64 = TRUE;
|
BOOL g_isWow64 = TRUE;
|
||||||
|
|
||||||
void* malloc(size_t size)
|
|
||||||
{
|
|
||||||
return HeapAlloc(GetProcessHeap(), 0, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
void free(void* ptr)
|
|
||||||
{
|
|
||||||
if (nullptr != ptr)
|
|
||||||
HeapFree(GetProcessHeap(), 0, ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "CMemPtr.h"
|
#include "CMemPtr.h"
|
||||||
|
|
||||||
/*int _wcsicmp(const wchar_t *string1, const wchar_t *string2)
|
/*int _wcsicmp(const wchar_t *string1, const wchar_t *string2)
|
||||||
|
@ -329,7 +318,7 @@ extern "C" DWORD64 __cdecl GetModuleHandle64(const wchar_t* lpModuleName)
|
||||||
{
|
{
|
||||||
getMem64(&head, head.InLoadOrderLinks.Flink, sizeof(LDR_DATA_TABLE_ENTRY64));
|
getMem64(&head, head.InLoadOrderLinks.Flink, sizeof(LDR_DATA_TABLE_ENTRY64));
|
||||||
|
|
||||||
wchar_t* tempBuf = (wchar_t*)malloc(head.BaseDllName.MaximumLength);
|
wchar_t* tempBuf = (wchar_t*)NEW(head.BaseDllName.MaximumLength);
|
||||||
if (nullptr == tempBuf)
|
if (nullptr == tempBuf)
|
||||||
return 0;
|
return 0;
|
||||||
WATCH(tempBuf);
|
WATCH(tempBuf);
|
||||||
|
@ -373,19 +362,19 @@ DWORD64 getLdrGetProcedureAddress()
|
||||||
IMAGE_EXPORT_DIRECTORY ied;
|
IMAGE_EXPORT_DIRECTORY ied;
|
||||||
getMem64(&ied, modBase + idd.VirtualAddress, sizeof(ied));
|
getMem64(&ied, modBase + idd.VirtualAddress, sizeof(ied));
|
||||||
|
|
||||||
DWORD* rvaTable = (DWORD*)malloc(sizeof(DWORD)*ied.NumberOfFunctions);
|
DWORD* rvaTable = (DWORD*)NEW(sizeof(DWORD)*ied.NumberOfFunctions);
|
||||||
if (nullptr == rvaTable)
|
if (nullptr == rvaTable)
|
||||||
return 0;
|
return 0;
|
||||||
WATCH(rvaTable);
|
WATCH(rvaTable);
|
||||||
getMem64(rvaTable, modBase + ied.AddressOfFunctions, sizeof(DWORD)*ied.NumberOfFunctions);
|
getMem64(rvaTable, modBase + ied.AddressOfFunctions, sizeof(DWORD)*ied.NumberOfFunctions);
|
||||||
|
|
||||||
WORD* ordTable = (WORD*)malloc(sizeof(WORD)*ied.NumberOfFunctions);
|
WORD* ordTable = (WORD*)NEW(sizeof(WORD)*ied.NumberOfFunctions);
|
||||||
if (nullptr == ordTable)
|
if (nullptr == ordTable)
|
||||||
return 0;
|
return 0;
|
||||||
WATCH(ordTable);
|
WATCH(ordTable);
|
||||||
getMem64(ordTable, modBase + ied.AddressOfNameOrdinals, sizeof(WORD)*ied.NumberOfFunctions);
|
getMem64(ordTable, modBase + ied.AddressOfNameOrdinals, sizeof(WORD)*ied.NumberOfFunctions);
|
||||||
|
|
||||||
DWORD* nameTable = (DWORD*)malloc(sizeof(DWORD)*ied.NumberOfNames);
|
DWORD* nameTable = (DWORD*)NEW(sizeof(DWORD)*ied.NumberOfNames);
|
||||||
if (nullptr == nameTable)
|
if (nullptr == nameTable)
|
||||||
return 0;
|
return 0;
|
||||||
WATCH(nameTable);
|
WATCH(nameTable);
|
||||||
|
|
|
@ -407,14 +407,37 @@ void DbgPrint(const char* format, ...)
|
||||||
va_list va_args;
|
va_list va_args;
|
||||||
va_start(va_args, format);
|
va_start(va_args, format);
|
||||||
|
|
||||||
char *tmp1 = Dll_AllocTemp(510);
|
char tmp1[510];
|
||||||
|
|
||||||
extern int(*P_vsnprintf)(char *_Buffer, size_t Count, const char * const, va_list Args);
|
extern int(*P_vsnprintf)(char *_Buffer, size_t Count, const char * const, va_list Args);
|
||||||
P_vsnprintf(tmp1, 510, format, va_args);
|
P_vsnprintf(tmp1, 510, format, va_args);
|
||||||
|
|
||||||
OutputDebugStringA(tmp1);
|
OutputDebugStringA(tmp1);
|
||||||
|
|
||||||
Dll_Free(tmp1);
|
va_end(va_args);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------
|
||||||
|
// DbgPrint
|
||||||
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
void DbgTrace(const char* format, ...)
|
||||||
|
{
|
||||||
|
va_list va_args;
|
||||||
|
va_start(va_args, format);
|
||||||
|
|
||||||
|
char tmp1[510];
|
||||||
|
WCHAR tmp2[510];
|
||||||
|
|
||||||
|
extern int(*P_vsnprintf)(char *_Buffer, size_t Count, const char * const, va_list Args);
|
||||||
|
P_vsnprintf(tmp1, 510, format, va_args);
|
||||||
|
|
||||||
|
Sbie_snwprintf((WCHAR *)tmp2, 510, L"%S", tmp1);
|
||||||
|
|
||||||
|
SbieApi_MonitorPut2(MONITOR_OTHER | MONITOR_TRACE, tmp2, FALSE);
|
||||||
|
|
||||||
va_end(va_args);
|
va_end(va_args);
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
int Debug_Init(void);
|
int Debug_Init(void);
|
||||||
|
|
||||||
void DbgPrint(const char* format, ...);
|
void DbgPrint(const char* format, ...);
|
||||||
|
void DbgTrace(const char* format, ...);
|
||||||
|
|
||||||
#endif WITH_DEBUG
|
#endif WITH_DEBUG
|
||||||
|
|
||||||
|
|
|
@ -1323,7 +1323,7 @@ _FX BOOL Proc_AlternateCreateProcess(
|
||||||
void *lpCurrentDirectory, LPPROCESS_INFORMATION lpProcessInformation,
|
void *lpCurrentDirectory, LPPROCESS_INFORMATION lpProcessInformation,
|
||||||
BOOL *ReturnValue)
|
BOOL *ReturnValue)
|
||||||
{
|
{
|
||||||
if (SbieApi_QueryConfBool(NULL, L"BlockSoftwareUpdaters", FALSE))
|
//if (SbieApi_QueryConfBool(NULL, L"BlockSoftwareUpdaters", TRUE))
|
||||||
if (Proc_IsSoftwareUpdateW(lpApplicationName ? lpApplicationName : lpCommandLine)) {
|
if (Proc_IsSoftwareUpdateW(lpApplicationName ? lpApplicationName : lpCommandLine)) {
|
||||||
|
|
||||||
SetLastError(ERROR_ACCESS_DENIED);
|
SetLastError(ERROR_ACCESS_DENIED);
|
||||||
|
|
|
@ -3155,6 +3155,12 @@ OpenClsid={AC746233-E9D3-49CD-862F-068F7B7CCCA4}
|
||||||
# prevent access to host port
|
# prevent access to host port
|
||||||
# BlockPort=1001
|
# BlockPort=1001
|
||||||
|
|
||||||
|
[Template_FreeDownloadManager]
|
||||||
|
Tmpl.Title=Free Download Manager
|
||||||
|
Tmpl.Class=Download
|
||||||
|
Tmpl.Url=http://www.freedownloadmanager.org/
|
||||||
|
RpcMgmtSetComTimeout=fdm.exe,y
|
||||||
|
|
||||||
[Template_SothinkWebVideoDownloader]
|
[Template_SothinkWebVideoDownloader]
|
||||||
Tmpl.Title=Sothink Web Video Downloader Stand-alone
|
Tmpl.Title=Sothink Web Video Downloader Stand-alone
|
||||||
Tmpl.Class=Download
|
Tmpl.Class=Download
|
||||||
|
|
|
@ -459,9 +459,15 @@ bool InitConsole(bool bCreateIfNeeded)
|
||||||
//
|
//
|
||||||
|
|
||||||
void SafeShow(QWidget* pWidget) {
|
void SafeShow(QWidget* pWidget) {
|
||||||
|
static bool Lock = false;
|
||||||
pWidget->setProperty("windowOpacity", 0.0);
|
pWidget->setProperty("windowOpacity", 0.0);
|
||||||
pWidget->show();
|
if (Lock == false) {
|
||||||
QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeSocketNotifiers);
|
Lock = true;
|
||||||
|
pWidget->show();
|
||||||
|
QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeSocketNotifiers);
|
||||||
|
Lock = false;
|
||||||
|
} else
|
||||||
|
pWidget->show();
|
||||||
pWidget->setProperty("windowOpacity", 1.0);
|
pWidget->setProperty("windowOpacity", 1.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>634</width>
|
<width>634</width>
|
||||||
<height>440</height>
|
<height>451</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
|
@ -54,108 +54,7 @@
|
||||||
<layout class="QGridLayout" name="gridLayout_9">
|
<layout class="QGridLayout" name="gridLayout_9">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<layout class="QGridLayout" name="gridLayout_8">
|
<layout class="QGridLayout" name="gridLayout_8">
|
||||||
<item row="8" column="0">
|
<item row="9" column="2">
|
||||||
<widget class="QLabel" name="label_5">
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
<kerning>true</kerning>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Systray options</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="1" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkWatchConfig">
|
|
||||||
<property name="text">
|
|
||||||
<string>Watch Sandboxie.ini for changes</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkDarkTheme">
|
|
||||||
<property name="text">
|
|
||||||
<string>Use Dark Theme (fully applied after a restart)</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkShowRecovery">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show first recovery window when emptying sandboxes</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="1" colspan="3">
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="chkPanic">
|
|
||||||
<property name="text">
|
|
||||||
<string>Hotkey for terminating all boxed processes:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QKeySequenceEdit" name="keyPanic"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item row="12" 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="9" column="1">
|
|
||||||
<widget class="QComboBox" name="cmbSysTray"/>
|
|
||||||
</item>
|
|
||||||
<item row="11" column="1">
|
|
||||||
<widget class="QComboBox" name="cmbOnClose"/>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="label_19">
|
|
||||||
<property name="text">
|
|
||||||
<string>UI Language:</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkSandboxUrls">
|
|
||||||
<property name="text">
|
|
||||||
<string>Open urls from this ui sandboxed</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkNotifications">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Notifications for relevant log Messages</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="12" column="2">
|
|
||||||
<spacer name="horizontalSpacer_8">
|
<spacer name="horizontalSpacer_8">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
|
@ -168,26 +67,10 @@
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="11" column="0">
|
<item row="8" column="1" colspan="2">
|
||||||
<widget class="QLabel" name="label_18">
|
<widget class="QCheckBox" name="chkWatchConfig">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>On main window close:</string>
|
<string>Watch Sandboxie.ini for changes</string>
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="0">
|
|
||||||
<widget class="QLabel" name="label_20">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Icon in Systray:</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
<property name="openExternalLinks">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -198,6 +81,46 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_19">
|
||||||
|
<property name="text">
|
||||||
|
<string>UI Language:</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" 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="4" column="1" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="chkShowRecovery">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show first recovery window when emptying sandboxes</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="chkDarkTheme">
|
||||||
|
<property name="text">
|
||||||
|
<string>Use Dark Theme (fully applied after a restart)</string>
|
||||||
|
</property>
|
||||||
|
<property name="tristate">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="0" column="2">
|
<item row="0" column="2">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -211,21 +134,46 @@
|
||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QComboBox" name="uiLang"/>
|
<widget class="QComboBox" name="uiLang"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="10" column="0">
|
<item row="2" column="1" colspan="2">
|
||||||
<widget class="QLabel" name="label_21">
|
<widget class="QCheckBox" name="chkNotifications">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show boxes in tray list:</string>
|
<string>Show Notifications for relevant log Messages</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="checked">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="openExternalLinks">
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="chkSandboxUrls">
|
||||||
|
<property name="text">
|
||||||
|
<string>Open urls from this ui sandboxed</string>
|
||||||
|
</property>
|
||||||
|
<property name="tristate">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="10" column="1">
|
<item row="6" column="1" colspan="2">
|
||||||
<widget class="QComboBox" name="cmbTrayBoxes"/>
|
<widget class="QCheckBox" name="chkAsyncBoxOps">
|
||||||
|
<property name="text">
|
||||||
|
<string>Run box operations asynchronously whenever possible (like content deletion)</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="1" colspan="3">
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="chkPanic">
|
||||||
|
<property name="text">
|
||||||
|
<string>Hotkey for terminating all boxed processes:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QKeySequenceEdit" name="keyPanic"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
@ -238,6 +186,69 @@
|
||||||
<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="4" column="1" colspan="3">
|
||||||
|
<widget class="QCheckBox" name="chkShellMenu">
|
||||||
|
<property name="text">
|
||||||
|
<string>Add 'Run Sandboxed' to the explorer context menu</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="3">
|
||||||
|
<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="12" 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>
|
||||||
|
<item row="11" column="0">
|
||||||
|
<widget class="QLabel" name="label_18">
|
||||||
|
<property name="text">
|
||||||
|
<string>On main window close:</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1" colspan="3">
|
||||||
|
<widget class="QCheckBox" name="chkSvcStart">
|
||||||
|
<property name="text">
|
||||||
|
<string>Start UI when a sandboxed process is started</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="0">
|
||||||
|
<widget class="QLabel" name="label_21">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show boxes in tray list:</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
<property name="openExternalLinks">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</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">
|
||||||
|
@ -252,6 +263,20 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="5" column="2" colspan="3">
|
||||||
|
<widget class="QCheckBox" name="chkAlwaysDefault">
|
||||||
|
<property name="text">
|
||||||
|
<string>Always use DefaultBox</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="2" colspan="3">
|
||||||
|
<widget class="QCheckBox" name="chkShellMenu2">
|
||||||
|
<property name="text">
|
||||||
|
<string>Add 'Run Un-Sandboxed' to the context menu</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</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">
|
||||||
|
@ -266,55 +291,7 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1" colspan="2">
|
<item row="12" column="3" colspan="2">
|
||||||
<widget class="QCheckBox" name="chkAutoStart">
|
|
||||||
<property name="text">
|
|
||||||
<string>Start UI with Windows</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkShellMenu">
|
|
||||||
<property name="text">
|
|
||||||
<string>Add 'Run Sandboxed' to the explorer context menu</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</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">
|
<spacer name="horizontalSpacer_2">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
|
@ -327,15 +304,65 @@
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="1">
|
<item row="8" column="0">
|
||||||
<spacer name="verticalSpacer_6">
|
<widget class="QLabel" name="label_20">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Icon in Systray:</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
<property name="openExternalLinks">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1" colspan="3">
|
||||||
|
<widget class="QCheckBox" name="chkAutoStart">
|
||||||
|
<property name="text">
|
||||||
|
<string>Start UI with Windows</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="10" column="1" colspan="3">
|
||||||
|
<widget class="QCheckBox" name="chkBoxOpsNotify">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show a tray notification when automatic box operations are started</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="0">
|
||||||
|
<widget class="QLabel" name="label_5">
|
||||||
|
<property name="font">
|
||||||
|
<font>
|
||||||
|
<weight>75</weight>
|
||||||
|
<bold>true</bold>
|
||||||
|
<kerning>true</kerning>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Systray options</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="1" colspan="2">
|
||||||
|
<widget class="QComboBox" name="cmbSysTray"/>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="1" colspan="2">
|
||||||
|
<widget class="QComboBox" name="cmbTrayBoxes"/>
|
||||||
|
</item>
|
||||||
|
<item row="11" column="1" colspan="2">
|
||||||
|
<widget class="QComboBox" name="cmbOnClose"/>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="2">
|
||||||
|
<spacer name="horizontalSpacer_9">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0">
|
<property name="sizeHint" stdset="0">
|
||||||
<size>
|
<size>
|
||||||
<width>20</width>
|
<width>40</width>
|
||||||
<height>40</height>
|
<height>20</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
|
@ -433,7 +460,7 @@
|
||||||
<item row="7" column="1" colspan="5">
|
<item row="7" column="1" colspan="5">
|
||||||
<widget class="QCheckBox" name="chkObjCb">
|
<widget class="QCheckBox" name="chkObjCb">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Activate Kernel Mode Object Filtering (experimental)</string>
|
<string>Activate Kernel Mode Object Filtering</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -900,6 +900,20 @@ void CSandMan::timerEvent(QTimerEvent* pEvent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CSandMan::DoDeleteCmd(const CSandBoxPtr &pBox)
|
||||||
|
{
|
||||||
|
foreach(const QString& Value, pBox->GetTextList("OnBoxDelete", true, false, true)) {
|
||||||
|
QString Value2 = pBox->Expand(Value);
|
||||||
|
CSbieProgressPtr pProgress = CSbieUtils::RunCommand(Value2, true);
|
||||||
|
if (!pProgress.isNull()) {
|
||||||
|
AddAsyncOp(pProgress, true, tr("Executing OnBoxDelete: %1").arg(Value2));
|
||||||
|
if (pProgress->IsCanceled())
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void CSandMan::OnBoxClosed(const QString& BoxName)
|
void CSandMan::OnBoxClosed(const QString& BoxName)
|
||||||
{
|
{
|
||||||
CSandBoxPtr pBox = theAPI->GetBoxByName(BoxName);
|
CSandBoxPtr pBox = theAPI->GetBoxByName(BoxName);
|
||||||
|
@ -913,9 +927,32 @@ 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;
|
||||||
|
|
||||||
auto pBoxEx = pBox.objectCast<CSandBoxPlus>();
|
if(theConf->GetBool("Options/AutoBoxOpsNotify", false))
|
||||||
SB_STATUS Status = pBoxEx->DeleteContentAsync(DeleteShapshots);
|
OnLogMessage(tr("Auto deleting content of %1").arg(BoxName), true);
|
||||||
CheckResults(QList<SB_STATUS>() << Status);
|
|
||||||
|
if (theConf->GetBool("Options/UseAsyncBoxOps", false))
|
||||||
|
{
|
||||||
|
auto pBoxEx = pBox.objectCast<CSandBoxPlus>();
|
||||||
|
SB_STATUS Status = pBoxEx->DeleteContentAsync(DeleteShapshots);
|
||||||
|
CheckResults(QList<SB_STATUS>() << Status);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!DoDeleteCmd(pBox))
|
||||||
|
return;
|
||||||
|
|
||||||
|
SB_PROGRESS Status;
|
||||||
|
if (!DeleteShapshots && pBox->HasSnapshots()) { // in auto delete mdoe always return to last snapshot
|
||||||
|
QString Current;
|
||||||
|
pBox->GetDefaultSnapshot(&Current);
|
||||||
|
Status = pBox->SelectSnapshot(Current);
|
||||||
|
}
|
||||||
|
else // if there are no snapshots just use the normal cleaning procedure
|
||||||
|
Status = pBox->CleanBox();
|
||||||
|
|
||||||
|
if (Status.GetStatus() == OP_ASYNC)
|
||||||
|
AddAsyncOp(Status.GetValue(), true, tr("Auto Deleting %1 content").arg(BoxName));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1156,7 +1193,7 @@ void CSandMan::OnLogSbieMessage(quint32 MsgCode, const QStringList& MsgData, qui
|
||||||
Message = tr("The box %1 is configured to use features exclusively available to project supporters, these presets will be ignored.").arg(MsgData[1]);
|
Message = tr("The box %1 is configured to use features exclusively available to project supporters, these presets will be ignored.").arg(MsgData[1]);
|
||||||
Message.append(tr("<br /><a href=\"https://sandboxie-plus.com/go.php?to=sbie-get-cert\">Become a project supporter</a>, and receive a <a href=\"https://sandboxie-plus.com/go.php?to=sbie-cert\">supporter certificate</a>"));
|
Message.append(tr("<br /><a href=\"https://sandboxie-plus.com/go.php?to=sbie-get-cert\">Become a project supporter</a>, and receive a <a href=\"https://sandboxie-plus.com/go.php?to=sbie-cert\">supporter certificate</a>"));
|
||||||
|
|
||||||
QMessageBox msgBox;
|
QMessageBox msgBox(this);
|
||||||
msgBox.setTextFormat(Qt::RichText);
|
msgBox.setTextFormat(Qt::RichText);
|
||||||
msgBox.setIcon(QMessageBox::Critical);
|
msgBox.setIcon(QMessageBox::Critical);
|
||||||
msgBox.setWindowTitle("Sandboxie-Plus");
|
msgBox.setWindowTitle("Sandboxie-Plus");
|
||||||
|
@ -1206,7 +1243,7 @@ bool CSandMan::CheckCertificate()
|
||||||
// return false;
|
// return false;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
QMessageBox msgBox;
|
QMessageBox msgBox(this);
|
||||||
msgBox.setTextFormat(Qt::RichText);
|
msgBox.setTextFormat(Qt::RichText);
|
||||||
msgBox.setIcon(QMessageBox::Information);
|
msgBox.setIcon(QMessageBox::Information);
|
||||||
msgBox.setWindowTitle("Sandboxie-Plus");
|
msgBox.setWindowTitle("Sandboxie-Plus");
|
||||||
|
@ -1589,9 +1626,9 @@ void CSandMan::HandleMaintenance(SB_RESULT(void*) Status)
|
||||||
if (dwStatus != 0)
|
if (dwStatus != 0)
|
||||||
{
|
{
|
||||||
if(m_bStopPending)
|
if(m_bStopPending)
|
||||||
QMessageBox::warning(NULL, tr("Sandboxie-Plus - Error"), tr("Failed to stop all Sandboxie components"));
|
QMessageBox::warning(this, tr("Sandboxie-Plus - Error"), tr("Failed to stop all Sandboxie components"));
|
||||||
else if(m_bConnectPending)
|
else if(m_bConnectPending)
|
||||||
QMessageBox::warning(NULL, tr("Sandboxie-Plus - Error"), tr("Failed to start required Sandboxie components"));
|
QMessageBox::warning(this, tr("Sandboxie-Plus - Error"), tr("Failed to start required Sandboxie components"));
|
||||||
|
|
||||||
OnLogMessage(tr("Maintenance operation failed (%1)").arg((quint32)dwStatus));
|
OnLogMessage(tr("Maintenance operation failed (%1)").arg((quint32)dwStatus));
|
||||||
CheckResults(QList<SB_STATUS>() << SB_ERR(dwStatus));
|
CheckResults(QList<SB_STATUS>() << SB_ERR(dwStatus));
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
bool DoDeleteCmd(const CSandBoxPtr &pBox);
|
||||||
|
|
||||||
bool AddAsyncOp(const CSbieProgressPtr& pProgress, bool bWait = false, const QString& InitialMsg = QString());
|
bool AddAsyncOp(const CSbieProgressPtr& pProgress, bool bWait = false, const QString& InitialMsg = QString());
|
||||||
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);
|
||||||
|
|
|
@ -1021,10 +1021,37 @@ void CSbieView::OnSandBoxAction(QAction* Action)
|
||||||
|
|
||||||
foreach(const CSandBoxPtr &pBox, SandBoxes)
|
foreach(const CSandBoxPtr &pBox, SandBoxes)
|
||||||
{
|
{
|
||||||
auto pBoxEx = pBox.objectCast<CSandBoxPlus>();
|
if (theConf->GetBool("Options/UseAsyncBoxOps", false))
|
||||||
SB_STATUS Status = pBoxEx->DeleteContentAsync(DeleteShapshots);
|
{
|
||||||
if (Status.IsError())
|
auto pBoxEx = pBox.objectCast<CSandBoxPlus>();
|
||||||
Results.append(Status);
|
SB_STATUS Status = pBoxEx->DeleteContentAsync(DeleteShapshots);
|
||||||
|
if (Status.IsError())
|
||||||
|
Results.append(Status);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SB_STATUS Status1 = pBox->TerminateAll();
|
||||||
|
if (Status1.IsError()) {
|
||||||
|
Results.append(Status1);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!theGUI->DoDeleteCmd(pBox))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
SB_PROGRESS Status;
|
||||||
|
if (!DeleteShapshots && pBox->HasSnapshots()) {
|
||||||
|
QString Default = pBox->GetDefaultSnapshot();
|
||||||
|
Status = pBox->SelectSnapshot(Default);
|
||||||
|
}
|
||||||
|
else // if there are no snapshots jut use the normal cleaning procedure
|
||||||
|
Status = pBox->CleanBox();
|
||||||
|
|
||||||
|
if (Status.GetStatus() == OP_ASYNC)
|
||||||
|
theGUI->AddAsyncOp(Status.GetValue());
|
||||||
|
else if (Status.IsError())
|
||||||
|
Results.append(Status);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (Action == m_pMenuEmptyBox)
|
else if (Action == m_pMenuEmptyBox)
|
||||||
|
|
|
@ -195,18 +195,19 @@ void COptionsWindow::ParseAndAddAccessEntry(EAccessEntry EntryType, const QStrin
|
||||||
case eOpenPipePath: Type = eFile; Mode = eOpen4All; break;
|
case eOpenPipePath: Type = eFile; Mode = eOpen4All; break;
|
||||||
case eClosedFilePath: Type = eFile; Mode = eClosed; break;
|
case eClosedFilePath: Type = eFile; Mode = eClosed; break;
|
||||||
case eReadFilePath: Type = eFile; Mode = eReadOnly; break;
|
case eReadFilePath: Type = eFile; Mode = eReadOnly; break;
|
||||||
case eWriteFilePath: Type = eFile; Mode = eWriteOnly; break;
|
case eWriteFilePath: Type = eFile; Mode = eBoxOnly; break;
|
||||||
|
|
||||||
case eNormalKeyPath: Type = eKey; Mode = eNormal; break;
|
case eNormalKeyPath: Type = eKey; Mode = eNormal; break;
|
||||||
case eOpenKeyPath: Type = eKey; Mode = eOpen; break;
|
case eOpenKeyPath: Type = eKey; Mode = eOpen; break;
|
||||||
case eOpenConfPath: Type = eKey; Mode = eOpen4All;break;
|
case eOpenConfPath: Type = eKey; Mode = eOpen4All;break;
|
||||||
case eClosedKeyPath: Type = eKey; Mode = eClosed; break;
|
case eClosedKeyPath: Type = eKey; Mode = eClosed; break;
|
||||||
case eReadKeyPath: Type = eKey; Mode = eReadOnly; break;
|
case eReadKeyPath: Type = eKey; Mode = eReadOnly; break;
|
||||||
case eWriteKeyPath: Type = eKey; Mode = eWriteOnly; break;
|
case eWriteKeyPath: Type = eKey; Mode = eBoxOnly; break;
|
||||||
|
|
||||||
case eNormalIpcPath: Type = eIPC; Mode = eNormal; break;
|
case eNormalIpcPath: Type = eIPC; Mode = eNormal; break;
|
||||||
case eOpenIpcPath: Type = eIPC; Mode = eOpen; break;
|
case eOpenIpcPath: Type = eIPC; Mode = eOpen; break;
|
||||||
case eClosedIpcPath: Type = eIPC; Mode = eClosed; break;
|
case eClosedIpcPath: Type = eIPC; Mode = eClosed; break;
|
||||||
|
case eReadIpcPath: Type = eIPC; Mode = eReadOnly; break;
|
||||||
|
|
||||||
case eOpenWinClass: Type = eWnd; Mode = eOpen; break;
|
case eOpenWinClass: Type = eWnd; Mode = eOpen; break;
|
||||||
|
|
||||||
|
@ -243,7 +244,7 @@ QString COptionsWindow::GetAccessModeStr(EAccessMode Mode)
|
||||||
case eClosed: return tr("Closed");
|
case eClosed: return tr("Closed");
|
||||||
case eClosedRT: return tr("Closed RT");
|
case eClosedRT: return tr("Closed RT");
|
||||||
case eReadOnly: return tr("Read Only");
|
case eReadOnly: return tr("Read Only");
|
||||||
case eWriteOnly: return tr("Boxed Only");
|
case eBoxOnly: return tr("Box Only (Write Only)");
|
||||||
}
|
}
|
||||||
return tr("Unknown");
|
return tr("Unknown");
|
||||||
}
|
}
|
||||||
|
@ -328,7 +329,7 @@ QString COptionsWindow::MakeAccessStr(EAccessType Type, EAccessMode Mode)
|
||||||
case eOpen4All: return "OpenPipePath";
|
case eOpen4All: return "OpenPipePath";
|
||||||
case eClosed: return "ClosedFilePath";
|
case eClosed: return "ClosedFilePath";
|
||||||
case eReadOnly: return "ReadFilePath";
|
case eReadOnly: return "ReadFilePath";
|
||||||
case eWriteOnly: return "WriteFilePath";
|
case eBoxOnly: return "WriteFilePath";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case eKey:
|
case eKey:
|
||||||
|
@ -339,7 +340,7 @@ QString COptionsWindow::MakeAccessStr(EAccessType Type, EAccessMode Mode)
|
||||||
case eOpen4All: return "OpenConfPath";
|
case eOpen4All: return "OpenConfPath";
|
||||||
case eClosed: return "ClosedKeyPath";
|
case eClosed: return "ClosedKeyPath";
|
||||||
case eReadOnly: return "ReadKeyPath";
|
case eReadOnly: return "ReadKeyPath";
|
||||||
case eWriteOnly: return "WriteKeyPath";
|
case eBoxOnly: return "WriteKeyPath";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case eIPC:
|
case eIPC:
|
||||||
|
@ -348,6 +349,7 @@ QString COptionsWindow::MakeAccessStr(EAccessType Type, EAccessMode Mode)
|
||||||
case eNormal: return "NormalIpcPath";
|
case eNormal: return "NormalIpcPath";
|
||||||
case eOpen: return "OpenIpcPath";
|
case eOpen: return "OpenIpcPath";
|
||||||
case eClosed: return "ClosedIpcPath";
|
case eClosed: return "ClosedIpcPath";
|
||||||
|
case eReadOnly: return "ReadIpcPath";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case eWnd:
|
case eWnd:
|
||||||
|
@ -448,8 +450,8 @@ QList<COptionsWindow::EAccessMode> COptionsWindow::GetAccessModes(EAccessType Ty
|
||||||
{
|
{
|
||||||
switch (Type)
|
switch (Type)
|
||||||
{
|
{
|
||||||
case eFile: return QList<EAccessMode>() << eNormal << eOpen << eOpen4All << eClosed << eReadOnly << eWriteOnly;
|
case eFile: return QList<EAccessMode>() << eNormal << eOpen << eOpen4All << eClosed << eReadOnly << eBoxOnly;
|
||||||
case eKey: return QList<EAccessMode>() << eNormal << eOpen << eOpen4All << eClosed << eReadOnly << eWriteOnly;
|
case eKey: return QList<EAccessMode>() << eNormal << eOpen << eOpen4All << eClosed << eReadOnly << eBoxOnly;
|
||||||
case eIPC: return QList<EAccessMode>() << eNormal << eOpen << eClosed;
|
case eIPC: return QList<EAccessMode>() << eNormal << eOpen << eClosed;
|
||||||
case eWnd: return QList<EAccessMode>() << eOpen;
|
case eWnd: return QList<EAccessMode>() << eOpen;
|
||||||
case eCOM: return QList<EAccessMode>() << eOpen << eClosed << eClosedRT;
|
case eCOM: return QList<EAccessMode>() << eOpen << eClosed << eClosedRT;
|
||||||
|
@ -556,7 +558,7 @@ void COptionsWindow::SaveAccessList()
|
||||||
QStringList Keys = QStringList()
|
QStringList Keys = QStringList()
|
||||||
<< "NormalFilePath" << "OpenFilePath" << "OpenPipePath" << "ClosedFilePath" << "ReadFilePath" << "WriteFilePath"
|
<< "NormalFilePath" << "OpenFilePath" << "OpenPipePath" << "ClosedFilePath" << "ReadFilePath" << "WriteFilePath"
|
||||||
<< "NormalKeyPath" << "OpenKeyPath" << "OpenConfPath" << "ClosedKeyPath" << "ReadKeyPath" << "WriteKeyPath"
|
<< "NormalKeyPath" << "OpenKeyPath" << "OpenConfPath" << "ClosedKeyPath" << "ReadKeyPath" << "WriteKeyPath"
|
||||||
<< "NormalIpcPath"<< "OpenIpcPath" << "ClosedIpcPath" << "OpenWinClass" << "OpenClsid" << "ClosedClsid" << "ClosedRT";
|
<< "NormalIpcPath"<< "OpenIpcPath" << "ClosedIpcPath" << "ReadIpcPath" << "OpenWinClass" << "OpenClsid" << "ClosedClsid" << "ClosedRT";
|
||||||
|
|
||||||
QMap<QString, QList<QString>> AccessMap;
|
QMap<QString, QList<QString>> AccessMap;
|
||||||
for (int i = 0; i < ui.treeAccess->topLevelItemCount(); i++)
|
for (int i = 0; i < ui.treeAccess->topLevelItemCount(); i++)
|
||||||
|
|
|
@ -202,6 +202,7 @@ protected:
|
||||||
eNormalIpcPath,
|
eNormalIpcPath,
|
||||||
eOpenIpcPath,
|
eOpenIpcPath,
|
||||||
eClosedIpcPath,
|
eClosedIpcPath,
|
||||||
|
eReadIpcPath,
|
||||||
|
|
||||||
eOpenWinClass,
|
eOpenWinClass,
|
||||||
|
|
||||||
|
@ -229,7 +230,7 @@ protected:
|
||||||
eClosed,
|
eClosed,
|
||||||
eClosedRT,
|
eClosedRT,
|
||||||
eReadOnly,
|
eReadOnly,
|
||||||
eWriteOnly
|
eBoxOnly
|
||||||
};
|
};
|
||||||
|
|
||||||
enum ETriggerAction {
|
enum ETriggerAction {
|
||||||
|
|
|
@ -130,7 +130,7 @@ CSettingsWindow::CSettingsWindow(QWidget *parent)
|
||||||
m_FeaturesChanged = false;
|
m_FeaturesChanged = false;
|
||||||
connect(ui.chkWFP, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
|
connect(ui.chkWFP, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
|
||||||
connect(ui.chkObjCb, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
|
connect(ui.chkObjCb, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
|
||||||
connect(ui.chkWin32k, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
|
//connect(ui.chkWin32k, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
|
||||||
|
|
||||||
m_WarnProgsChanged = false;
|
m_WarnProgsChanged = false;
|
||||||
|
|
||||||
|
@ -253,6 +253,7 @@ void CSettingsWindow::LoadSettings()
|
||||||
|
|
||||||
ui.chkShowRecovery->setChecked(theConf->GetBool("Options/ShowRecovery", false));
|
ui.chkShowRecovery->setChecked(theConf->GetBool("Options/ShowRecovery", false));
|
||||||
ui.chkNotifyRecovery->setChecked(!theConf->GetBool("Options/InstantRecovery", true));
|
ui.chkNotifyRecovery->setChecked(!theConf->GetBool("Options/InstantRecovery", true));
|
||||||
|
ui.chkAsyncBoxOps->setChecked(theConf->GetBool("Options/UseAsyncBoxOps", false));
|
||||||
|
|
||||||
ui.chkPanic->setChecked(theConf->GetBool("Options/EnablePanicKey", false));
|
ui.chkPanic->setChecked(theConf->GetBool("Options/EnablePanicKey", false));
|
||||||
ui.keyPanic->setKeySequence(QKeySequence(theConf->GetString("Options/PanicKeySequence", "Shift+Pause")));
|
ui.keyPanic->setKeySequence(QKeySequence(theConf->GetString("Options/PanicKeySequence", "Shift+Pause")));
|
||||||
|
@ -262,6 +263,7 @@ void CSettingsWindow::LoadSettings()
|
||||||
|
|
||||||
ui.cmbSysTray->setCurrentIndex(theConf->GetInt("Options/SysTrayIcon", 1));
|
ui.cmbSysTray->setCurrentIndex(theConf->GetInt("Options/SysTrayIcon", 1));
|
||||||
ui.cmbTrayBoxes->setCurrentIndex(theConf->GetInt("Options/SysTrayFilter", 0));
|
ui.cmbTrayBoxes->setCurrentIndex(theConf->GetInt("Options/SysTrayFilter", 0));
|
||||||
|
ui.chkBoxOpsNotify->setChecked(theConf->GetBool("Options/AutoBoxOpsNotify", false));
|
||||||
ui.cmbOnClose->setCurrentIndex(ui.cmbOnClose->findData(theConf->GetString("Options/OnClose", "ToTray")));
|
ui.cmbOnClose->setCurrentIndex(ui.cmbOnClose->findData(theConf->GetString("Options/OnClose", "ToTray")));
|
||||||
|
|
||||||
|
|
||||||
|
@ -277,7 +279,7 @@ void CSettingsWindow::LoadSettings()
|
||||||
ui.ipcRoot->setText(theAPI->GetGlobalSettings()->GetText("IpcRootPath", IpcRootPath_Default));
|
ui.ipcRoot->setText(theAPI->GetGlobalSettings()->GetText("IpcRootPath", IpcRootPath_Default));
|
||||||
|
|
||||||
ui.chkWFP->setChecked(theAPI->GetGlobalSettings()->GetBool("NetworkEnableWFP", false));
|
ui.chkWFP->setChecked(theAPI->GetGlobalSettings()->GetBool("NetworkEnableWFP", false));
|
||||||
ui.chkObjCb->setChecked(theAPI->GetGlobalSettings()->GetBool("EnableObjectFiltering", false));
|
ui.chkObjCb->setChecked(theAPI->GetGlobalSettings()->GetBool("EnableObjectFiltering", true));
|
||||||
ui.chkWin32k->setChecked(theAPI->GetGlobalSettings()->GetBool("EnableWin32kHooks", true));
|
ui.chkWin32k->setChecked(theAPI->GetGlobalSettings()->GetBool("EnableWin32kHooks", true));
|
||||||
|
|
||||||
ui.chkAdminOnly->setChecked(theAPI->GetGlobalSettings()->GetBool("EditAdminOnly", false));
|
ui.chkAdminOnly->setChecked(theAPI->GetGlobalSettings()->GetBool("EditAdminOnly", false));
|
||||||
|
@ -406,6 +408,7 @@ void CSettingsWindow::SaveSettings()
|
||||||
|
|
||||||
theConf->SetValue("Options/ShowRecovery", ui.chkShowRecovery->isChecked());
|
theConf->SetValue("Options/ShowRecovery", ui.chkShowRecovery->isChecked());
|
||||||
theConf->SetValue("Options/InstantRecovery", !ui.chkNotifyRecovery->isChecked());
|
theConf->SetValue("Options/InstantRecovery", !ui.chkNotifyRecovery->isChecked());
|
||||||
|
theConf->SetValue("Options/UseAsyncBoxOps", ui.chkAsyncBoxOps->isChecked());
|
||||||
|
|
||||||
theConf->SetValue("Options/EnablePanicKey", ui.chkPanic->isChecked());
|
theConf->SetValue("Options/EnablePanicKey", ui.chkPanic->isChecked());
|
||||||
theConf->SetValue("Options/PanicKeySequence", ui.keyPanic->keySequence().toString());
|
theConf->SetValue("Options/PanicKeySequence", ui.keyPanic->keySequence().toString());
|
||||||
|
@ -414,6 +417,7 @@ void CSettingsWindow::SaveSettings()
|
||||||
|
|
||||||
theConf->SetValue("Options/SysTrayIcon", ui.cmbSysTray->currentIndex());
|
theConf->SetValue("Options/SysTrayIcon", ui.cmbSysTray->currentIndex());
|
||||||
theConf->SetValue("Options/SysTrayFilter", ui.cmbTrayBoxes->currentIndex());
|
theConf->SetValue("Options/SysTrayFilter", ui.cmbTrayBoxes->currentIndex());
|
||||||
|
theConf->SetValue("Options/AutoBoxOpsNotify", ui.chkBoxOpsNotify->isChecked());
|
||||||
theConf->SetValue("Options/OnClose", ui.cmbOnClose->currentData());
|
theConf->SetValue("Options/OnClose", ui.cmbOnClose->currentData());
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#define VERSION_MJR 1
|
#define VERSION_MJR 1
|
||||||
#define VERSION_MIN 0
|
#define VERSION_MIN 0
|
||||||
#define VERSION_REV 10
|
#define VERSION_REV 11
|
||||||
#define VERSION_UPD 0
|
#define VERSION_UPD 0
|
||||||
|
|
||||||
#ifndef STR
|
#ifndef STR
|
||||||
|
|
Loading…
Reference in New Issue