1.12.6

2023-12-20 14:32:07 +01:00 · 2023-12-20 14:32:07 +01:00 · 88023ab6ad
parent 5cb2f8ff5d
commit 88023ab6ad
8 changed files with 96 additions and 11 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).



+## [1.12.6 / 5.67.6] - 2023-12-
+
+### Changed
+todo: improve behaviorue of toolbar customization menu
+
+### Fixed
+- fixed fix for [#3475](https://github.com/sandboxie-plus/Sandboxie/issues/3475) not working without FileRootPath being explicitly set
+
+
+
 ## [1.12.5 / 5.67.5] - 2023-12-19

 ### Fixed
--- a/MergeDbg.cmd
+++ b/MergeDbg.cmd
@ -0,0 +1,29 @@
+@echo off
+
+mkdir %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieRelease\SbieDrv.sys %~dp0\SandboxiePlus\x64\Debug\
+
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SbieSvc.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SbieDll.dll %~dp0\SandboxiePlus\x64\Debug\
+
+rem copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SbieCtrl.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\Start.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\kmdutil.exe %~dp0\SandboxiePlus\x64\Debug\
+rem copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SbieIni.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieRelease\SbieMsg.dll %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SboxHostDll.dll %~dp0\SandboxiePlus\x64\Debug\
+
+copy /y %~dp0\Sandboxie\install\Templates.ini %~dp0\SandboxiePlus\x64\Debug\
+
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SandboxieBITS.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SandboxieCrypto.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SandboxieDcomLaunch.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SandboxieRpcSs.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\Sandboxie\Bin\x64\SbieDebug\SandboxieWUAU.exe %~dp0\SandboxiePlus\x64\Debug\
+
+mkdir %~dp0\SandboxiePlus\x64\Debug\32\
+copy /y %~dp0\Sandboxie\Bin\Win32\SbieDebug\SbieSvc.exe %~dp0\SandboxiePlus\x64\Debug\32\
+copy /y %~dp0\Sandboxie\Bin\Win32\SbieDebug\SbieDll.dll %~dp0\SandboxiePlus\x64\Debug\32\
+
+copy /y %~dp0\SandboxieTools\x64\Debug\ImBox.exe %~dp0\SandboxiePlus\x64\Debug\
+copy /y %~dp0\SandboxieTools\x64\Debug\UpdUtil.exe %~dp0\SandboxiePlus\x64\Debug\
--- a/Sandboxie/common/my_version.h
+++ b/Sandboxie/common/my_version.h
@ -21,8 +21,8 @@
 #ifndef _MY_VERSION_H
 #define _MY_VERSION_H

-#define MY_VERSION_BINARY       5,67,5
-#define MY_VERSION_STRING       "5.67.5"
+#define MY_VERSION_BINARY       5,67,6
+#define MY_VERSION_STRING       "5.67.6"
 #define MY_ABI_VERSION          0x56700

 // These #defines are used by either Resource Compiler or NSIS installer
--- a/Sandboxie/core/dll/file_init.c
+++ b/Sandboxie/core/dll/file_init.c
@ -179,7 +179,7 @@ _FX BOOLEAN File_Init(void)
    
    Dll_BoxFileDosPath = Dll_Alloc((Dll_BoxFilePathLen + 1) * sizeof(WCHAR));
    wcscpy((WCHAR *)Dll_BoxFileDosPath, Dll_BoxFilePath);
-    if (!SbieDll_TranslateNtToDosPath((WCHAR *)Dll_BoxFileDosPath) || _wcsnicmp(Dll_BoxFileDosPath, L"\\\\.\\", 4) == 0) 
+    if (!SbieDll_TranslateNtToDosPath((WCHAR *)Dll_BoxFileDosPath) /*|| _wcsnicmp(Dll_BoxFileDosPath, L"\\\\.\\", 4) == 0*/)
    {
        Dll_Free((WCHAR *)Dll_BoxFileDosPath);
        Dll_BoxFileDosPath = NULL;
@ -191,7 +191,8 @@ _FX BOOLEAN File_Init(void)

        ULONG BoxFilePathLen = (0x1000 + 1) * sizeof(WCHAR);
        WCHAR* BoxFilePathConf = Dll_AllocTemp(BoxFilePathLen);
-        SbieApi_QueryConf(NULL, L"FileRootPath", 0, BoxFilePathConf, BoxFilePathLen);
+		if (!NT_SUCCESS(SbieApi_QueryConf(NULL, L"FileRootPath", 0, BoxFilePathConf, BoxFilePathLen)))
+			SbieApi_QueryConf(NULL, L"\\??\\%SystemDrive%\\Sandbox\\%USER%\\%SANDBOX%", CONF_JUST_EXPAND, BoxFilePathConf, BoxFilePathLen);

        if (SbieDll_TranslateNtToDosPath(BoxFilePathConf))
        {
@ -1840,4 +1841,4 @@ _FX void File_GetSetDeviceMap(WCHAR *DeviceMap96)
            }
        }
    }
-}
+}
--- a/SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj
+++ b/SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj
@ -189,14 +189,39 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClCompile Include="Archive\Archive.cpp" />
-    <ClCompile Include="Archive\ArchiveExtractor.cpp" />
+    <ClCompile Include="Archive\Archive.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Archive\ArchiveExtractor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="Archive\ArchiveFS.cpp" />
    <ClCompile Include="Archive\ArchiveHelper.cpp" />
-    <ClCompile Include="Archive\ArchiveInterface.cpp" />
-    <ClCompile Include="Archive\ArchiveOpener.cpp" />
+    <ClCompile Include="Archive\ArchiveInterface.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Archive\ArchiveOpener.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="Archive\ArchiveThread.cpp" />
-    <ClCompile Include="Archive\ArchiveUpdater.cpp" />
+    <ClCompile Include="Archive\ArchiveUpdater.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="Archive\CachedArchive.cpp" />
    <ClCompile Include="Archive\SplitFile.cpp" />
    <ClCompile Include="Common\CheckableMessageBox.cpp" />
--- a/SandboxiePlus/SandMan/SandMan.vcxproj
+++ b/SandboxiePlus/SandMan/SandMan.vcxproj
@ -299,6 +299,7 @@
    <ClCompile Include="Helpers\FullScreen.cpp" />
    <ClCompile Include="Helpers\ReadDirectoryChanges.cpp" />
    <ClCompile Include="Helpers\ReadDirectoryChangesPrivate.cpp" />
+    <ClCompile Include="Helpers\StorageInfo.cpp" />
    <ClCompile Include="Helpers\WinAdmin.cpp" />
    <ClCompile Include="Helpers\WindowFromPointEx.cpp" />
    <ClCompile Include="Helpers\WinHelper.cpp" />
@ -347,6 +348,7 @@
    <ClCompile Include="Views\SbieView.cpp" />
    <ClCompile Include="Views\StackView.cpp" />
    <ClCompile Include="Views\TraceView.cpp" />
+    <ClCompile Include="Windows\CompressDialog.cpp" />
    <ClCompile Include="Windows\OptionsAccess.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@ -441,6 +443,7 @@
    <ClCompile Include="Wizards\TemplateWizard.cpp" />
  </ItemGroup>
  <ItemGroup>
+    <QtMoc Include="Windows\CompressDialog.h" />
    <QtMoc Include="Wizards\BoxAssistant.h" />
    <QtMoc Include="Windows\BoxImageWindow.h" />
    <QtMoc Include="Views\StackView.h" />
@ -479,6 +482,7 @@
    <ClInclude Include="Helpers\FullScreen.h" />
    <ClInclude Include="Helpers\ReadDirectoryChanges.h" />
    <ClInclude Include="Helpers\ReadDirectoryChangesPrivate.h" />
+    <ClInclude Include="Helpers\StorageInfo.h" />
    <ClInclude Include="Helpers\ThreadSafeQueue.h" />
    <ClInclude Include="Helpers\WinAdmin.h" />
    <QtMoc Include="Models\MonitorModel.h" />
@ -499,6 +503,7 @@
  </ItemGroup>
  <ItemGroup>
    <QtUic Include="Forms\BoxImageWindow.ui" />
+    <QtUic Include="Forms\CompressDialog.ui" />
    <QtUic Include="Forms\OptionsWindow.ui" />
    <QtUic Include="Forms\PopUpWindow.ui" />
    <QtUic Include="Forms\RecoveryWindow.ui" />
--- a/SandboxiePlus/SandMan/SandMan.vcxproj.filters
+++ b/SandboxiePlus/SandMan/SandMan.vcxproj.filters
@ -228,6 +228,12 @@
    <ClCompile Include="Engine\ScriptManager.cpp">
      <Filter>Engine</Filter>
    </ClCompile>
+    <ClCompile Include="Windows\CompressDialog.cpp">
+      <Filter>Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="Helpers\StorageInfo.cpp">
+      <Filter>Helpers</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="stdafx.h">
@ -266,6 +272,9 @@
    <ClInclude Include="CustomStyles.h">
      <Filter>SandMan</Filter>
    </ClInclude>
+    <ClInclude Include="Helpers\StorageInfo.h">
+      <Filter>Helpers</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <QtMoc Include="SandMan.h">
@ -373,6 +382,9 @@
    <QtMoc Include="Engine\ScriptManager.h">
      <Filter>Engine</Filter>
    </QtMoc>
+    <QtMoc Include="Windows\CompressDialog.h">
+      <Filter>Windows</Filter>
+    </QtMoc>
  </ItemGroup>
  <ItemGroup>
    <QtRcc Include="Resources\SandMan.qrc">
@ -412,6 +424,9 @@
    <QtUic Include="Forms\BoxImageWindow.ui">
      <Filter>Form Files</Filter>
    </QtUic>
+    <QtUic Include="Forms\CompressDialog.ui">
+      <Filter>Form Files</Filter>
+    </QtUic>
  </ItemGroup>
  <ItemGroup>
    <None Include="sandman_de.ts">
--- a/SandboxiePlus/version.h
+++ b/SandboxiePlus/version.h
@ -2,7 +2,7 @@

 #define VERSION_MJR		1
 #define VERSION_MIN 	12
-#define VERSION_REV 	5
+#define VERSION_REV 	6
 #define VERSION_UPD 	0

 #ifndef STR