Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie

CHANGELOG.md

@@ -8,23 +8,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.5 / 5.55.5] - 2021-12-??
 
 ### Added
-- sandbox top level exception handler to create crash dumps
+- added template support for Osiris and Slimjet browsers (by Dyras) [#1454](https://github.com/sandboxie-plus/Sandboxie/pull/1454)
--- can be enabled per process or globally using "EnableMiniDump=process.exe,y" or "EnableMiniDump=y" respectivly
--- the dump flags can be set as hex with MiniDumpFlags=0xAABBCCDD
--- a presellected flag set for a verbose dump can be set with MiniDumpFlags=Extended
--- note: Created dump files are located at: C:\Sandbox\%SANDBOX%
 
 ### Changed
 - improved sbiedll initialization a bit
 
 ### Fixed
 - fixed issue with forced process display [#1447](https://github.com/sandboxie-plus/Sandboxie/issues/1447)
-- fixed crash issue with GetClassName [#1448](https://github.com/sandboxie-plus/Sandboxie/issues/1448)
 
 
 
 
-## [1.0.4 / 5.55.4] - 2021-12-20
+## [1.0.4 / 5.55.4] - 2021-12-21
 
 ### Added
 - Mechanism to hook Win32 system calls now also works for 32 bit applications running under WoW64

Installer/Languages.iss

@@ -62,11 +62,11 @@ english.UninstallTaskLabel5=Remove configuration files and &sandboxes%nSelect th
 
 ; Chinese Simplified
 ChineseSimplified.AddSandboxedMenu=添加“在沙盘中运行”菜单
-;ChineseSimplified.AddSandboxedBrowser=
+ChineseSimplified.AddSandboxedBrowser=为用 Sandboxie 启动网页浏览器添加桌面快捷方式
-;ChineseSimplified.SandboxieStartMenu1=
+ChineseSimplified.SandboxieStartMenu1=在沙盘中运行程序
-;ChineseSimplified.SandboxieStartMenu2=
+ChineseSimplified.SandboxieStartMenu2=在沙盘中运行网页浏览器
-;ChineseSimplified.SandboxieStartMenu3=
+ChineseSimplified.SandboxieStartMenu3=Sandboxie 开始菜单
-;ChineseSimplified.SandboxedBrowser=
+ChineseSimplified.SandboxedBrowser=在沙盘中运行网页浏览器
 ChineseSimplified.CustomPageLabel1=选择安装方式
 ChineseSimplified.CustomPageLabel2=应当如何安装
 ChineseSimplified.CustomPageLabel3=选择安装模式
@@ -84,11 +84,11 @@ ChineseSimplified.UninstallTaskLabel5=移除配置文件和所有沙盘(&S)%n选
 
 ; Chinese Traditional
 ChineseTraditional.AddSandboxedMenu=加入「在沙箱中執行」選單
-;ChineseTraditional.AddSandboxedBrowser=
+ChineseTraditional.AddSandboxedBrowser=在桌面放置從沙盤開啟網頁瀏覽器的捷徑
-;ChineseTraditional.SandboxieStartMenu1=
+ChineseTraditional.SandboxieStartMenu1=在沙盤中執行應用程式
-;ChineseTraditional.SandboxieStartMenu2=
+ChineseTraditional.SandboxieStartMenu2=在沙盤中開啟網頁瀏覽器
-;ChineseTraditional.SandboxieStartMenu3=
+ChineseTraditional.SandboxieStartMenu3=Sandboxie 開始功能表
-;ChineseTraditional.SandboxedBrowser=
+ChineseTraditional.SandboxedBrowser=從沙盤開啟網頁瀏覽器
 ChineseTraditional.CustomPageLabel1=選擇安裝方式
 ChineseTraditional.CustomPageLabel2=應該如何安裝
 ChineseTraditional.CustomPageLabel3=選擇安裝模式
@@ -106,11 +106,11 @@ ChineseTraditional.UninstallTaskLabel5=刪除設定檔和沙箱(&S)%n選擇此
 
 ; Dutch
 dutch.AddSandboxedMenu="In sandbox uitvoeren" aan contextmenu toevoegen
-;dutch.AddSandboxedBrowser=
+dutch.AddSandboxedBrowser=Bureaubladsnelkoppeling toevoegen om webbrowser onder Sandboxie te starten
-;dutch.SandboxieStartMenu1=
+dutch.SandboxieStartMenu1=Programma gesandboxt uitvoeren
-;dutch.SandboxieStartMenu2=
+dutch.SandboxieStartMenu2=Gesandboxte webbrowser uitvoeren
-;dutch.SandboxieStartMenu3=
+dutch.SandboxieStartMenu3=Sandboxie-startmenu
-;dutch.SandboxedBrowser=
+dutch.SandboxedBrowser=Gesandboxte webbrowser
 dutch.CustomPageLabel1=Installatietype selecteren
 dutch.CustomPageLabel2=Hoe moet er geïnstalleerd worden
 dutch.CustomPageLabel3=Installatiemodus kiezen
@@ -128,11 +128,11 @@ dutch.UninstallTaskLabel5=Configuratiebestanden en sandboxen verwijderen%nSelect
 
 ; French
 french.AddSandboxedMenu=Ajouter « Exécuter dans un bac à sable » au menu contextuel
-;french.AddSandboxedBrowser=
+french.AddSandboxedBrowser=Ajouter un raccourci sur le bureau pour Exécuter le Navigateur Internet dans Sandboxie
-;french.SandboxieStartMenu1=
+french.SandboxieStartMenu1=Exécuter un programme sandboxé
-;french.SandboxieStartMenu2=
+french.SandboxieStartMenu2=Exécuter le Navigateur Internet sandboxé
-;french.SandboxieStartMenu3=
+french.SandboxieStartMenu3=Exécuter dans le menu Démarrer
-;french.SandboxedBrowser=
+french.SandboxedBrowser=Lien Navigateur Internet Sandboxé
 french.CustomPageLabel1=Sélectionnez le type d'installation
 french.CustomPageLabel2=Comment doit-on l'installer
 french.CustomPageLabel3=Choisissez le mode d'installation
@@ -150,11 +150,11 @@ french.UninstallTaskLabel5=Supprimer les fichiers de configuration et les &bacs
 
 ; German
 german.AddSandboxedMenu=Füge "In Sandbox ausführen" zum Kontextmenü hinzu
-;german.AddSandboxedBrowser=
+german.AddSandboxedBrowser=Desktop-Verknüpfung erstellen zum Starten des Standard-Webbrowsers mit Sandboxie
-;german.SandboxieStartMenu1=
+german.SandboxieStartMenu1=Programm mit Sandboxie starten
-;german.SandboxieStartMenu2=
+german.SandboxieStartMenu2=Webbrowser mit Sandboxie starten
-;german.SandboxieStartMenu3=
+german.SandboxieStartMenu3=Sandboxie Startmenü
-;german.SandboxedBrowser=
+german.SandboxedBrowser=Sandboxed Web Browser
 german.CustomPageLabel1=Wählen Sie die Installationsart aus
 german.CustomPageLabel2=Wie soll installiert werden
 german.CustomPageLabel3=Wählen Sie die Installationsmethode
@@ -196,11 +196,11 @@ Italian.UninstallTaskLabel5=Rimuovi i file di configurazione e le &aree virtuali
 
 ; Polish
 polish.AddSandboxedMenu=Dodaj "Uruchom w piaskownicy" do menu kontekstowego
-;polish.AddSandboxedBrowser=
+polish.AddSandboxedBrowser=Dodaj skrót pulpitu dla przeglądarki internetowej uruchamianej w Sandboxie
-;polish.SandboxieStartMenu1=
+polish.SandboxieStartMenu1=Uruchom dowolny program w piaskownicy
-;polish.SandboxieStartMenu2=
+polish.SandboxieStartMenu2=Uruchom przeglądarkę internetową w piaskownicy
-;polish.SandboxieStartMenu3=
+polish.SandboxieStartMenu3=Menu start w Sandboxie
-;polish.SandboxedBrowser=
+polish.SandboxedBrowser=Przeglądarka internetowa w piaskownicy
 polish.CustomPageLabel1=Wybierz typ instalacji
 polish.CustomPageLabel2=Jak należy instalować
 polish.CustomPageLabel3=Wybierz tryb instalacji
@@ -218,11 +218,11 @@ polish.UninstallTaskLabel5=Usuń pliki konfiguracyjne i pia&skownice%nWybierz t
 
 ; Portuguese
 portuguese.AddSandboxedMenu=Adicionar "Roda na Caixa de Areia" para o menu de contexto
-;portuguese.AddSandboxedBrowser=
+portuguese.AddSandboxedBrowser=Adicionar um atalho na área de trabalho para iniciar o Navegador web sob o Sandboxie
-;portuguese.SandboxieStartMenu1=
+portuguese.SandboxieStartMenu1=Rodar qualquer programa em uma caixa de areia
-;portuguese.SandboxieStartMenu2=
+portuguese.SandboxieStartMenu2=Rodar o Navegador web em uma caixa de areia
-;portuguese.SandboxieStartMenu3=
+portuguese.SandboxieStartMenu3=Menu Iniciar no Sandboxie
-;portuguese.SandboxedBrowser=
+portuguese.SandboxedBrowser=Navegador web em uma caixa
 portuguese.CustomPageLabel1=Selecione Tipo de Instalação
 portuguese.CustomPageLabel2=Como deve ser instalado
 portuguese.CustomPageLabel3=Escolha o modo de instalação
@@ -240,11 +240,11 @@ portuguese.UninstallTaskLabel5=Remover arquivos de configuração e &caixas de a
 
 ; Russian
 russian.AddSandboxedMenu=Добавить "Запустить в песочнице" в контекстное меню
-;russian.AddSandboxedBrowser=
+russian.AddSandboxedBrowser=Добавить ярлык на рабочий стол для запуска браузера в Sandboxie
-;russian.SandboxieStartMenu1=
+russian.SandboxieStartMenu1=Запустить программу в песочнице
-;russian.SandboxieStartMenu2=
+russian.SandboxieStartMenu2=Запустить веб браузер в песочнице
-;russian.SandboxieStartMenu3=
+russian.SandboxieStartMenu3=Начальное меню Sandboxie
-;russian.SandboxedBrowser=
+russian.SandboxedBrowser=Браузер в песочнице
 russian.CustomPageLabel1=Выберите тип установки
 russian.CustomPageLabel2=Как следует установить
 russian.CustomPageLabel3=Выберите режим установки
@@ -262,11 +262,11 @@ russian.UninstallTaskLabel5=Удалить файлы конфигурации
 
 ; Spanish
 spanish.AddSandboxedMenu=Agregar "Ejecutar Aislado en una Sandbox" al menú contextual
-;spanish.AddSandboxedBrowser=
+spanish.AddSandboxedBrowser=Agregar Acceso Directo al Escritorio para iniciar el Navegador Web supervisado por Sandboxie
-;spanish.SandboxieStartMenu1=
+spanish.SandboxieStartMenu1=Ejecutar un programa aislado en la sandbox
-;spanish.SandboxieStartMenu2=
+spanish.SandboxieStartMenu2=Ejecutar Navegador Web aislado en una sandbox
-;spanish.SandboxieStartMenu3=
+spanish.SandboxieStartMenu3=Menú de Inicio de Sandboxie
-;spanish.SandboxedBrowser=
+spanish.SandboxedBrowser=Navegador Web Aislado en una Sandbox
 spanish.CustomPageLabel1=Seleccione el tipo de instalación
 spanish.CustomPageLabel2=¿Cómo se debe instalar?
 spanish.CustomPageLabel3=Elija el modo de instalación

Sandboxie/apps/control/AppPage.cpp

@@ -555,7 +555,9 @@ void CAppPage::Template_Filter()
                   || (name.Find(L"Brave_") != -1)
                   || (name.Find(L"Maxthon_6_") != -1)
                   || (name.Find(L"Opera_") != -1)
-                  || (name.Find(L"Yandex_") != -1);
+                  || (name.Find(L"Yandex_") != -1)
+                  || (name.Find(L"Osiris_") != -1)
+                  || (name.Find(L"Slimjet_") != -1);
 
         BOOL keep = FALSE;
 

Sandboxie/install/Templates.ini

@@ -90,6 +90,8 @@ Tmpl.Brave=%Local AppData%\BraveSoftware\Brave-Browser\User Data\Default
 Tmpl.Maxthon_6=%Local AppData%\Maxthon\Application\User Data\Default
 Tmpl.Opera=%AppData%\Opera Software\Opera Stable
 Tmpl.Yandex=%Local AppData%\Yandex\YandexBrowser\User Data\Default
+Tmpl.Osiris=%Local AppData%\Osiris\Osiris-Browser\User Data\Default
+Tmpl.Slimjet=%Local AppData%\Slimjet\User Data\Default
 Tmpl.Thunderbird=%Local AppData%\Thunderbird
 Tmpl.Thunderbird:ExpectFile=xulstore.json
 Tmpl.Opera_Mail=%Local AppData%\Opera\*\mail
@@ -119,6 +121,8 @@ SpecialImage=chrome,vivaldi.exe
 SpecialImage=chrome,brave.exe
 SpecialImage=chrome,browser.exe
 SpecialImage=chrome,slack.exe
+SpecialImage=chrome,osiris.exe
+SpecialImage=chrome,slimjet.exe
 
 SpecialImage=firefox,firefox.exe
 SpecialImage=firefox,waterfox.exe
@@ -464,7 +468,7 @@ OpenFilePath=<Zotero>,%Tmpl.Zotero%\*
 ProcessGroup=<Zotero>,firefox.exe,pdfinfo-Win32.exe,pdftotext-Win32.exe
 
 #
-# Google Chrome / Microsoft Edge (Chromium) / Comodo Dragon / SRWare Iron / Ungoogled Chromium / Vivaldi / Brave Browser / Maxthon 6 (Chromium) / Opera / Yandex
+# Google Chrome / Microsoft Edge (Chromium) / Comodo Dragon / SRWare Iron / Ungoogled Chromium / Vivaldi / Brave Browser / Maxthon 6 (Chromium) / Opera / Yandex / Osiris / FlashPeak Slimjet
 #
 
 #
@@ -1050,6 +1054,127 @@ Tmpl.Title=#4338,Yandex Browser
 Tmpl.Class=WebBrowser
 OpenFilePath=browser.exe,%Tmpl.Yandex%\*
 
+[Template_Yandex_Separator]
+Tmpl.Title=-
+Tmpl.Class=WebBrowser
+
+#
+# Osiris
+#
+
+[Template_Osiris_Force]
+Tmpl.Title=#4323,Osiris Browser
+Tmpl.Class=WebBrowser
+ForceProcess=osiris.exe
+
+[Template_Osiris_Bookmarks_DirectAccess]
+Tmpl.Title=#4356,Osiris Browser
+Tmpl.Class=WebBrowser
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Bookmarks*
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Favicons*
+
+[Template_Osiris_History_DirectAccess]
+Tmpl.Title=#4336,Osiris Browser
+Tmpl.Class=WebBrowser
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Bookmarks*
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Favicons*
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\*History*
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Current *
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Last *
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Visited Links*
+
+[Template_Osiris_Cookies_DirectAccess]
+Tmpl.Title=#4328,Osiris Browser
+Tmpl.Class=WebBrowser
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Cookies*
+
+[Template_Osiris_Passwords_DirectAccess]
+Tmpl.Title=#4331,Osiris Browser
+Tmpl.Class=WebBrowser
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Login Data*
+
+[Template_Osiris_Preferences_DirectAccess]
+Tmpl.Title=#4339,Osiris Browser
+Tmpl.Class=WebBrowser
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Preferences*
+
+[Template_Osiris_Sync_DirectAccess]
+Tmpl.Title=#4324,Osiris Browser
+Tmpl.Class=WebBrowser
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\Sync Data\*
+
+[Template_Osiris_Phishing_DirectAccess]
+Tmpl.Title=#4337,Osiris Browser
+Tmpl.Class=WebBrowser
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\User Data\Safe Browsing*
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\User Data\CertificateRevocation
+
+[Template_Osiris_Profile_DirectAccess]
+Tmpl.Title=#4338,Osiris Browser
+Tmpl.Class=WebBrowser
+OpenFilePath=osiris.exe,%Tmpl.Osiris%\*
+
+[Template_Osiris_Separator]
+Tmpl.Title=-
+Tmpl.Class=WebBrowser
+
+#
+# FlashPeak Slimjet
+#
+
+[Template_Slimjet_Force]
+Tmpl.Title=#4323,Slimjet
+Tmpl.Class=WebBrowser
+ForceProcess=slimjet.exe
+
+[Template_Slimjet_Bookmarks_DirectAccess]
+Tmpl.Title=#4356,Slimjet
+Tmpl.Class=WebBrowser
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Bookmarks*
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Favicons*
+
+[Template_Slimjet_History_DirectAccess]
+Tmpl.Title=#4336,Slimjet
+Tmpl.Class=WebBrowser
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Bookmarks*
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Favicons*
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\*History*
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Current *
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Last *
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Visited Links*
+
+[Template_Slimjet_Cookies_DirectAccess]
+Tmpl.Title=#4328,Slimjet
+Tmpl.Class=WebBrowser
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Cookies*
+
+[Template_Slimjet_Passwords_DirectAccess]
+Tmpl.Title=#4331,Slimjet
+Tmpl.Class=WebBrowser
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Login Data*
+
+[Template_Slimjet_Preferences_DirectAccess]
+Tmpl.Title=#4339,Slimjet
+Tmpl.Class=WebBrowser
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Preferences*
+
+[Template_Slimjet_Sync_DirectAccess]
+Tmpl.Title=#4324,Slimjet
+Tmpl.Class=WebBrowser
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Sync Data\*
+OpenFilePath=slimjet.exe,%Tmpl.Slimjet%\Sync Extension Settings\*
+
+[Template_Slimjet_Phishing_DirectAccess]
+Tmpl.Title=#4337,Slimjet
+Tmpl.Class=WebBrowser
+OpenFilePath=slimjet.exe,%Local AppData%\Slimjet\User Data\Safe Browsing*
+OpenFilePath=slimjet.exe,%Local AppData%\Slimjet\User Data\CertificateRevocation
+
+[Template_Slimjet_Profile_DirectAccess]
+Tmpl.Title=#4338,Slimjet
+Tmpl.Class=WebBrowser
+OpenFilePath=slimjet.exe,%Local AppData%\Slimjet*
+
 #
 # Email Reader
 #

SandboxiePlus/SandMan/Forms/OptionsWindow.ui

@@ -2173,7 +2173,7 @@ The process match level has a higher priority than the specificity and describes
                  <item row="15" column="1" colspan="2">
                   <widget class="QCheckBox" name="chkComTimeout">
                    <property name="text">
-                    <string>Disable using RpcMgmtSetComTimeout by default (toggle this may resovle compatybility issues)</string>
+                    <string>Disable the use of RpcMgmtSetComTimeout by default (this may resolve compatibility issues)</string>
                    </property>
                   </widget>
                  </item>