From 153868b625fa8bab0bd0b42c7b8331d7f0edf10b Mon Sep 17 00:00:00 2001 From: isaak654 Date: Sat, 8 Jul 2023 14:29:56 +0200 Subject: [PATCH] Typo fixes [skip ci] --- .github/workflows/codespell.yml | 3 +++ CHANGELOG.md | 2 +- Sandboxie/core/dll/lowlevel_inject.c | 2 +- Sandboxie/core/low/inject.c | 22 +++++++++---------- .../SandMan/Engine/ScriptManager.cpp | 2 +- .../Troubleshooting/AppCompatibility.js | 4 ++-- .../Sandboxing/SBIEMSG/SBIEMSG.js | 2 +- .../SandMan/Troubleshooting/UI/shell.js | 2 +- .../SandMan/Wizards/BoxAssistant.cpp | 18 +++++++-------- 9 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index fb5b1999..7abef788 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -88,6 +88,9 @@ jobs: echo 'tamplete->template' >> dictionary.txt echo 'prising->praising' >> dictionary.txt echo 'wi->we, will' >> dictionary.txt + echo 'dayly->daily' >> dictionary.txt + echo 'erdinal->ordinal' >> dictionary.txt + echo 'wizars->wizard' >> 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,lite,uis,emai,ws,slanguage,woh,tne" \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d67aa07..d344a38c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,7 +45,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - added workaround for Chrome not starting on Windows 11 with KB5027231 [#3040](https://github.com/sandboxie-plus/Sandboxie/issues/3040) - improved compatibility with procmon/stack traces for debug builds - fixed issue with non-standard command lines -- fixed online updater not checking every 7 days but dayly +- fixed online updater not checking every 7 days, but daily ### Removed - cleaned up duplicate code (thanks lmou523) [#3067](https://github.com/sandboxie-plus/Sandboxie/pull/3067) diff --git a/Sandboxie/core/dll/lowlevel_inject.c b/Sandboxie/core/dll/lowlevel_inject.c index c5eb2016..0b85d244 100644 --- a/Sandboxie/core/dll/lowlevel_inject.c +++ b/Sandboxie/core/dll/lowlevel_inject.c @@ -957,7 +957,7 @@ _FX ULONG SbieDll_InjectLow(HANDLE hProcess, ULONG init_flags, BOOLEAN dup_drv_h if (lowdata.flags.is_wow64) { // - // when this is a 32 bit process runing under WoW we need to inject also some 32 bit code + // when this is a 32 bit process running under WoW64, we need to inject also some 32 bit code // remote_addr32 = SbieDll_InjectLow_CopyCode(hProcess, m_sbielow32_len, m_sbielow32_len, m_sbielow32_ptr diff --git a/Sandboxie/core/low/inject.c b/Sandboxie/core/low/inject.c index ec7468b6..d5b9072e 100644 --- a/Sandboxie/core/low/inject.c +++ b/Sandboxie/core/low/inject.c @@ -203,12 +203,12 @@ _FX UCHAR *FindDllExport2( ULONG_PTR DetourFunc(INJECT_DATA *inject) { // - // Note: this function is invoked from the detour code hence when running in WoW64 - // the used instance of this function will be from the 32 bit version + // Note: this function is invoked from the detour code, hence when running in WoW64, + // the used instance of this function will be from the 32 bit version, // in which case we are unable to use SBIELOW_CALL and need to have a - // pointer to the apropriate 32 bit function + // pointer to the appropriate 32 bit function // - // Further more on ARM64 the SBIELOW_DATA will be allocated past the 4 GB boundry + // Furthermore, on ARM64 the SBIELOW_DATA will be allocated past the 4 GB boundary // hence in 32 bit mode we can not access it, only INJECT_DATA is available // @@ -282,7 +282,7 @@ ULONG_PTR DetourFunc(INJECT_DATA *inject) status = ((P_LdrGetProcedureAddress)inject->LdrGetProcAddr)(ModuleHandle, NULL, 1, (ULONG_PTR*)&SbieDllOrdinal1); #ifdef _M_ARM64 // - // on ARM64EC we hook the native code hence we need to obtain the address of the native erdinal 1 from our SbieDll.dll + // on ARM64EC we hook the native code, hence we need to obtain the address of the native ordinal 1 from our SbieDll.dll // instead of the FFS sequence as given by NtGetProcedureAddress when in ARM64EC mode // @@ -304,7 +304,7 @@ ULONG_PTR DetourFunc(INJECT_DATA *inject) } // - // or report error if one occured instead + // or report error if one occurred instead // else { @@ -383,12 +383,12 @@ _FX void InitInject(SBIELOW_DATA *data, void *DetourCode) //ntdll_base = (void *)(ULONG_PTR)ntdll32_base; // - // (prior to Windows 8, the base address of ntdll32 is recorded + // (Prior to Windows 8, the base address of ntdll32 is recorded // in offset 0x036C of the KUSER_SHARED_DATA structure, which always - // has a fixed base address of 0x7FFE0000. this is not available + // has a fixed base address of 0x7FFE0000. This is not available // in Windows 8, so we have to rely on the driver to track this // base address via Process_NotifyImage in core/drv/process.c. - // so we might as well use this approach for all 64-bit Windows.) + // So we might as well use this approach for all 64-bit Windows.) // //ULONG ntdll32_base = *(ULONG *)(0x7FFE0000 + 0x036C); //ntdll_base = (void *)(ULONG_PTR)ntdll32_base; @@ -453,7 +453,7 @@ _FX void InitInject(SBIELOW_DATA *data, void *DetourCode) #endif { // - // for ARM64EC we need native functions, FindDllExport can manage FFS's + // for ARM64EC we need native functions, FindDllExport can manage FFS // however this does not work for syscalls, hence we use the native function directly // @@ -500,7 +500,7 @@ _FX void InitInject(SBIELOW_DATA *data, void *DetourCode) #endif // - // sellect the right version of SbieDll.dll + // select the right version of SbieDll.dll // #ifdef _M_ARM64 diff --git a/SandboxiePlus/SandMan/Engine/ScriptManager.cpp b/SandboxiePlus/SandMan/Engine/ScriptManager.cpp index 1e4b1ab0..e4c87319 100644 --- a/SandboxiePlus/SandMan/Engine/ScriptManager.cpp +++ b/SandboxiePlus/SandMan/Engine/ScriptManager.cpp @@ -237,7 +237,7 @@ void CScriptManager::OnDownload(const QString& Path, const QVariantMap& Params) QString IssueDir; C7zFileEngineHandler IssueFS("issue"); if (!IssueFS.Open(FinalPath)) { - QMessageBox::critical(theGUI, "Sandboxie-Plus", tr("Downloaded troubleshooting instructions are currupted!")); + QMessageBox::critical(theGUI, "Sandboxie-Plus", tr("Downloaded troubleshooting instructions are corrupted!")); QFile::remove(Path); return; } diff --git a/SandboxiePlus/SandMan/Troubleshooting/AppCompatibility.js b/SandboxiePlus/SandMan/Troubleshooting/AppCompatibility.js index 6440a0c3..6e74ecb1 100644 --- a/SandboxiePlus/SandMan/Troubleshooting/AppCompatibility.js +++ b/SandboxiePlus/SandMan/Troubleshooting/AppCompatibility.js @@ -1,7 +1,7 @@ /* * group: system -* name: App compatybility checker -* description: This script check which app compatybility templates needs to be enabled +* name: App compatibility checker +* description: This script check which app compatibility templates need to be enabled * */ diff --git a/SandboxiePlus/SandMan/Troubleshooting/Sandboxing/SBIEMSG/SBIEMSG.js b/SandboxiePlus/SandMan/Troubleshooting/Sandboxing/SBIEMSG/SBIEMSG.js index 5ff926a6..8cfd03e1 100644 --- a/SandboxiePlus/SandMan/Troubleshooting/Sandboxing/SBIEMSG/SBIEMSG.js +++ b/SandboxiePlus/SandMan/Troubleshooting/Sandboxing/SBIEMSG/SBIEMSG.js @@ -44,7 +44,7 @@ if(res === false) { sbie.setupTrace(); - wizard.showStatus(tr('Now please runn your application again to trigger the Sbie message.

') + + wizard.showStatus(tr('Now please run your application again to trigger the Sbie message.

') + tr('Press NEXT when you are done collecting logs.'), true); } diff --git a/SandboxiePlus/SandMan/Troubleshooting/UI/shell.js b/SandboxiePlus/SandMan/Troubleshooting/UI/shell.js index 6b94aaab..3af24a3c 100644 --- a/SandboxiePlus/SandMan/Troubleshooting/UI/shell.js +++ b/SandboxiePlus/SandMan/Troubleshooting/UI/shell.js @@ -21,5 +21,5 @@ let obj = wizard.showForm(form, tr('Select which shell options should be reinsta sbie.shellRemove(); sbie.shellInstall(obj); -// todo query user if mitigation was successfull +// todo query user if mitigation was successful wizard.setResult(true); \ No newline at end of file diff --git a/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp b/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp index db83b247..18a6bf06 100644 --- a/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp +++ b/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp @@ -156,7 +156,7 @@ bool CBoxAssistant::StartEngine() m_pDebugger->show(); } else { - QMessageBox::critical(this, "Sandboxie-Plus", tr("V4ScriptDebuggerBackend could not be instantiated, probably V4ScriptDebugger.dll and or its dependencies are missing, script debuger could not be opened.")); + QMessageBox::critical(this, "Sandboxie-Plus", tr("V4ScriptDebuggerBackend could not be instantiated, probably V4ScriptDebugger.dll and or its dependencies are missing, script debugger could not be opened.")); } } @@ -206,7 +206,7 @@ void CBoxAssistant::reject() if (m_pEngine && currentId() != Page_Submit) { if (theConf->GetInt("Options/WarnWizardOnClose", -1) == -1) { bool State = false; - if (CCheckableMessageBox::question(this, "Sandboxie-Plus", tr("A troubleshooting procedure is in progress, canceling the wizard will abort it, this may leave the sandbox in an incosistent state.") + if (CCheckableMessageBox::question(this, "Sandboxie-Plus", tr("A troubleshooting procedure is in progress, canceling the wizard will abort it, this may leave the sandbox in an inconsistent state.") , tr("Don't ask in future"), &State, QDialogButtonBox::Ok | QDialogButtonBox::Cancel, QDialogButtonBox::Cancel) == QDialogButtonBox::Cancel) return; if (State) @@ -272,8 +272,8 @@ void CBeginPage::initializePage() m_pLayout->addItem(new QSpacerItem(10, 10, QSizePolicy::Fixed, QSizePolicy::Expanding), row++, 0); if (!g_CertInfo.valid || g_CertInfo.expired) { - QLabel* pBottomLabel = new QLabel(tr("With a valid supporter certificate the wizard would be even more powerfull. " - "It could access the online solution database to retriev the latest troubleshooting instructions.")); + QLabel* pBottomLabel = new QLabel(tr("With a valid supporter certificate the wizard would be even more powerful. " + "It could access the online solution database to retrieve the latest troubleshooting instructions.")); connect(pBottomLabel, SIGNAL(linkActivated(const QString&)), theGUI, SLOT(OpenUrl(const QString&))); pBottomLabel->setWordWrap(true); m_pLayout->addWidget(pBottomLabel, row++, 0, 1, 3); @@ -711,7 +711,7 @@ void CRunPage::OnStateChanged(int state, const QString& Text) break; } case CBoxEngine::eError: - m_pTopLabel->setText(tr("Somethign failed internally this troubleshooting procedure can not continue. " + m_pTopLabel->setText(tr("Something failed internally this troubleshooting procedure can not continue. " "You can click on next to submit an issue report.") + (pEngine ? tr("\n\nError: ") + Text : "")); case CBoxEngine::eCanceled: break; @@ -812,16 +812,16 @@ CSubmitPage::CSubmitPage(QWidget *parent) pLayout->addWidget(m_pReport, row++, 0, 1, 3); m_pAttachIni = new QCheckBox(tr("Attach Sandboxie.ini")); - m_pAttachIni->setToolTip(tr("Sandboxing compatybility is relyent on the configuration hence attaching the sandboxie.ini helps a lot with finding the issue.")); + m_pAttachIni->setToolTip(tr("Sandboxing compatibility is reliant on the configuration, hence attaching the Sandboxie.ini file helps a lot with finding the issue.")); pLayout->addWidget(m_pAttachIni, row, 0); m_pAttachLog = new QCheckBox(tr("Attach Logs")); m_pAttachLog->setTristate(true); - m_pAttachLog->setToolTip(tr("Select partially checked state to sends only message log but no trace log.\nBefore sending you can review the logs in the main window.")); + m_pAttachLog->setToolTip(tr("Selecting partially checked state sends only the message log, but not the trace log.\nBefore sending, you can review the logs in the main window.")); pLayout->addWidget(m_pAttachLog, row, 1); m_pAttachDmp = new QCheckBox(tr("Attach Crash Dumps")); - m_pAttachDmp->setToolTip(tr("An applicatin crashed during the troubleshooting procedure, attaching a crash dump can help with the debugging.")); + m_pAttachDmp->setToolTip(tr("An application crashed during the troubleshooting procedure, attaching a crash dump can help with the debugging.")); pLayout->addWidget(m_pAttachDmp, row, 2); m_pMail = new QLineEdit(); @@ -1027,7 +1027,7 @@ bool CSubmitPage::validatePage() return; } - QMessageBox::information(this, "Sandboxie-Plus", tr("Your issue report have been successfully submitted, thank you.")); + QMessageBox::information(this, "Sandboxie-Plus", tr("Your issue report has been successfully submitted, thank you.")); wizard()->close(); });