Merge pull request #719 from Dyras/patch-1

Add torrent clients and media player templates along with classes for them

Sandboxie/apps/control/AppPage.cpp

@@ -1041,6 +1041,20 @@ void CAppPage::AddPages(CPropertySheet &sheet, const CString &BoxName)
     info.WithLink = TRUE;
     info.WithCreate = FALSE;
     m_app_pages.AddTail(new CAppPage(&info, BoxName));
+    
+    info.ClassName = L"MediaPlayer";
+    info.TitleId = MSG_4393;
+    info.LabelId = MSG_4394;
+    info.WithLink = FALSE;
+    info.WithCreate = FALSE;
+    m_app_pages.AddTail(new CAppPage(&info, BoxName));
+    
+    info.ClassName = L"TorrentClient";
+    info.TitleId = MSG_4396;
+    info.LabelId = MSG_4397;
+    info.WithLink = FALSE;
+    info.WithCreate = FALSE;
+    m_app_pages.AddTail(new CAppPage(&info, BoxName));
 
     info.ClassName = L"Download";
     info.TitleId = MSG_4230;

Sandboxie/apps/control/ThirdPartyDialog.cpp

@@ -816,8 +816,10 @@ void CThirdPartyDialog::CollectTemplates()
     ini.GetTemplateNames(L"Desktop", names);
     ini.GetTemplateNames(L"Download", names);
     ini.GetTemplateNames(L"Misc", names);
-	ini.GetTemplateNames(L"WebBrowser", names);
+    ini.GetTemplateNames(L"WebBrowser", names);
-
+    ini.GetTemplateNames(L"MediaPlayer", names);
+    ini.GetTemplateNames(L"TorrentClient", names);
+    
     m_templates.RemoveAll();
     while (! names.IsEmpty()) {
         CString tmpl_name = names.RemoveHead();

Sandboxie/install/Templates.ini

@@ -2624,6 +2624,130 @@ OpenIpcPath=*\BaseNamedObjects*\Ai2_HOOKDATA_FILEMAP*
 OpenIpcPath=*\BaseNamedObjects*\ZoomTextRunning*
 OpenWinClass=ZT9MainWindow
 
+#
+# Media Players
+#
+
+[Template_VLC_Force]
+Tmpl.Title=#4323,VLC
+Tmpl.Class=MediaPlayer
+ForceProcess=vlc.exe
+
+[Template_VLC_DirectAccess_Profile]
+Tmpl.Title=#4338,VLC
+Tmpl.Class=MediaPlayer
+OpenFilePath=vlc.exe,%AppData%\vlc\*
+
+[Template_VLC_DirectAccess_Photos]
+Tmpl.Title=#4395,VLC
+Tmpl.Class=MediaPlayer
+OpenFilePath=vlc.exe,%USERPROFILE%\Pictures\*
+
+[Template_MPC-HC_Force]
+Tmpl.Title=#4323,MPC-HC
+Tmpl.Class=MediaPlayer
+ForceProcess=mpc-hc64.exe
+
+[Template_MPC-HC_DirectAccess_Profile]
+Tmpl.Title=#4338,MPC-HC
+Tmpl.Class=MediaPlayer
+OpenFilePath=mpc-hc64.exe,%AppData%\MPC-HC\*
+
+[Template_MPC-HC_DirectAccess_Photos]
+Tmpl.Title=#4395,MPC-HC
+Tmpl.Class=MediaPlayer
+OpenFilePath=mpc-hc64.exe,%USERPROFILE%\Pictures\*
+
+[Template_MPC-BE_Force]
+Tmpl.Title=#4323,MPC-BE
+Tmpl.Class=MediaPlayer
+ForceProcess=mpc-be64.exe
+
+[Template_MPC-BE_DirectAccess_Profile]
+Tmpl.Title=#4338,MPC-BE
+Tmpl.Class=MediaPlayer
+OpenFilePath=mpc-be64.exe,%AppData%\MPC-BE\*
+
+[Template_MPC-BE_DirectAccess_Photos]
+Tmpl.Title=#4395,MPC-BE
+Tmpl.Class=MediaPlayer
+OpenFilePath=mpc-be64.exe,%USERPROFILE%\Pictures\*
+
+[Template_PotPlayer_Force]
+Tmpl.Title=#4323,PotPlayer
+Tmpl.Class=MediaPlayer
+ForceProcess=PotPlayerMini64.exe
+ForceProcess=PotPlayerMini.exe
+
+[Template_PotPlayer_DirectAccess_Profile]
+Tmpl.Title=#4338,PotPlayer
+Tmpl.Class=MediaPlayer
+OpenFilePath=PotPlayerMini64.exe,%AppData%\PotPlayerMini64
+OpenFilePath=PotPlayerMini.exe,%AppData%\PotPlayerMini
+
+[Template_SMPlayer_Force]
+Tmpl.Title=#4323,SMPlayer
+Tmpl.Class=MediaPlayer
+ForceProcess=smplayer.exe
+
+[Template_SMPlayer_DirectAccess_Profile]
+Tmpl.Title=#4338,SMPlayer
+Tmpl.Class=MediaPlayer
+OpenFilePath=smplayer.exe,%AppData%\mpv\*
+
+[Template_SMPlayer_DirectAccess_Photos]
+Tmpl.Title=#4395,SMPlayer
+Tmpl.Class=MediaPlayer
+OpenFilePath=mpc-hc64.exe,%USERPROFILE%\Pictures\*
+OpenFilePath=mpc-hc.exe,%USERPROFILE%\Pictures\*
+
+[Template_KMPlayer_Force]
+Tmpl.Title=#4323,KMPlayer
+Tmpl.Class=MediaPlayer
+ForceProcess=KMPlayer64.exe
+ForceProcess=KMPlayer.exe
+
+[Template_KMPlayer_DirectAccess_Profile]
+Tmpl.Title=#4338,KMPlayer
+Tmpl.Class=MediaPlayer
+OpenFilePath=KMPlayer64.exe,%AppData%\KMP
+OpenFilePath=KMPlayer.exe,%AppData%\KMP
+
+#
+# Torrent Clients
+#
+
+[Template_qBittorrent_Force]
+Tmpl.Title=#4323,qBittorrent
+Tmpl.Class=TorrentClient
+ForceProcess=qBittorrent.exe
+
+[Template_qBittorrent_DirectAccess_Profile]
+Tmpl.Title=#4338,qBittorrent
+Tmpl.Class=TorrentClient
+OpenFilePath=qBittorrent.exe,%AppDataLocal%\qBittorrent
+OpenFilePath=qBittorrent.exe,%AppData%\qBittorrent
+
+[Template_Transmission_Force]
+Tmpl.Title=#4323,Transmission
+Tmpl.Class=TorrentClient
+ForceProcess=transmission-qt.exe
+
+[Template_Transmission_DirectAccess_Profile]
+Tmpl.Title=#4338,Transmission
+Tmpl.Class=TorrentClient
+OpenFilePath=transmission-qt.exe,%AppDataLocal%\transmission
+
+[Template_BiglyBT_Force]
+Tmpl.Title=#4323,BiglyBT
+Tmpl.Class=TorrentClient
+ForceProcess=BiglyBT.exe
+
+[Template_BiglyBT_DirectAccess_Profile]
+Tmpl.Title=#4338,BiglyBT
+Tmpl.Class=TorrentClient
+OpenFilePath=BiglyBT.exe,%AppData%\BiglyBT
+
 #
 # Download Managers
 #

Sandboxie/msgs/Sbie-English-1033.txt

@@ -3288,6 +3288,22 @@ Email Reader
 The following exclusions allow Email readers running in this sandbox to access mailbox files outside the sandbox.
 .
 
+4393;txt;01
+Media Players
+.
+
+4394;txt;01
+The following exclusions allow Media players running in this sandbox to access files outside the sandbox.
+.
+
+4396;txt;01
+Torrent Clients
+.
+
+4397;txt;01
+The following exclusions allow Torrent clients running in this sandbox access to files outside the sandbox.
+.
+
 #----------------------------------------------------------------------------
 # Sandboxie Control:  Sandbox Settings:  User Accounts
 #----------------------------------------------------------------------------

SandboxiePlus/QSbieAPI/Sandboxie/SbieTemplates.cpp

@@ -264,6 +264,8 @@ void CSbieTemplates::CollectTemplates()
 	Templates.append(GetTemplateNames("Download"));
 	Templates.append(GetTemplateNames("Misc"));
 	Templates.append(GetTemplateNames("WebBrowser"));
+	Templates.append(GetTemplateNames("MediaPlayer"));
+	Templates.append(GetTemplateNames("TorrentClient"));
 
 	foreach(const QString& Template, Templates)
 		m_Templates.insert(Template, 0);
@@ -473,4 +475,4 @@ QString CSbieTemplates::ExpandPath(QString path)
 	foreach(const QString& key, m_Expands.keys())
 		path.replace("%" + key + "%", m_Expands.value(key));
 	return path;
-}
+}