From f42da11f6df25ec29629a3eb7d7ed118532452e1 Mon Sep 17 00:00:00 2001 From: offhub Date: Sat, 21 Oct 2023 15:10:45 +0300 Subject: [PATCH] Typo fixes and codespell update --- .github/workflows/codespell.yml | 12 +++++++++--- Sandboxie/apps/start/start.cpp | 2 +- Sandboxie/common/Detours/creatwth.cpp | 2 +- Sandboxie/core/dll/file_copy.c | 2 +- Sandboxie/core/dll/file_link.c | 2 +- Sandboxie/core/dll/ipc.c | 2 +- Sandboxie/core/dll/proc.c | 2 +- Sandboxie/core/drv/verify.c | 2 +- Sandboxie/core/svc/MountManager.cpp | 8 ++++---- Sandboxie/core/svc/MountManagerWire.h | 2 +- Sandboxie/core/svc/sbieiniserver.cpp | 2 +- Sandboxie/core/svc/stdafx.h | 2 +- .../Archive/7z/CPP/7zip/Archive/IArchive.h | 2 +- .../MiscHelpers/Archive/7z/CPP/Common/MyCom.h | 2 +- SandboxiePlus/SandMan/Forms/OptionsWindow.ui | 2 +- SandboxiePlus/SandMan/OnlineUpdater.cpp | 6 +++--- .../Troubleshooting/Sandboxing/SBIEMSG/SBIEFIXPC.js | 2 +- SandboxiePlus/SandMan/Windows/SettingsWindow.cpp | 2 +- SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp | 8 ++++---- SandboxiePlus/SandMan/Wizards/SetupWizard.cpp | 4 ++-- SandboxieTools/ImBox/ImBox.cpp | 2 +- SandboxieTools/ImBox/ImDiskIO.cpp | 6 +++--- .../ImBox/dc/crypto_fast/amd64/aes_amd64.asm | 2 +- .../ImBox/dc/crypto_fast/amd64/twofish_amd64.asm | 12 ++++++------ .../ImBox/dc/crypto_fast/i386/twofish_i386.asm | 8 ++++---- SandboxieTools/ImBox/dc/crypto_fast/sha512.c | 2 +- .../ImBox/dc/crypto_fast/sha512_hmac_drbg.c | 2 +- SandboxieTools/ImBox/dc/crypto_fast/sha512_pkcs5_2.c | 4 ++-- .../ImBox/dc/crypto_small/sha512_pkcs5_2_small.c | 4 ++-- SandboxieTools/ImBox/dc/crypto_small/sha512_small.c | 2 +- SandboxieTools/ImBox/dc/tools/yasm/COPYING | 2 +- SandboxieTools/ImDisk/inc/ntkmapi.h | 8 ++++---- SandboxieTools/ImDisk/inc/ntumapi.h | 4 ++-- SandboxieTools/ImDisk/inc/wio.hpp | 2 +- 34 files changed, 67 insertions(+), 61 deletions(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index d5652c77..281ca78d 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -93,15 +93,21 @@ jobs: echo 'unsoecific->unspecific' >> dictionary.txt echo 'soecific->specific' >> dictionary.txt echo 'cpecific->specific' >> dictionary.txt + echo 'incomatible->incompatible' >> dictionary.txt + echo 'maliciouse->malicious' >> dictionary.txt + echo 'strickt->strict' >> dictionary.txt + echo 'brak->break' >> dictionary.txt + echo "lets->let's" >> dictionary.txt echo 'crome->Chrome' >> dictionary_code.txt echo 'chromim->Chromium' >> dictionary_code.txt echo 'kmdutill->kmdutil' >> dictionary_code.txt - echo 'ancrypted->an crypted' >> dictionary_code.txt + echo 'ancrypted->encrypted' >> dictionary_code.txt echo 'hadrware->hardware' >> dictionary_code.txt echo 'sandbocie->Sandboxie' >> dictionary_code.txt echo 'sanboxie->Sandboxie' >> dictionary_code.txt echo "sandboxies->Sandboxie's, sandboxed" >> dictionary_code.txt + echo 'reparese->reparse' >> dictionary_code.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,typpos" \ - --skip="./.git,./.github/workflows/codespell.yml,./dictionary*.txt,./Sandboxie/msgs/Text-*-*.txt,./Sandboxie/msgs/report/Report-*.txt,./SandboxiePlus/SandMan/*.ts,./Installer/Languages.iss,./Installer/isl/*.isl,./Sandboxie/common/Detours/Makefile,./Sandboxie/common/Detours/disasm.cpp,./Sandboxie/install/build.bat" + --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,typpos,enew,shft,seh,ser" \ + --skip="./.git,./.github/workflows/codespell.yml,./dictionary*.txt,./Sandboxie/msgs/Text-*-*.txt,./Sandboxie/msgs/report/Report-*.txt,./SandboxiePlus/SandMan/*.ts,./Installer/Languages.iss,./Installer/isl/*.isl,./Sandboxie/common/Detours/Makefile,./Sandboxie/common/Detours/disasm.cpp,./Sandboxie/install/build.bat,./SandboxieTools/ImBox/dc/crypto_fast/xts_fast.c,./Sandboxie/apps/control/TreePropSheet.h,./Sandboxie/apps/control/PropPageFrame.h,./Sandboxie/apps/control/PropPageFrameDefault.h" diff --git a/Sandboxie/apps/start/start.cpp b/Sandboxie/apps/start/start.cpp index 2d1ffcfa..d40de2f8 100644 --- a/Sandboxie/apps/start/start.cpp +++ b/Sandboxie/apps/start/start.cpp @@ -1680,7 +1680,7 @@ ULONG RestartInSandbox(void) // build command line. note that we pass the current directory as an // environment variable which will be queried by Program_Start. this // is because SbieSvc ProcessServer (used by SbieDll_RunSandboxed) - // does not necssarily share our dos device map, and will not be able + // does not necessarily share our dos device map, and will not be able // to change to a drive letter that isn't in its dos device map // diff --git a/Sandboxie/common/Detours/creatwth.cpp b/Sandboxie/common/Detours/creatwth.cpp index bbe7cc8f..2644dfbc 100644 --- a/Sandboxie/common/Detours/creatwth.cpp +++ b/Sandboxie/common/Detours/creatwth.cpp @@ -48,7 +48,7 @@ const GUID DETOUR_EXE_HELPER_GUID = { /* ea0251b9-5cde-41b5-98d0-2af4a26b0fee */ ////////////////////////////////////////////////////////////////////////////// // -// Enumate through modules in the target process. +// Enumerate through modules in the target process. // static BOOL WINAPI LoadNtHeaderFromProcess(HANDLE hProcess, HMODULE hModule, diff --git a/Sandboxie/core/dll/file_copy.c b/Sandboxie/core/dll/file_copy.c index 8cb0978e..ca9002de 100644 --- a/Sandboxie/core/dll/file_copy.c +++ b/Sandboxie/core/dll/file_copy.c @@ -418,7 +418,7 @@ _FX NTSTATUS File_MigrateFile( ULONG Cur_Ticks = GetTickCount(); if (Next_Status < Cur_Ticks) { - Next_Status = Cur_Ticks + 1000; // update prgress every second + Next_Status = Cur_Ticks + 1000; // update progress every second WCHAR size_str[32]; Sbie_snwprintf(size_str, 32, L"%I64u", file_size); diff --git a/Sandboxie/core/dll/file_link.c b/Sandboxie/core/dll/file_link.c index 0a5e92e2..7300871f 100644 --- a/Sandboxie/core/dll/file_link.c +++ b/Sandboxie/core/dll/file_link.c @@ -927,7 +927,7 @@ _FX FILE_LINK *File_AddTempLink(WCHAR *path) File_GetCopyPath(path, &CopyPath); // - // get tempalte file if present, and reparese the path + // get template file if present, and reparse the path // WCHAR* TmplName = File_FindSnapshotPath(CopyPath); diff --git a/Sandboxie/core/dll/ipc.c b/Sandboxie/core/dll/ipc.c index 284cc3be..05d154d2 100644 --- a/Sandboxie/core/dll/ipc.c +++ b/Sandboxie/core/dll/ipc.c @@ -759,7 +759,7 @@ _FX NTSTATUS Ipc_GetName( // // // // Since in this mode we don't call Ipc_CreateObjects we don't have a boxed namespace // // and are using existing namespaces only with a name suffix - // // hence we can't use Global without system provileges, so we strip it + // // hence we can't use Global without system privileges, so we strip it // // // // if (_wcsnicmp(objname_buf, L"Global\\", 7) == 0) { diff --git a/Sandboxie/core/dll/proc.c b/Sandboxie/core/dll/proc.c index f8e22376..589afd92 100644 --- a/Sandboxie/core/dll/proc.c +++ b/Sandboxie/core/dll/proc.c @@ -744,7 +744,7 @@ _FX BOOL Proc_CreateAppContainerToken( _FX const WCHAR* SbieDll_FindArgumentEnd(const WCHAR* arguments) { // - // when suplying: "aaaa \"bb cc\"ddd\"e\\"f\" gg hh \\"ii \"jjjj kkkk" + // when supplying: "aaaa \"bb cc\"ddd\"e\\"f\" gg hh \\"ii \"jjjj kkkk" // to an application for (int i = 0; i < argc; i++) printf("%s\n", argv[i]); gives: // "aaaa", "bb ccddde\"f", "gg", "hh", "\"ii", "jjjj kkkk" // here we exactly replicate this parsing scheme diff --git a/Sandboxie/core/drv/verify.c b/Sandboxie/core/drv/verify.c index ff0f421b..ad5f78f6 100644 --- a/Sandboxie/core/drv/verify.c +++ b/Sandboxie/core/drv/verify.c @@ -840,7 +840,7 @@ _FX NTSTATUS KphValidateCertificate() expiration_date.QuadPart = cert_date.QuadPart + KphGetDateInterval((CSHORT)(level ? _wtoi(level) : 7), 0, 0); // x days, default 7 Verify_CertInfo.level = eCertAdvanced; } - else if (!level || _wcsicmp(level, L"STANDARD") == 0) // not used, default does not have explicite level + else if (!level || _wcsicmp(level, L"STANDARD") == 0) // not used, default does not have explicit level Verify_CertInfo.level = eCertStandard; else if (_wcsicmp(level, L"ADVANCED") == 0) Verify_CertInfo.level = eCertAdvanced; diff --git a/Sandboxie/core/svc/MountManager.cpp b/Sandboxie/core/svc/MountManager.cpp index ae68cd61..12f86602 100644 --- a/Sandboxie/core/svc/MountManager.cpp +++ b/Sandboxie/core/svc/MountManager.cpp @@ -414,7 +414,7 @@ MSG_HEADER *MountManager::QueryHandler(MSG_HEADER *msg) if (pRoot) pMount = pRoot->Mount; } - else if (m_RamDisk != NULL) { // empty root to querry ramdisk + else if (m_RamDisk != NULL) { // empty root to query ramdisk EnterCriticalSection(&m_CritSec); pMount = m_RamDisk; } @@ -502,7 +502,7 @@ HANDLE MountManager::OpenOrCreateNtFolder(const WCHAR* NtPath) return NULL; WCHAR* dosPath = (WCHAR*)DosPath.c_str(); - *wcsrchr(dosPath, L'\\') = L'\0'; // truncate path as we want the last fodler to be created with SbieDll_GetPublicSD + *wcsrchr(dosPath, L'\\') = L'\0'; // truncate path as we want the last folder to be created with SbieDll_GetPublicSD if (__sys_SHCreateDirectoryExW(NULL, dosPath, NULL) != ERROR_SUCCESS) return NULL; @@ -673,7 +673,7 @@ std::shared_ptr MountManager::FindImDisk(const std::wstring& ImageFil // // Find an already mounted RamDisk, - // we inspect the volume label to determin if its ours + // we inspect the volume label to determine if its ours // std::vector DeviceList; @@ -953,7 +953,7 @@ bool MountManager::AcquireBoxRoot(const WCHAR* boxname, const WCHAR* reg_root, c // // We use the [KeyRootPath] to uniquely identify a sandbox, the driver requires // booth [KeyRootPath] as well as the hive file location [FileRootPath]\RegHive to match, - // hence eider is a good unique identifier, in case of a conflict the second sandbox start atempt fails. + // hence either is a good unique identifier, in case of a conflict the second sandbox start attempt fails. // As SbieApi_GetUnmountHive provides only [KeyRootPath] and no file path it is expedient to use it. // diff --git a/Sandboxie/core/svc/MountManagerWire.h b/Sandboxie/core/svc/MountManagerWire.h index 4503bebb..1f726cf4 100644 --- a/Sandboxie/core/svc/MountManagerWire.h +++ b/Sandboxie/core/svc/MountManagerWire.h @@ -135,7 +135,7 @@ typedef struct tagIMBOX_QUERY_RPL IMBOX_QUERY_RPL; //--------------------------------------------------------------------------- -// Mount Manager - Update box image proeprties +// Mount Manager - Update box image properties //--------------------------------------------------------------------------- diff --git a/Sandboxie/core/svc/sbieiniserver.cpp b/Sandboxie/core/svc/sbieiniserver.cpp index 766ae77c..4234ba04 100644 --- a/Sandboxie/core/svc/sbieiniserver.cpp +++ b/Sandboxie/core/svc/sbieiniserver.cpp @@ -1227,7 +1227,7 @@ ULONG SbieIniServer::DelSetting(MSG_HEADER* msg) { if (_wcsicmp(I->Name.c_str(), req->setting) == 0 && _wcsicmp(I->Value.c_str(), req->value) == 0) { I = pSection->Entries.erase(I); - // Note: we could brak here but lets finish in case tehre is a duplicate + // Note: we could break here, but let's finish in case there is a duplicate } else ++I; diff --git a/Sandboxie/core/svc/stdafx.h b/Sandboxie/core/svc/stdafx.h index 5e0954f9..021cca82 100644 --- a/Sandboxie/core/svc/stdafx.h +++ b/Sandboxie/core/svc/stdafx.h @@ -22,7 +22,7 @@ #pragma once -#define _HAS_EXCEPTIONS 0 // we dont have exception support enabled +#define _HAS_EXCEPTIONS 0 // we don't have exception support enabled #include #define WIN32_NO_STATUS diff --git a/SandboxiePlus/MiscHelpers/Archive/7z/CPP/7zip/Archive/IArchive.h b/SandboxiePlus/MiscHelpers/Archive/7z/CPP/7zip/Archive/IArchive.h index 3e68ac30..81c19703 100644 --- a/SandboxiePlus/MiscHelpers/Archive/7z/CPP/7zip/Archive/IArchive.h +++ b/SandboxiePlus/MiscHelpers/Archive/7z/CPP/7zip/Archive/IArchive.h @@ -37,7 +37,7 @@ How the function in 7-Zip returns object for output parameter via pointer 4) The caller must free or release object returned by the callee: PROPVARIANT : VariantClear(&propvaiant) BSTR : SysFreeString(bstr) - IUnknown* and derived interfaces : if (ptr) ptr->Relase() + IUnknown* and derived interfaces : if (ptr) ptr->Release() */ diff --git a/SandboxiePlus/MiscHelpers/Archive/7z/CPP/Common/MyCom.h b/SandboxiePlus/MiscHelpers/Archive/7z/CPP/Common/MyCom.h index 65c4330c..36912692 100644 --- a/SandboxiePlus/MiscHelpers/Archive/7z/CPP/Common/MyCom.h +++ b/SandboxiePlus/MiscHelpers/Archive/7z/CPP/Common/MyCom.h @@ -204,7 +204,7 @@ protected: #ifdef _WIN32 #if defined(__GNUC__) || defined(__clang__) - // virtual ~CMyUnknownImp() {} // to disable GCC/CLANG varnings + // virtual ~CMyUnknownImp() {} // to disable GCC/CLANG warnings #endif #endif }; diff --git a/SandboxiePlus/SandMan/Forms/OptionsWindow.ui b/SandboxiePlus/SandMan/Forms/OptionsWindow.ui index 26571fb0..1c3fd9e3 100644 --- a/SandboxiePlus/SandMan/Forms/OptionsWindow.ui +++ b/SandboxiePlus/SandMan/Forms/OptionsWindow.ui @@ -3640,7 +3640,7 @@ This is done to prevent rogue processes inside the sandbox from creating a renam - Sandboxies functionality can be enhanced using optional dll’s which can be loaded into each sandboxed process on start by the SbieDll.dll, the add-on manager in the global settings offers a couple useful extensions, once installed they can be enabled here for the current box. + Sandboxie's functionality can be enhanced by using optional DLLs which can be loaded into each sandboxed process on start by the SbieDll.dll file, the add-on manager in the global settings offers a couple of useful extensions, once installed they can be enabled here for the current box. true diff --git a/SandboxiePlus/SandMan/OnlineUpdater.cpp b/SandboxiePlus/SandMan/OnlineUpdater.cpp index 354d207b..5c575af4 100644 --- a/SandboxiePlus/SandMan/OnlineUpdater.cpp +++ b/SandboxiePlus/SandMan/OnlineUpdater.cpp @@ -295,7 +295,7 @@ void COnlineUpdater::LoadState() QString COnlineUpdater::GetOnNewUpdateOption() const { if (!g_CertInfo.active || g_CertInfo.expired) - return "ignore"; // this service requries a valid vcertificate + return "ignore"; // this service requires a valid certificate return theConf->GetString("Options/OnNewUpdate", "ignore"); } @@ -310,9 +310,9 @@ QString COnlineUpdater::GetOnNewReleaseOption() const bool COnlineUpdater::ShowCertWarningIfNeeded() { // - // This function checks if this instalation uses a expired personal + // This function checks if this installation uses a expired personal // certificate which is active for the current build - // in which case it it shows a warning that updating to the latest build + // in which case it shows a warning that updating to the latest build // will deactivate the certificate // diff --git a/SandboxiePlus/SandMan/Troubleshooting/Sandboxing/SBIEMSG/SBIEFIXPC.js b/SandboxiePlus/SandMan/Troubleshooting/Sandboxing/SBIEMSG/SBIEFIXPC.js index 5bde30ab..0b654b18 100644 --- a/SandboxiePlus/SandMan/Troubleshooting/Sandboxing/SBIEMSG/SBIEFIXPC.js +++ b/SandboxiePlus/SandMan/Troubleshooting/Sandboxing/SBIEMSG/SBIEFIXPC.js @@ -13,7 +13,7 @@ function try_fix_PC_SRP() {id: 'disable', name: 'Disable Parental Control Policy', type: 'radio'}, {id: 'failed', name: 'The above mitigations did not work', type: 'radio'}, ]; - let obj = wizard.showForm(form, tr('It seams you are using a non administrative user account on a system with enabled parental controls, this is a known to be incomatible with sandboxie.\nYou have the following options to resolve the issue.')); + let obj = wizard.showForm(form, tr('It seems you are using a non-administrative user account on a system with enabled parental controls, this is known to be incompatible with Sandboxie.\nYou have the following options to resolve the issue.')); //_debugger(); diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp index dafae4e7..527ec9f2 100644 --- a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp +++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp @@ -1260,7 +1260,7 @@ void CSettingsWindow::OnGetCert() SB_PROGRESS Status = theGUI->m_pUpdater->GetSupportCert(ui.txtSerial->text(), this, SLOT(OnCertData(const QByteArray&, const QVariantMap&))); if (Status.GetStatus() == OP_ASYNC) { theGUI->AddAsyncOp(Status.GetValue()); - Status.GetValue()->ShowMessage(tr("Retreiving certificate...")); + Status.GetValue()->ShowMessage(tr("Retrieving certificate...")); } } diff --git a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp index 3116b1cc..33ab4c02 100644 --- a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp +++ b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp @@ -68,9 +68,9 @@ SB_STATUS CNewBoxWizard::TryToCreateBox() bool State = false; if(CCheckableMessageBox::question(this, "Sandboxie-Plus", tr("This sandbox content will be placed in an encrypted container file, " - "please note that any corruption of the container's header will render all its content permanently innaccessible. " - "Corruption can occur as a result of a BSOD, a storage hadrware failure, or a maliciouse application overwriting random files. " - "This feature is provided under a strickt No Backup No Mercy policy, YOU the user are responsible for the data you put into an encrypted box. " + "please note that any corruption of the container's header will render all its content permanently inaccessible. " + "Corruption can occur as a result of a BSOD, a storage hardware failure, or a malicious application overwriting random files. " + "This feature is provided under a strict No Backup No Mercy policy, YOU the user are responsible for the data you put into an encrypted box. " "

" "IF YOU AGREE TO TAKE FULL RESPONSIBILITY FOR YOUR DATA PRESS [YES], OTHERWISE PRESS [NO].") , tr("Don't show this message again."), &State, QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::No, QMessageBox::Warning) != QDialogButtonBox::Yes) @@ -448,7 +448,7 @@ bool CBoxTypePage::validatePage() #endif if ((BoxType == CSandBoxPlus::ePrivate || BoxType == CSandBoxPlus::ePrivatePlus) && !theGUI->IsImDiskReady()) { - theGUI->GetAddonManager()->TryInstallAddon("ImDisk", this, tr("To use ancrypted boxes you need to install the ImDisk driver, do you want to download and install it?")); + theGUI->GetAddonManager()->TryInstallAddon("ImDisk", this, tr("To use encrypted boxes you need to install the ImDisk driver, do you want to download and install it?")); return false; } diff --git a/SandboxiePlus/SandMan/Wizards/SetupWizard.cpp b/SandboxiePlus/SandMan/Wizards/SetupWizard.cpp index aefd1736..9c6843d9 100644 --- a/SandboxiePlus/SandMan/Wizards/SetupWizard.cpp +++ b/SandboxiePlus/SandMan/Wizards/SetupWizard.cpp @@ -344,7 +344,7 @@ void CCertificatePage::OnCertData(const QByteArray& Certificate, const QVariantM wizard()->next(); } else { - QString Message = tr("Failed to retrive the certificate."); + QString Message = tr("Failed to retrieve the certificate."); Message += tr("\nError: %1").arg(Params["error"].toString()); QMessageBox::critical(this, "Sandboxie-Plus", Message); } @@ -360,7 +360,7 @@ bool CCertificatePage::validatePage() SB_PROGRESS Status = theGUI->m_pUpdater->GetSupportCert(Serial, this, SLOT(OnCertData(const QByteArray&, const QVariantMap&))); if (Status.GetStatus() == OP_ASYNC) { theGUI->AddAsyncOp(Status.GetValue()); - Status.GetValue()->ShowMessage(tr("Retreiving certificate...")); + Status.GetValue()->ShowMessage(tr("Retrieving certificate...")); } return false; } diff --git a/SandboxieTools/ImBox/ImBox.cpp b/SandboxieTools/ImBox/ImBox.cpp index 0122c495..f8fb0a05 100644 --- a/SandboxieTools/ImBox/ImBox.cpp +++ b/SandboxieTools/ImBox/ImBox.cpp @@ -146,7 +146,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, pImDisk->SetMountSection(hMapping, pSection); // - // defien shutdown behavioure + // define shutdown behaviour // SetProcessShutdownParameters(0x100, 0); diff --git a/SandboxieTools/ImBox/ImDiskIO.cpp b/SandboxieTools/ImBox/ImDiskIO.cpp index c474d804..fcf2b621 100644 --- a/SandboxieTools/ImBox/ImDiskIO.cpp +++ b/SandboxieTools/ImBox/ImDiskIO.cpp @@ -156,7 +156,7 @@ DWORD WINAPI CImDiskIO_Thread(LPVOID lpThreadParameter) { // // !!! NOTE !!! After this thread was created the rest of the code does not touch - // the m members which we use here so we dont bother with explicite synchronization + // the m members which we use here so we don't bother with explicit synchronization // hence this thread is responsible freeing m // @@ -234,7 +234,7 @@ DWORD WINAPI CImDiskIO_Thread(LPVOID lpThreadParameter) if (FormatVolume(Drive.c_str(), fs, label)) { if (!IsVolumeUnRecognized(Device)) // check success - DbgPrint(L"Successfully Formated: %s\n", m->Mount.c_str()); + DbgPrint(L"Successfully Formatted: %s\n", m->Mount.c_str()); else { DbgPrint(L"Failed to Format: %s\n", m->Mount.c_str()); // Sleep(1000); @@ -324,7 +324,7 @@ int CImDiskIO::DoComm() if (!m->Mount.empty()) { // - // clear format directive if formating is not allowed for this disk e.g. non empty image file + // clear format directive if formatting is not allowed for this disk e.g. non empty image file // to force format you can use imdisk: params="-p \"/fs:ntfs /q /y\"" // diff --git a/SandboxieTools/ImBox/dc/crypto_fast/amd64/aes_amd64.asm b/SandboxieTools/ImBox/dc/crypto_fast/amd64/aes_amd64.asm index b696825a..4251a81f 100644 --- a/SandboxieTools/ImBox/dc/crypto_fast/amd64/aes_amd64.asm +++ b/SandboxieTools/ImBox/dc/crypto_fast/amd64/aes_amd64.asm @@ -30,7 +30,7 @@ ; suggestions made by him for which I am most grateful. ; An AES implementation for AMD64 processors using the YASM assembler. This -; implemetation provides only encryption, decryption and hence requires key +; implementation provides only encryption, decryption and hence requires key ; scheduling support in C. It uses 8k bytes of tables but its encryption and ; decryption performance is very close to that obtained using large tables. ; It can use either Windows or Gnu/Linux calling conventions, which are as diff --git a/SandboxieTools/ImBox/dc/crypto_fast/amd64/twofish_amd64.asm b/SandboxieTools/ImBox/dc/crypto_fast/amd64/twofish_amd64.asm index 9c9c1fe8..0f1f822a 100644 --- a/SandboxieTools/ImBox/dc/crypto_fast/amd64/twofish_amd64.asm +++ b/SandboxieTools/ImBox/dc/crypto_fast/amd64/twofish_amd64.asm @@ -215,9 +215,9 @@ twofish256_encrypt: push R1Q push rsi push rdi - ; r8 contains the crypto tfm adress - ; rdx contains the output adress - ; rcx contains the input adress + ; r8 contains the crypto tfm address + ; rdx contains the output address + ; rcx contains the input address mov rsi, rdx mov R1Q, [rcx] @@ -270,9 +270,9 @@ twofish256_decrypt: push R1Q push rsi push rdi - ; r8 contains the crypto tfm adress - ; rdx contains the output adress - ; rcx contains the input adress + ; r8 contains the crypto tfm address + ; rdx contains the output address + ; rcx contains the input address mov rsi, rdx mov R1Q, [rcx] diff --git a/SandboxieTools/ImBox/dc/crypto_fast/i386/twofish_i386.asm b/SandboxieTools/ImBox/dc/crypto_fast/i386/twofish_i386.asm index d9896014..afb05587 100644 --- a/SandboxieTools/ImBox/dc/crypto_fast/i386/twofish_i386.asm +++ b/SandboxieTools/ImBox/dc/crypto_fast/i386/twofish_i386.asm @@ -219,8 +219,8 @@ _twofish256_encrypt@12: push ebx push esi push edi - mov ebp, [tfm + 16+esp] ; abuse the base pointer: set new base bointer to the crypto tfm - mov edi, [in_blk+16+esp] ; input adress in edi + mov ebp, [tfm + 16+esp] ; abuse the base pointer: set new base pointer to the crypto tfm + mov edi, [in_blk+16+esp] ; input address in edi mov eax, [edi] mov ebx, [b_offset+edi] @@ -273,8 +273,8 @@ _twofish256_decrypt@12: push edi - mov ebp, [tfm + 16+esp] ; abuse the base pointer: set new base bointer to the crypto tfm - mov edi, [in_blk + 16+esp] ; input adress in edi + mov ebp, [tfm + 16+esp] ; abuse the base pointer: set new base pointer to the crypto tfm + mov edi, [in_blk + 16+esp] ; input address in edi mov eax, [edi] mov ebx, [b_offset+edi] diff --git a/SandboxieTools/ImBox/dc/crypto_fast/sha512.c b/SandboxieTools/ImBox/dc/crypto_fast/sha512.c index 3ae8bc02..13c2c14d 100644 --- a/SandboxieTools/ImBox/dc/crypto_fast/sha512.c +++ b/SandboxieTools/ImBox/dc/crypto_fast/sha512.c @@ -169,7 +169,7 @@ void _stdcall sha512_done(sha512_ctx *ctx, unsigned char *out) ctx->curlen = 0; } - /* pad upto 120 bytes of zeroes + /* pad up to 120 bytes of zeroes * note: that from 112 to 120 is the 64 MSB of the length. We assume that you won't hash * > 2^64 bits of data... :-) */ diff --git a/SandboxieTools/ImBox/dc/crypto_fast/sha512_hmac_drbg.c b/SandboxieTools/ImBox/dc/crypto_fast/sha512_hmac_drbg.c index 374b4cc0..2dff4813 100644 --- a/SandboxieTools/ImBox/dc/crypto_fast/sha512_hmac_drbg.c +++ b/SandboxieTools/ImBox/dc/crypto_fast/sha512_hmac_drbg.c @@ -137,7 +137,7 @@ int _stdcall sha512_hmac_drbg_generate( sha512_hmac_drbg_ctx *ctx, const void unsigned char *output, size_t output_len ) { if ( (ctx->reseed_counter > SHA512_HMAC_DRBG_RESEED_INTERVAL) || // If reseed_counter > reseed_interval, then return an indication that a reseed is required - (additional_len > SHA512_HMAC_DRBG_MAX_ADDITIONAL_BYTES) || // chech max_additional_input_length (NIST SP 800-90A specification) + (additional_len > SHA512_HMAC_DRBG_MAX_ADDITIONAL_BYTES) || // check max_additional_input_length (NIST SP 800-90A specification) (output_len > SHA512_HMAC_DRBG_MAX_GENERATED_BYTES) ) // check max_number_of_bits_per_request (NIST SP 800-90A specification) { return -1; diff --git a/SandboxieTools/ImBox/dc/crypto_fast/sha512_pkcs5_2.c b/SandboxieTools/ImBox/dc/crypto_fast/sha512_pkcs5_2.c index e05b321c..66b043ce 100644 --- a/SandboxieTools/ImBox/dc/crypto_fast/sha512_pkcs5_2.c +++ b/SandboxieTools/ImBox/dc/crypto_fast/sha512_pkcs5_2.c @@ -31,14 +31,14 @@ void _stdcall sha512_pkcs5_2(int i_count, const void *pwd, size_t pwd_len, const while (dklen != 0) { - // first interation + // first iteration sha512_hmac_init(&ctx, pwd, pwd_len); sha512_hmac_hash(&ctx, salt, salt_len); sha512_hmac_hash(&ctx, &block, sizeof(unsigned long)); sha512_hmac_done(&ctx, hmac); memcpy(blk, hmac, SHA512_DIGEST_SIZE); - // next interations + // next iterations for (i = 1; i < i_count; i++) { sha512_hmac_init(&ctx, pwd, pwd_len); diff --git a/SandboxieTools/ImBox/dc/crypto_small/sha512_pkcs5_2_small.c b/SandboxieTools/ImBox/dc/crypto_small/sha512_pkcs5_2_small.c index 6d082670..c0046df9 100644 --- a/SandboxieTools/ImBox/dc/crypto_small/sha512_pkcs5_2_small.c +++ b/SandboxieTools/ImBox/dc/crypto_small/sha512_pkcs5_2_small.c @@ -86,13 +86,13 @@ void sha512_pkcs5_2(int i_count, const void *pwd, unsigned long pwd_len, const v while (dklen != 0) { - // first interation + // first iteration __movsb(buff, (const unsigned char*)salt, salt_len); ((unsigned long*)(buff + salt_len))[0] = _byteswap_ulong(block); sha512_hmac(pwd, pwd_len, buff, salt_len + sizeof(unsigned long), hmac); __movsb(blk, hmac, SHA512_DIGEST_SIZE); - // next interations + // next iterations for (i = 1; i < i_count; i++) { sha512_hmac(pwd, pwd_len, hmac, SHA512_DIGEST_SIZE, hmac); diff --git a/SandboxieTools/ImBox/dc/crypto_small/sha512_small.c b/SandboxieTools/ImBox/dc/crypto_small/sha512_small.c index 31afa653..1d681ea1 100644 --- a/SandboxieTools/ImBox/dc/crypto_small/sha512_small.c +++ b/SandboxieTools/ImBox/dc/crypto_small/sha512_small.c @@ -145,7 +145,7 @@ void sha512_done(sha512_ctx *ctx, unsigned char *out) ctx->curlen = 0; } - /* pad upto 120 bytes of zeroes + /* pad up to 120 bytes of zeroes * note: that from 112 to 120 is the 64 MSB of the length. We assume that you won't hash * > 2^64 bits of data... :-) */ diff --git a/SandboxieTools/ImBox/dc/tools/yasm/COPYING b/SandboxieTools/ImBox/dc/tools/yasm/COPYING index ddd3c01f..854e6819 100644 --- a/SandboxieTools/ImBox/dc/tools/yasm/COPYING +++ b/SandboxieTools/ImBox/dc/tools/yasm/COPYING @@ -24,7 +24,7 @@ details. Consult a lawyer for legal advice. The primary license of Yasm is the 2-clause BSD license. Please use this license if you plan on submitting code to the project. -Yasm has absolutely no warranty; not even for merchantibility or fitness +Yasm has absolutely no warranty; not even for merchantability or fitness for a particular purpose. ------- diff --git a/SandboxieTools/ImDisk/inc/ntkmapi.h b/SandboxieTools/ImDisk/inc/ntkmapi.h index 763af249..bed5b543 100644 --- a/SandboxieTools/ImDisk/inc/ntkmapi.h +++ b/SandboxieTools/ImDisk/inc/ntkmapi.h @@ -291,7 +291,7 @@ typedef ULONG DEVICE_DATA_MANAGEMENT_SET_ACTION; // typedef struct _DEVICE_DATA_SET_RANGE { - LONGLONG StartingOffset; //in bytes, must allign to sector + LONGLONG StartingOffset; //in bytes, must align to sector ULONGLONG LengthInBytes; // multiple of sector size. } DEVICE_DATA_SET_RANGE, *PDEVICE_DATA_SET_RANGE; @@ -309,10 +309,10 @@ typedef struct _DEVICE_MANAGE_DATA_SET_ATTRIBUTES { ULONG Flags; // Global flags across all actions - ULONG ParameterBlockOffset; // must be alligned to corresponding structure allignment + ULONG ParameterBlockOffset; // must be aligned to corresponding structure alignment ULONG ParameterBlockLength; // 0 means Parameter Block does not exist. - ULONG DataSetRangesOffset; // must be alligned to DEVICE_DATA_SET_RANGE structure allignment. + ULONG DataSetRangesOffset; // must be aligned to DEVICE_DATA_SET_RANGE structure alignment. ULONG DataSetRangesLength; // 0 means DataSetRanges Block does not exist. } DEVICE_MANAGE_DATA_SET_ATTRIBUTES, *PDEVICE_MANAGE_DATA_SET_ATTRIBUTES; @@ -326,7 +326,7 @@ typedef struct _DEVICE_MANAGE_DATA_SET_ATTRIBUTES { // //======================== FSCTL_FILE_LEVEL_TRIM =========================== // -// Structure defintions for supporint file level trim +// Structure definitions for supporint file level trim // typedef struct _FILE_LEVEL_TRIM_RANGE { diff --git a/SandboxieTools/ImDisk/inc/ntumapi.h b/SandboxieTools/ImDisk/inc/ntumapi.h index 2bc9722f..00d161a3 100644 --- a/SandboxieTools/ImDisk/inc/ntumapi.h +++ b/SandboxieTools/ImDisk/inc/ntumapi.h @@ -203,14 +203,14 @@ typedef struct _REPARSE_DATA_BUFFER { #define IO_REPARSE_TAG_IFSTEST_CONGRUENT (0x00000009L) // -// Tag allocated to Moonwalk Univeral for HSM +// Tag allocated to Moonwalk Universal for HSM // GUID: 257ABE42-5A28-4C8C-AC46-8FEA5619F18F // #define IO_REPARSE_TAG_MOONWALK_HSM (0x0000000AL) // -// Tag allocated to Tsinghua Univeristy for Research purposes +// Tag allocated to Tsinghua University for Research purposes // No released products should use this tag // GUID: b86dff51-a31e-4bac-b3cf-e8cfe75c9fc2 // diff --git a/SandboxieTools/ImDisk/inc/wio.hpp b/SandboxieTools/ImDisk/inc/wio.hpp index aeb61572..5c825c59 100644 --- a/SandboxieTools/ImDisk/inc/wio.hpp +++ b/SandboxieTools/ImDisk/inc/wio.hpp @@ -111,7 +111,7 @@ ConnectTCP(LPCWSTR wszServer, LPCWSTR wszService) return ConnectTCP(wszServer, usPort); } -/// Enhanced OVERLAPPED stucture with encapsulated API functions. +/// Enhanced OVERLAPPED structure with encapsulated API functions. struct WOverlapped : public OVERLAPPED { BOOL Read(HANDLE hFile, LPVOID lpBuf, DWORD dwLength, DWORDLONG dwStart = 0)