Build 0.3.5 / 5.42.1

sandboxie-plus · Jul 19, 2020 · de57cde · de57cde
1 parent a2fa773
commit de57cde
Show file tree

Hide file tree

Showing 42 changed files with 4,077 additions and 149 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,28 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [0.3.5 / 5.42.1] - 2020-07-19
+
+### Added
+- Added settings window
+- added translationsupport
+- added dark theme
+- added auto start option
+- added sandbox options
+- added debug option "NoAddProcessToJob=y"
+
+### Changed
+- improved empty sandbox tray icon
+- improved message parsing
+- updated homepage links
+
+### Fixed
+- fixed ini issue with sandman.exe when renaming sandboxes
+- fixed ini auto reload bug introduced in the last build
+- fixed issue when hooking delayd loaded libraries
+
+
+
 ## [0.3 / 5.42] - 2020-07-04
 
 ### Added

diff --git a/Sandboxie/apps/common/RunBrowser.cpp b/Sandboxie/apps/common/RunBrowser.cpp
@@ -134,7 +134,7 @@ void CRunBrowser::OnNo()
 
 CString CRunBrowser::GetTopicUrl(const CString &topic)
 {
-    return L"https://www.sandboxie.com/index.php?" + topic;
+    return L"https://xanasoft.com/Sandboxie/" + topic;
 }
 
 
@@ -155,5 +155,5 @@ void CRunBrowser::OpenHelp(CWnd *pParentWnd, const CString &topic)
 
 void CRunBrowser::OpenForum(CWnd *pParentWnd)
 {
-    CRunBrowser x(pParentWnd, L"http://forums.sandboxie.com/phpBB3/");
+    CRunBrowser x(pParentWnd, L"https://forum.xanasoft.com/");
 }
diff --git a/Sandboxie/apps/control/LockConfigDialog.cpp b/Sandboxie/apps/control/LockConfigDialog.cpp
@@ -246,11 +246,11 @@ void CLockConfigDialog::OnOK()
     ini.SetRestrictions(
         isEditAdminOnly, isForceDisableAdminOnly, isForgetPassword);
 
-    if ((*m_NewPassword) || isEditAdminOnly) {
-        int rv = CMyApp::MsgBox(this, MSG_4269, MB_YESNO);
-        if (rv == IDYES)
-            CRunBrowser::OpenHelp(this, L"ConfigurationProtection");
-    }
+    //if ((*m_NewPassword) || isEditAdminOnly) {
+    //    int rv = CMyApp::MsgBox(this, MSG_4269, MB_YESNO);
+    //    if (rv == IDYES)
+    //        CRunBrowser::OpenHelp(this, L"ConfigurationProtection");
+    //}
 
     EndDialog(0);
 }
diff --git a/Sandboxie/apps/control/MyFrame.cpp b/Sandboxie/apps/control/MyFrame.cpp
@@ -223,7 +223,8 @@ CMyFrame::CMyFrame(BOOL ForceVisible, BOOL ForceSync)
     AdjustSizePosition(left, top, width, height);
 
     ULONG exStyle = (CMyApp::m_LayoutRTL) ? WS_EX_LAYOUTRTL : 0;
-    CreateEx(   exStyle, (LPCTSTR)CMyApp::m_atom, CMyApp::m_appTitle,
+	CString strTitle = CMyApp::m_appTitle + " - xanasoft.com";
+    CreateEx(   exStyle, (LPCTSTR)CMyApp::m_atom, strTitle,
                 WS_OVERLAPPEDWINDOW | WS_CAPTION | WS_SYSMENU,
                 left, top, width, height,
                 NULL, NULL, NULL);

diff --git a/Sandboxie/common/my_version.h b/Sandboxie/common/my_version.h
@@ -20,8 +20,8 @@
 #ifndef _MY_VERSION_H
 #define _MY_VERSION_H
 
-#define MY_VERSION_BINARY       5,42,0
-#define MY_VERSION_STRING       "5.42.0"
+#define MY_VERSION_BINARY       5,42,1
+#define MY_VERSION_STRING       "5.42.1"
 #define MY_VERSION_COMPAT		"5.42"
 
 // These #defines are used by either Resource Compiler, or by NSIC installer

diff --git a/Sandboxie/core/dll/SboxDll32.def b/Sandboxie/core/dll/SboxDll32.def
@@ -27,7 +27,7 @@ SbieApi_GetHomePath=_SbieApi_GetHomePath@16
 SbieApi_GetUnmountHive=_SbieApi_GetUnmountHive@4
 SbieApi_GetVersion=_SbieApi_GetVersion@4
 ;;; SbieApi_GetWork=_SbieApi_GetWork@12
-SbieApi_GetMessage=_SbieApi_GetMessage@20
+SbieApi_GetMessage=_SbieApi_GetMessage@24
 
 SbieApi_HookTramp=_SbieApi_HookTramp@8
 

diff --git a/Sandboxie/core/dll/dllhook.c b/Sandboxie/core/dll/dllhook.c
@@ -178,6 +178,12 @@ skip_e9_rewrite: ;
             SourceFunc = (void *)target;
     }
 
+	//
+	// this simplification fails for delay loaded libraries, see coments about SetSecurityInfo,
+	// resulting in an endless loop, so just dont do that 
+	//
+
+#if 0
     //
     // 64-bit only:  if the function begins with 'jmp qword ptr [x]'
     // (6 bytes) then replace the value at x, rather than overwrite
@@ -216,6 +222,7 @@ skip_e9_rewrite: ;
 
         return orig_addr;
     }
+#endif
 
 #endif _WIN64
 

diff --git a/Sandboxie/core/drv/process.c b/Sandboxie/core/drv/process.c
@@ -1024,7 +1024,7 @@ _FX void Process_NotifyProcess_Create(
                 // don't put the process into a job if OpenWinClass=*
                 //
 
-                if (new_proc->open_all_win_classes) {
+                if (new_proc->open_all_win_classes || Conf_Get_Boolean(box->name, L"NoAddProcessToJob", 0, FALSE)) {
 
                     add_process_to_job = FALSE;
                 }

diff --git a/Sandboxie/install/ParseVersion.bat b/Sandboxie/install/ParseVersion.bat
@@ -12,7 +12,7 @@ echo. > %OUTPUT%
 
 for /F "tokens=3*" %%A in ('findstr /R "^#define.SBIE_INSTALLER_PATH\>"    %INPUT%') do ( echo ^^!define SBIE_INSTALLER_PATH %%A) >> %OUTPUT%
 
-for /F "tokens=3*" %%A in ('findstr /R "^#define.MY_VERSION_STRING_EX\>"   %INPUT%') do ( echo ^^!define VERSION %%A) >> %OUTPUT%
+for /F "tokens=3*" %%A in ('findstr /R "^#define.MY_VERSION_STRING\>"      %INPUT%') do ( echo ^^!define VERSION %%A) >> %OUTPUT%
 
 for /F "tokens=3*" %%A in ('findstr /R "^#define.MY_PRODUCT_NAME_STRING\>" %INPUT%') do ( set C=%%A %%B& echo ^^!define PRODUCT_FULL_NAME !C! & set C=!C: =!& echo ^^!define PRODUCT_NAME !C!) >> %OUTPUT%
 

diff --git a/Sandboxie/install/SandboxieVS.nsi b/Sandboxie/install/SandboxieVS.nsi
@@ -28,7 +28,9 @@ SetCompressor /SOLID /FINAL lzma
 ; these are the build-time config settings.  Need to be cmd line args or something better.
 ; pick either 32 or 64 bit
 ;!define _BUILDARCH		Win32
-!define _BUILDARCH		x64
+;!define _BUILDARCH		x64
+!define _BUILDARCH		"$%SBIE_BUILDARCH%"
+
 
 ; uncomment this line if you want to make the special versions that download VC Redist
 ;!define INCLUDE_VCREDIST_DNLD

diff --git a/SandboxiePlus/MiscHelpers/Common/ComboInputDialog.cpp b/SandboxiePlus/MiscHelpers/Common/ComboInputDialog.cpp
@@ -132,6 +132,11 @@ void CComboInputDialog::setValue(const QString &t)
 		d->combo->setCurrentIndex(idx);
 }
 
+int CComboInputDialog::findValue(const QString &t) const
+{
+	return d->combo->findText(t);
+}
+
 QVariant CComboInputDialog::data() const
 {
 	return d->combo->currentData();
@@ -142,6 +147,11 @@ void CComboInputDialog::setData(const QVariant & v)
 	d->combo->setCurrentIndex(d->combo->findData(v));
 }
 
+int CComboInputDialog::findData(const QVariant & v) const
+{
+	return d->combo->findData(v);
+}
+
 QPixmap CComboInputDialog::iconPixmap() const
 {
     if (const QPixmap *p = d->pixmapLabel->pixmap())

diff --git a/SandboxiePlus/MiscHelpers/Common/ComboInputDialog.h b/SandboxiePlus/MiscHelpers/Common/ComboInputDialog.h
@@ -28,10 +28,11 @@ class MISCHELPERS_EXPORT CComboInputDialog: public QDialog
 
 	QString value() const;
     void setValue(const QString &);
+	int findValue(const QString &) const;
 
 	QVariant data() const;
     void setData(const QVariant &);
-
+	int findData(const QVariant &) const;
 
     QDialogButtonBox::StandardButtons standardButtons() const;
     void setStandardButtons(QDialogButtonBox::StandardButtons s);

diff --git a/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj b/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj
@@ -185,9 +185,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Sandboxie\BoxBorder.cpp" />
     <ClCompile Include="Sandboxie\BoxedProcess.cpp" />
     <ClCompile Include="Sandboxie\SandBox.cpp" />
-    <ClCompile Include="Sandboxie\IniSection.cpp" />
+    <ClCompile Include="Sandboxie\SbieIni.cpp" />
     <ClCompile Include="SbieAPI.cpp" />
     <ClCompile Include="SbieUtils.cpp" />
     <ClCompile Include="stdafx.cpp">
@@ -203,7 +204,8 @@
     <ClInclude Include="qsbieapi_global.h" />
     <QtMoc Include="Sandboxie\BoxedProcess.h" />
     <QtMoc Include="Sandboxie\SandBox.h" />
-    <QtMoc Include="Sandboxie\IniSection.h" />
+    <QtMoc Include="Sandboxie\SbieIni.h" />
+    <QtMoc Include="Sandboxie\BoxBorder.h" />
     <ClInclude Include="SbieDefs.h" />
     <ClInclude Include="SbieError.h" />
     <ClInclude Include="SbieUtils.h" />

diff --git a/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj.filters b/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj.filters
@@ -39,12 +39,15 @@
     <ClCompile Include="Sandboxie\SandBox.cpp">
       <Filter>Sandboxie</Filter>
     </ClCompile>
-    <ClCompile Include="Sandboxie\IniSection.cpp">
-      <Filter>Sandboxie</Filter>
-    </ClCompile>
     <ClCompile Include="SbieUtils.cpp">
       <Filter>SbieAPI</Filter>
     </ClCompile>
+    <ClCompile Include="Sandboxie\BoxBorder.cpp">
+      <Filter>Sandboxie</Filter>
+    </ClCompile>
+    <ClCompile Include="Sandboxie\SbieIni.cpp">
+      <Filter>Sandboxie</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -78,7 +81,10 @@
     <QtMoc Include="SbieAPI.h">
       <Filter>SbieAPI</Filter>
     </QtMoc>
-    <QtMoc Include="Sandboxie\IniSection.h">
+    <QtMoc Include="Sandboxie\BoxBorder.h">
+      <Filter>Sandboxie</Filter>
+    </QtMoc>
+    <QtMoc Include="Sandboxie\SbieIni.h">
       <Filter>Sandboxie</Filter>
     </QtMoc>
   </ItemGroup>

diff --git a/SandboxiePlus/QSbieAPI/Sandboxie/SandBox.cpp b/SandboxiePlus/QSbieAPI/Sandboxie/SandBox.cpp
@@ -23,7 +23,7 @@
 //{
 //};
 
-CSandBox::CSandBox(const QString& BoxName, class CSbieAPI* pAPI) : CIniSection(BoxName, pAPI)
+CSandBox::CSandBox(const QString& BoxName, class CSbieAPI* pAPI) : CSbieIni(BoxName, pAPI)
 {
 	//m = new SSandBox;
 
@@ -41,7 +41,7 @@ CSandBox::CSandBox(const QString& BoxName, class CSbieAPI* pAPI) : CIniSection(B
 	}
 	else
 	{
-		SetBool("AutoRecover", true);
+		SetBool("AutoRecover", false);
 		SetBool("BlockNetworkFiles", true);
 
 		//SetDefaultTemplates6(*this); // why 6?

diff --git a/SandboxiePlus/QSbieAPI/Sandboxie/SandBox.h b/SandboxiePlus/QSbieAPI/Sandboxie/SandBox.h
@@ -21,9 +21,9 @@
 #include "../qsbieapi_global.h"
 
 #include "BoxedProcess.h"
-#include "IniSection.h"
+#include "SbieIni.h"
 
-class QSBIEAPI_EXPORT CSandBox : public CIniSection
+class QSBIEAPI_EXPORT CSandBox : public CSbieIni
 {
 	Q_OBJECT
 public:
@@ -32,8 +32,6 @@ class QSBIEAPI_EXPORT CSandBox : public CIniSection
 
 	virtual void					UpdateDetails();
 
-	virtual QString					GetName() const { return m_Name; }
-
 	virtual QString					GetFileRoot() const { return m_FilePath; }
 	virtual QString					GetRegRoot() const { return m_RegPath; }
 	virtual QString					GetIpcRoot() const { return m_IpcPath; }