diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index e4097524..a5fbc1a1 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -38,7 +38,7 @@ jobs: wget -q https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary.txt wget -q https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary_rare.txt wget -q https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary_code.txt - # Add further typos to check + # Add further typos to check continuously echo 'behavioure->behaviour' >> dictionary.txt echo 'blockign->blocking' >> dictionary.txt echo 'ate->are' >> dictionary.txt @@ -46,6 +46,10 @@ jobs: echo 'actuallly->actually' >> dictionary.txt echo 'asynchroniusly->asynchronously' >> dictionary.txt echo 'seams->seems' >> dictionary.txt + echo 'selelction->selection' >> dictionary.txt + echo 'injectted->injected' >> dictionary.txt + echo 'prepanding->prepending' >> dictionary.txt + echo 'probablys->probably' >> dictionary.txt # Only lowercase letters are allowed in --ignore-words-list codespell --dictionary=dictionary.txt --dictionary=dictionary_rare.txt --dictionary=dictionary_code.txt \ --ignore-words-list="wil,unknwn,tolen,pevent,doubleclick,parm,parms,etcp,ois,ba,ptd,modell,namesd,stdio,uint,errorstring,ontext,atend,deque,ecounter,nmake,namess,inh,daa,varient" \ diff --git a/CHANGELOG.md b/CHANGELOG.md index cdd6b7d8..c171cb30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [1.6.1a / 5.61.1] - 2022-12-07 ### Added -- added run boxed command to the sandbox menu +- added "Run Sandboxed" command to the sandbox menu - DefaultBox can now be replaced with another sandbox [#2445](https://github.com/sandboxie-plus/Sandboxie/issues/2445) ### Fixed diff --git a/Sandboxie/common/dllimport.c b/Sandboxie/common/dllimport.c index 6895ed86..6a3a644d 100644 --- a/Sandboxie/common/dllimport.c +++ b/Sandboxie/common/dllimport.c @@ -343,7 +343,7 @@ DWORD64 FindDllExport_impl(P_NtReadVirtualMemory64 ReadDll, HANDLE hProcess, DWO DYN_RELOC_TABLE* DynamicValueRelocTable = NULL; - if (DllBase == 0 && (resolve_ec || resolve_exp)) { // only for images on disk, on linve images we take the actuallly used export directory + if (DllBase == 0 && (resolve_ec || resolve_exp)) { // only for images on disk, on live images we take the actually used export directory PIMAGE_SECTION_HEADER section = IMAGE_FIRST_SECTION(nt_hdrs); nt_hdrs->FileHeader.NumberOfSections; diff --git a/Sandboxie/core/dll/dllpath.c b/Sandboxie/core/dll/dllpath.c index 38141885..4c5d5318 100644 --- a/Sandboxie/core/dll/dllpath.c +++ b/Sandboxie/core/dll/dllpath.c @@ -471,7 +471,7 @@ _FX ULONG SbieDll_MatchPath2(WCHAR path_code, const WCHAR *path, BOOLEAN bCheckO BOOLEAN use_rule_specificity = (path_code == L'f' || path_code == L'k' || path_code == L'i') && (Dll_ProcessFlags & SBIE_FLAG_RULE_SPECIFICITY) != 0; // - // set default behavioure + // set default behaviour // level = 3; // 3 - global default - lower is better, 3 is max value diff --git a/Sandboxie/core/dll/guihook.c b/Sandboxie/core/dll/guihook.c index 76f11dd4..8a8b006c 100644 --- a/Sandboxie/core/dll/guihook.c +++ b/Sandboxie/core/dll/guihook.c @@ -219,7 +219,7 @@ _FX HHOOK Gui_SetWindowsHookExW( // // we also don't care if the target thread is in the same process. // - // in any other case, the hooker probablys expects their hook dll to + // in any other case, the hooker probably expects their hook dll to // be injected into target threads, but this will not occur. // // on Vista and later, UIPI will prevent the dll from loading into @@ -232,9 +232,9 @@ _FX HHOOK Gui_SetWindowsHookExW( // // the boxed "global" hook mechanism should only be used for global hooks - // using it for hooks that specify a thread ID like done in sbie 5.33.6 - // and earlier results in a non standard conform behavioure: - // the hook in handled as a global one and injectted into all processes. + // using it for hooks that specify a thread ID like done in SBIE 5.33.6 + // and earlier results in a non standard conform behaviour: + // the hook in handled as a global one and injected into all processes. // // so we let the system handle hooks on a specified thread or once without // a dll module handle always as those are not global diff --git a/Sandboxie/core/dll/key.c b/Sandboxie/core/dll/key.c index 3af5dd11..d2a26e1b 100644 --- a/Sandboxie/core/dll/key.c +++ b/Sandboxie/core/dll/key.c @@ -504,7 +504,7 @@ _FX NTSTATUS Key_GetName( // // Note: some keys like L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\007" // do not return valid results when querying using NtQueryKey and returns a STATUS_INVALID_HANDLE - // using Obj_GetObjectName seams to break sbie on 1803, strangely on w7 its fine + // using Obj_GetObjectName seems to break SBIE on Windows 10 1803, strangely on W7 it is fine // hence this alternative access mode is made optional // diff --git a/Sandboxie/core/dll/net.c b/Sandboxie/core/dll/net.c index 31ffe2ea..2dd859f4 100644 --- a/Sandboxie/core/dll/net.c +++ b/Sandboxie/core/dll/net.c @@ -751,9 +751,9 @@ _FX int WSA_AcceptEx( LPOVERLAPPED lpOverlapped) { // - // this call can operate asynchroniusly, hence we can not simply filter here the incoming connection + // this call can operate asynchronously, hence we can not simply filter here the incoming connection // as we have a proper WFP filter in the driver for now this usermode filtering implementation - // will not filter incoming traffic at all, normally users ate behind NATs or other firewall so + // will not filter incoming traffic at all, normally users are behind NATs or other firewall so // blocking only outgoing connections should be good enough // diff --git a/Sandboxie/core/dll/secure.c b/Sandboxie/core/dll/secure.c index a506085d..64abb8a0 100644 --- a/Sandboxie/core/dll/secure.c +++ b/Sandboxie/core/dll/secure.c @@ -1108,7 +1108,7 @@ NTSTATUS Ldr_NtAccessCheckByType(PSECURITY_DESCRIPTOR SecurityDescriptor, PSID P NTSTATUS rc; HANDLE hTokenReal = NULL; - // todo: is that right? seams wrong + // todo: is that right? It seems wrong if (Dll_ImageType == DLL_IMAGE_SANDBOXIE_BITS || Dll_ImageType == DLL_IMAGE_SANDBOXIE_WUAU || Dll_ImageType == DLL_IMAGE_WUAUCLT) { diff --git a/Sandboxie/core/dll/sxs.c b/Sandboxie/core/dll/sxs.c index 1334cc9d..0231e80b 100644 --- a/Sandboxie/core/dll/sxs.c +++ b/Sandboxie/core/dll/sxs.c @@ -2013,7 +2013,7 @@ _FX BOOLEAN Sxs_PreferExternal(THREAD_DATA *TlsData) return FALSE; // - // KB5014019 breaks edge, it seams making edge start its child processes with + // KB5014019 breaks Edge, it seems that making Edge to start its child processes with // PreferExternalManifest fixes the issue, but the main process must be loaded normally // hence we have ExternalManifestHack that checks the parent and not the target // diff --git a/Sandboxie/core/drv/process_util.c b/Sandboxie/core/drv/process_util.c index 88b01c4f..ede79778 100644 --- a/Sandboxie/core/drv/process_util.c +++ b/Sandboxie/core/drv/process_util.c @@ -928,11 +928,11 @@ _FX ULONG Process_MatchPathEx( // // If a rule ends with an * it is not exact and will be overruled by an exact rule // - // Adding UseRuleSpecificity=n disables this behavioure and reverts to the old classical one + // Adding UseRuleSpecificity=n disables this behaviour and reverts to the old classical one // // - // set default behavioure + // set default behaviour // level = 3; // 3 - global default - lower is better, 3 is max value @@ -993,7 +993,7 @@ _FX ULONG Process_MatchPathEx( } // - // read path list behaves in the kernel like the default normal behavioure + // read path list behaves in the kernel like the default normal behaviour // these paths allow read only access to true path and copy locations // @@ -1003,7 +1003,7 @@ _FX ULONG Process_MatchPathEx( } // - // normal path list restores normal behavioure when used in specific mode + // normal path list restores normal behaviour when used in specific mode // these paths allow reading the true location and write to the copy location // diff --git a/Sandboxie/core/svc/serviceserver2.cpp b/Sandboxie/core/svc/serviceserver2.cpp index 829e7b2b..21661ac7 100644 --- a/Sandboxie/core/svc/serviceserver2.cpp +++ b/Sandboxie/core/svc/serviceserver2.cpp @@ -293,7 +293,7 @@ int ServiceServer::RunServiceAsSystem(const WCHAR* svcname, const WCHAR* boxname if (svcname && _wcsicmp(svcname, L"MSIServer") == 0 && SbieApi_QueryConfBool(boxname, L"MsiInstallerExemptions", FALSE)) return 2; - // legacy behavioure option + // legacy behaviour option if (SbieApi_QueryConfBool(boxname, L"RunServicesAsSystem", FALSE)) return 1; diff --git a/SandboxiePlus/MiscHelpers/Common/SortFilterProxyModel.h b/SandboxiePlus/MiscHelpers/Common/SortFilterProxyModel.h index 28b9d43f..d1acec56 100644 --- a/SandboxiePlus/MiscHelpers/Common/SortFilterProxyModel.h +++ b/SandboxiePlus/MiscHelpers/Common/SortFilterProxyModel.h @@ -48,7 +48,7 @@ public: } } - // default behavioure + // default behaviour return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent); } diff --git a/SandboxiePlus/SandMan/OnlineUpdater.cpp b/SandboxiePlus/SandMan/OnlineUpdater.cpp index 8e738564..5f0d7c8c 100644 --- a/SandboxiePlus/SandMan/OnlineUpdater.cpp +++ b/SandboxiePlus/SandMan/OnlineUpdater.cpp @@ -49,7 +49,7 @@ COnlineUpdater::COnlineUpdater(QObject *parent) : QObject(parent) int iUpdate = 0; QString UpdateStr = ParseVersionStr(theConf->GetString("Updater/PendingUpdate"), &iUpdate); if (!IsVersionNewer(UpdateStr) && (UpdateStr != GetCurrentVersion() || iUpdate <= GetCurrentUpdate())) - theConf->SetValue("Updater/PendingUpdate", ""); // seams update has been applied + theConf->SetValue("Updater/PendingUpdate", ""); // it seems update has been applied bool bIsInstallerReady = false; QString FilePath = theConf->GetString("Updater/InstallerPath"); @@ -315,7 +315,7 @@ bool COnlineUpdater::HandleUpdate() theConf->SetValue("Updater/PendingUpdate", PendingUpdate); // - // special case: updates allowed be to installed, but releases only allowed to be download + // special case: updates allowed be to installed, but releases only allowed to be downloaded // solution: apply updates silently, then prompt to install new release, else prioritize installing new releases over updating the existing one // diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp index b76a4952..40f966fa 100644 --- a/SandboxiePlus/SandMan/SandMan.cpp +++ b/SandboxiePlus/SandMan/SandMan.cpp @@ -1410,7 +1410,7 @@ void CSandMan::timerEvent(QTimerEvent* pEvent) m_pBoxView->Refresh(); - if(!IsSilentMode()) // dont check for updates when in presentation/game mode + if(!IsSilentMode()) // do not check for updates when in presentation/game mode m_pUpdater->Process(); if (!m_MissingTemplates.isEmpty()) diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp index b7e47688..6a552445 100644 --- a/SandboxiePlus/SandMan/Views/SbieView.cpp +++ b/SandboxiePlus/SandMan/Views/SbieView.cpp @@ -874,7 +874,7 @@ void CSbieView::OnGroupAction(QAction* Action) if (Offset == 0) return; - // todo: fix behavioure on multiple selelction + // todo: fix behaviour on multiple selection foreach(const QString& Name, GetSelectedGroups(true)) { bool bFound = false; retry: diff --git a/SandboxiePlus/SandMan/Windows/OptionsAccess.cpp b/SandboxiePlus/SandMan/Windows/OptionsAccess.cpp index d4d00692..6ee98baa 100644 --- a/SandboxiePlus/SandMan/Windows/OptionsAccess.cpp +++ b/SandboxiePlus/SandMan/Windows/OptionsAccess.cpp @@ -392,7 +392,7 @@ void COptionsWindow::AddAccessEntry(EAccessType Type, EAccessMode Mode, QString ////////////////////////////////////////////////////////// // File and Registry entries auto append a '*' wildcard // when they don't contain any. - // Prepanding '|' disables this behavioure + // Prepending '|' disables this behaviour // QString sPath = Path; diff --git a/SandboxiePlus/SandMan/Windows/OptionsNetwork.cpp b/SandboxiePlus/SandMan/Windows/OptionsNetwork.cpp index 39da2023..079198f5 100644 --- a/SandboxiePlus/SandMan/Windows/OptionsNetwork.cpp +++ b/SandboxiePlus/SandMan/Windows/OptionsNetwork.cpp @@ -44,7 +44,7 @@ void COptionsWindow::CreateNetwork() void COptionsWindow::LoadINetAccess() { m_IsEnabledWFP = m_pBox->GetAPI()->GetGlobalSettings()->GetBool("NetworkEnableWFP", false); - // check if we are blockign globaly and if so adapt the behavioure accordingly + // check if we are blocking globally and if so adapt the behaviour accordingly m_WFPisBlocking = !m_pBox->GetAPI()->GetGlobalSettings()->GetBool("AllowNetworkAccess", true); ui.lblNoWfp->setVisible(!m_IsEnabledWFP); // warn user that this is only user mode @@ -479,7 +479,7 @@ void COptionsWindow::SaveNetFwRules() QString Prot = pItem->text(4); QString Temp = GetFwRuleActionStr(Action); - //if (Program.contains("=") || Program.contains(";") || Program.contains(",")) // todo: make sbie parse this proeprly + //if (Program.contains("=") || Program.contains(";") || Program.contains(",")) // todo: make SBIE parses this properly // Program = "\'" + Program + "\'"; if (Program.isEmpty()) Program = "*";