From e011563abf5fe941d7568f90c621e732a252c572 Mon Sep 17 00:00:00 2001 From: isaak654 Date: Sat, 13 Feb 2021 17:21:11 +0100 Subject: [PATCH 1/6] Update AppPage.cpp 1) Removed many references to outdated templates 2) Added two rules to delete invalid OpenFilePath references from Sandboxie.ini (Sbie classic only) I have commented the new additions, please review carefully. --- Sandboxie/apps/control/AppPage.cpp | 103 ++++++++--------------------- 1 file changed, 27 insertions(+), 76 deletions(-) diff --git a/Sandboxie/apps/control/AppPage.cpp b/Sandboxie/apps/control/AppPage.cpp index ba517a47..190cbeb6 100644 --- a/Sandboxie/apps/control/AppPage.cpp +++ b/Sandboxie/apps/control/AppPage.cpp @@ -1169,38 +1169,43 @@ void CAppPage::UpdateWebTemplates(CBox &box) // find and remove: // OpenFilePath=seamonkey.exe,%AppData%\Mozilla\Profiles\*\bookmark* // OpenFilePath=seamonkey.exe,%AppData%\Mozilla\Profiles\*\places* - // OpenFilePath=seamon~1.exe,%AppData%\Mozilla\Profiles\*\bookmark* - // OpenFilePath=seamon~1.exe,%AppData%\Mozilla\Profiles\*\places* // // replace with: Template=SeaMonkey_Bookmarks_DirectAccess // - //const CString &SeaMonkeyTemplate(L"SeaMonkey_Bookmarks_DirectAccess"); - //const CString &SeaMonkeyPath1( - // L"%AppData%\\Mozilla\\Profiles\\*\\bookmark*"); - //const CString &SeaMonkeyPath2( - // L"%AppData%\\Mozilla\\Profiles\\*\\places*"); + const CString &SeaMonkeyTemplate(L"SeaMonkey_Bookmarks_DirectAccess"); + const CString &SeaMonkeyPath1( + L"%AppData%\\Mozilla\\Profiles\\*\\bookmark*"); + const CString &SeaMonkeyPath2( + L"%AppData%\\Mozilla\\Profiles\\*\\places*"); - //UpdateTemplates2( - // box, L"seamonkey.exe", SeaMonkeyTemplate, - // SeaMonkeyPath1, SeaMonkeyPath2); - - //UpdateTemplates2( - // box, L"seamon~1.exe", SeaMonkeyTemplate, - // SeaMonkeyPath1, SeaMonkeyPath2); + UpdateTemplates2( + box, L"seamonkey.exe", SeaMonkeyTemplate, + SeaMonkeyPath1, SeaMonkeyPath2); // // find and remove: - // OpenFilePath=opera.exe,%AppData%\Opera\Opera\Profile\opera6.adr - // OpenFilePath=opera.exe,%AppData%\Opera\Opera\Profile\notes.adr + // OpenFilePath=opera.exe,%AppData%\Opera Software\Opera Stable\Bookmarks + // OpenFilePath=opera.exe,%AppData%\Opera Software\Opera Stable\Bookmarks.bak + // OpenFilePath=opera.exe,%AppData%\Opera Software\Opera Stable\BookmarksExtras // - // replace with: Template=SeaMonkey_Bookmarks_DirectAccess + // replace with: Template=Opera_Bookmarks_DirectAccess // - //UpdateTemplates2( - // box, L"opera.exe", L"Opera_Bookmarks_DirectAccess", - // L"%AppData%\\Opera\\Opera\\Profile\\opera6.adr", - // L"%AppData%\\Opera\\Opera\\Profile\\notes.adr"); + UpdateTemplates2( + box, L"opera.exe", L"Opera_Bookmarks_DirectAccess", + L"%AppData%\\Opera Software\\Opera Stable\\Bookmarks", + L"%AppData%\\Opera Software\\Opera Stable\\Bookmarks.bak", + L"%AppData%\\Opera Software\\Opera Stable\\BookmarksExtras"); + + // + // find and remove invalid OpenFilePath reference: + // OpenFilePath=bookmarks.exe,bookmarks* + // + + UpdateTemplates2( + box, L"bookmarks.exe", L"", + L"bookmarks*"); } @@ -1211,51 +1216,6 @@ void CAppPage::UpdateWebTemplates(CBox &box) void CAppPage::UpdateEmailTemplates(CBox &box) { - // - // find and remove: - // OpenFilePath=msimn.exe,%AppData%\Identities - // OpenFilePath=msimn.exe,%Local AppData%\Identities - // OpenFilePath=msimn.exe,%AppData%\Microsoft\Address Book - // OpenFilePath=msimn.exe,*.eml - // - // replace with: Template=Outlook_Express - // - // discard: - // OpenKeyPath=msimn.exe,HKEY_CURRENT_USER\Identities - // OpenKeyPath=msimn.exe, - // HKEY_CURRENT_USER\Software\Microsoft\Outlook Express - // OpenKeyPath=msimn.exe, - // HKEY_CURRENT_USER\Software\Microsoft\Internet Account Manager - // OpenKeyPath=msimn.exe, - // HKEY_LOCAL_MACHINE\Software\Microsoft\Outlook Express - // OpenKeyPath=msimn.exe, - // HKEY_LOCAL_MACHINE\Software\Wow6432Node\Microsoft\ - // Outlook Express - // - - //CStringList _OutlookExpressFiles; - //CStringList _OutlookExpressKeys; - - //_OutlookExpressFiles.AddTail(L"%AppData%\\Identities"); - //_OutlookExpressFiles.AddTail(L"%Local AppData%\\Identities"); - //_OutlookExpressFiles.AddTail(L"%AppData%\\Microsoft\\Address Book"); - //_OutlookExpressFiles.AddTail(L"*.eml"); - - //_OutlookExpressKeys.AddTail(L"HKEY_CURRENT_USER\\Identities"); - //_OutlookExpressKeys.AddTail( - // L"HKEY_CURRENT_USER\\Software\\Microsoft\\Outlook Express"); - //_OutlookExpressKeys.AddTail( - // L"HKEY_CURRENT_USER\\Software\\Microsoft\\Internet Account Manager"); - //_OutlookExpressKeys.AddTail( - // L"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Outlook Express"); - //_OutlookExpressKeys.AddTail( - // L"HKEY_LOCAL_MACHINE\\Software\\Wow6432Node\\" - // L"Microsoft\\Outlook Express"); - - //UpdateTemplates3( - // box, L"msimn.exe", L"Outlook_Express", - // _OutlookExpressFiles, _OutlookExpressKeys); - // // find and remove: // OpenFilePath=outlook.exe,%AppData%\Microsoft\Outlook @@ -1383,15 +1343,10 @@ void CAppPage::UpdateEmailTemplates(CBox &box) box, L"thunderbird.exe", _Thunderbird, _ThunderbirdFiles, _ThunderbirdKeys); - //UpdateTemplates3( - // box, L"thunde~1.exe", _Thunderbird, - // _ThunderbirdFiles, _ThunderbirdKeys); - // // find and remove: // OpenFilePath=seamonkey.exe,%AppData%\Mozilla\Profiles\*\Mail* - // OpenFilePath=seamonkey.exe, - // %Local AppData%\Mozilla\Profiles\*\Mail* + // OpenFilePath=seamonkey.exe,%Local AppData%\Mozilla\Profiles\*\Mail* // // replace with: Template=SeaMonkey // @@ -1423,10 +1378,6 @@ void CAppPage::UpdateEmailTemplates(CBox &box) box, L"seamonkey.exe", _SeaMonkey, _SeaMonkeyFiles, _SeaMonkeyKeys); - //UpdateTemplates3( - // box, L"seamon~1.exe", _SeaMonkey, - // _SeaMonkeyFiles, _SeaMonkeyKeys); - // // find and remove: // OpenFilePath=opera.exe,%AppData%\Opera\Opera\mail From f0bac29ced8a8a74be597191332364bd96ff3a6c Mon Sep 17 00:00:00 2001 From: isaak654 Date: Sat, 13 Feb 2021 17:32:27 +0100 Subject: [PATCH 2/6] Additional fixes --- Sandboxie/apps/control/AppPage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sandboxie/apps/control/AppPage.cpp b/Sandboxie/apps/control/AppPage.cpp index 190cbeb6..eb14c37f 100644 --- a/Sandboxie/apps/control/AppPage.cpp +++ b/Sandboxie/apps/control/AppPage.cpp @@ -1175,9 +1175,9 @@ void CAppPage::UpdateWebTemplates(CBox &box) const CString &SeaMonkeyTemplate(L"SeaMonkey_Bookmarks_DirectAccess"); const CString &SeaMonkeyPath1( - L"%AppData%\\Mozilla\\Profiles\\*\\bookmark*"); + L"%AppData%\\Mozilla\\SeaMonkey\\Profiles\\*\\bookmark*"); const CString &SeaMonkeyPath2( - L"%AppData%\\Mozilla\\Profiles\\*\\places*"); + L"%AppData%\\Mozilla\\SeaMonkey\\Profiles\\*\\places*"); UpdateTemplates2( box, L"seamonkey.exe", SeaMonkeyTemplate, From 104fdb07aa0df86948560f4ee577aa647d10a9d9 Mon Sep 17 00:00:00 2001 From: isaak654 Date: Sat, 13 Feb 2021 18:36:38 +0100 Subject: [PATCH 3/6] Additional fixes (2) --- Sandboxie/apps/control/AppPage.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Sandboxie/apps/control/AppPage.cpp b/Sandboxie/apps/control/AppPage.cpp index eb14c37f..c90d2b9a 100644 --- a/Sandboxie/apps/control/AppPage.cpp +++ b/Sandboxie/apps/control/AppPage.cpp @@ -1191,12 +1191,17 @@ void CAppPage::UpdateWebTemplates(CBox &box) // // replace with: Template=Opera_Bookmarks_DirectAccess // + + const CString &OperaBookmarksTemplate(L"Opera_Bookmarks_DirectAccess"); + const CString &OperaBookmarks1(L"%AppData%\\Opera Software\\Opera Stable\\Bookmarks"); + const CString &OperaBookmarks2(L"%AppData%\\Opera Software\\Opera Stable\\Bookmarks.bak"); + const CString &OperaBookmarks3(L"%AppData%\\Opera Software\\Opera Stable\\BookmarksExtras"); UpdateTemplates2( - box, L"opera.exe", L"Opera_Bookmarks_DirectAccess", - L"%AppData%\\Opera Software\\Opera Stable\\Bookmarks", - L"%AppData%\\Opera Software\\Opera Stable\\Bookmarks.bak", - L"%AppData%\\Opera Software\\Opera Stable\\BookmarksExtras"); + box, L"opera.exe", OperaBookmarksTemplate, OperaBookmarks1, OperaBookmarks2); + + UpdateTemplates2( + box, L"opera.exe", OperaBookmarksTemplate, OperaBookmarks3, OperaBookmarks3); // // find and remove invalid OpenFilePath reference: @@ -1204,7 +1209,7 @@ void CAppPage::UpdateWebTemplates(CBox &box) // UpdateTemplates2( - box, L"bookmarks.exe", L"", + box, L"bookmarks.exe", L"\0", L"bookmarks*"); } @@ -1385,10 +1390,10 @@ void CAppPage::UpdateEmailTemplates(CBox &box) // replace with: Template=Opera_Mail // - CString _OperaPath1(L"%AppData%\\Opera\\Opera\\mail"); + CString _OperaMailPath1(L"%AppData%\\Opera\\Opera\\mail"); UpdateTemplates2( - box, L"opera.exe", L"Opera_Mail", _OperaPath1, _OperaPath1); + box, L"opera.exe", L"Opera_Mail", _OperaMailPath1, _OperaMailPath1); } From ca17a9ed3516f3ce119071cf86ab5c53bfef5511 Mon Sep 17 00:00:00 2001 From: isaak654 Date: Sat, 13 Feb 2021 18:49:01 +0100 Subject: [PATCH 4/6] Update AppPage.cpp --- Sandboxie/apps/control/AppPage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sandboxie/apps/control/AppPage.cpp b/Sandboxie/apps/control/AppPage.cpp index c90d2b9a..74742727 100644 --- a/Sandboxie/apps/control/AppPage.cpp +++ b/Sandboxie/apps/control/AppPage.cpp @@ -1209,7 +1209,7 @@ void CAppPage::UpdateWebTemplates(CBox &box) // UpdateTemplates2( - box, L"bookmarks.exe", L"\0", + box, L"bookmarks.exe", L'\0', L"bookmarks*"); } From 32249a0520b900801f14a41ee62fca50ec43814a Mon Sep 17 00:00:00 2001 From: isaak654 Date: Sat, 13 Feb 2021 18:59:52 +0100 Subject: [PATCH 5/6] Update AppPage.cpp --- Sandboxie/apps/control/AppPage.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Sandboxie/apps/control/AppPage.cpp b/Sandboxie/apps/control/AppPage.cpp index 74742727..46d24c86 100644 --- a/Sandboxie/apps/control/AppPage.cpp +++ b/Sandboxie/apps/control/AppPage.cpp @@ -1192,25 +1192,26 @@ void CAppPage::UpdateWebTemplates(CBox &box) // replace with: Template=Opera_Bookmarks_DirectAccess // - const CString &OperaBookmarksTemplate(L"Opera_Bookmarks_DirectAccess"); + const CString &OperaBookmarksTmpl(L"Opera_Bookmarks_DirectAccess"); const CString &OperaBookmarks1(L"%AppData%\\Opera Software\\Opera Stable\\Bookmarks"); const CString &OperaBookmarks2(L"%AppData%\\Opera Software\\Opera Stable\\Bookmarks.bak"); const CString &OperaBookmarks3(L"%AppData%\\Opera Software\\Opera Stable\\BookmarksExtras"); UpdateTemplates2( - box, L"opera.exe", OperaBookmarksTemplate, OperaBookmarks1, OperaBookmarks2); + box, L"opera.exe", OperaBookmarksTmpl, OperaBookmarks1, OperaBookmarks2); UpdateTemplates2( - box, L"opera.exe", OperaBookmarksTemplate, OperaBookmarks3, OperaBookmarks3); + box, L"opera.exe", OperaBookmarksTmpl, OperaBookmarks3, OperaBookmarks3); // // find and remove invalid OpenFilePath reference: // OpenFilePath=bookmarks.exe,bookmarks* // + const CString &InvalidEntry1(L"bookmarks*"); + UpdateTemplates2( - box, L"bookmarks.exe", L'\0', - L"bookmarks*"); + box, L"bookmarks.exe", L'\0', InvalidEntry1, InvalidEntry1); } From 103d0f2657feea778232bc2c39c4cf0adf9577c1 Mon Sep 17 00:00:00 2001 From: isaak654 Date: Sat, 13 Feb 2021 19:58:34 +0100 Subject: [PATCH 6/6] Typo fix --- Sandboxie/apps/control/AppPage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sandboxie/apps/control/AppPage.cpp b/Sandboxie/apps/control/AppPage.cpp index 46d24c86..6beb3f35 100644 --- a/Sandboxie/apps/control/AppPage.cpp +++ b/Sandboxie/apps/control/AppPage.cpp @@ -1135,7 +1135,7 @@ void CAppPage::UpdateTemplates(CBox &box) UpdateEmailTemplates(box); // - // finaly, enable default templates + // finally, enable default templates // SetDefaultTemplates6(box);