From 8ca8de5127246ba61dbc4415c0dcf68e07f63304 Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
<3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Sat, 23 May 2026 16:23:25 +0200
Subject: [PATCH] Fix typos found by codespell and typos
Signed-off-by: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com>
---
Contrib/BgImage/BgImage.txt | 4 ++--
Contrib/nsDialogs/Readme.html | 2 +-
Docs/src/history.but | 6 +++---
Docs/src/modernui.but | 4 ++--
Include/FileFunc.nsh | 4 ++--
Source/7zip/7zip/Compress/LZ/LZInWindow.cpp | 4 ++--
Source/7zip/7zip/Compress/LZ/LZInWindow.h | 6 +++---
Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp | 12 ++++++------
Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h | 4 ++--
Source/ResourceVersionInfo.cpp | 14 +++++++-------
Source/ResourceVersionInfo.h | 6 +++---
Source/build.h | 2 +-
12 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/Contrib/BgImage/BgImage.txt b/Contrib/BgImage/BgImage.txt
index 7018570040..a120b2533e 100644
--- a/Contrib/BgImage/BgImage.txt
+++ b/Contrib/BgImage/BgImage.txt
@@ -23,7 +23,7 @@ Notes
* This plugin requires NSIS 2.42 and above.
* Do not call SetBg (which creates the window) from a section or a function called by a section.
- BgImge must be run from the GUI thread as the installation thread is not built to handle GUI.
+ BgImage must be run from the GUI thread as the installation thread is not built to handle GUI.
Available functions
~~~~~~~~~~~~~~
@@ -89,4 +89,4 @@ Coded by Amir Szekely, aka KiCHiK
Ximon Eighteen, aka Sunjammer - Fixed window title bar issues
iceman_k - Text idea and original implementation
Lajos Molnar, aka orfanik - Tile idea and original implementation
-Jason Reis - Coding help
\ No newline at end of file
+Jason Reis - Coding help
diff --git a/Contrib/nsDialogs/Readme.html b/Contrib/nsDialogs/Readme.html
index dd5ddd5280..d9c8533cf8 100644
--- a/Contrib/nsDialogs/Readme.html
+++ b/Contrib/nsDialogs/Readme.html
@@ -466,7 +466,7 @@ Function Reference
Create
nsDialogs::Create rect
-Creates a new dialog. rect specific the identifier of the control whose location will be mimiced. This should usually be 1018, which is control mimiced for creation of built-in pages. The Modern UI also has control 1044 for the welcome and the finish page.
+Creates a new dialog. rect specific the identifier of the control whose location will be mimicked. This should usually be 1018, which is control mimicked for creation of built-in pages. The Modern UI also has control 1044 for the welcome and the finish page.
Returns the new dialog's HWND on the stack or error.
CreateControl
diff --git a/Docs/src/history.but b/Docs/src/history.but
index 75fa2c1b55..f06f416c3f 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -1472,7 +1472,7 @@ Released on December 24th, 2007
\b Fixed build issues on Mac OS (\W{http://sourceforge.net/support/tracker.php?aid=1851365}{bug #1851365})
-\b Fixed endianity issues introduced in version 2.32 (\W{http://sourceforge.net/support/tracker.php?aid=1851365}{bug #1851365})
+\b Fixed endianness issues introduced in version 2.32 (\W{http://sourceforge.net/support/tracker.php?aid=1851365}{bug #1851365})
\H{v2.33} 2.33
@@ -2254,7 +2254,7 @@ Released on April 7th, 2006
\b The script compiler, makensis, builds and works on big-endian platforms. This change enlarges the portability range of NSIS to theoretically every POSIX platform. Please \W{http://sourceforge.net/tracker/?group_id=22049&atid=373085}{report} any incompatibility with specific platforms or build-tools.
-\b The internal changes made to support big-endian platforms also pave the road to x64 installers. There is now a central function which writes data to disk. This function currently only converts the endianity of integers, but it can be changed to selectively write 64-bit integers. Hopefully, there'll soon be a simple method of compiling a script to both x86 and x64 installers.
+\b The internal changes made to support big-endian platforms also pave the road to x64 installers. There is now a central function which writes data to disk. This function currently only converts the endianness of integers, but it can be changed to selectively write 64-bit integers. Hopefully, there'll soon be a simple method of compiling a script to both x86 and x64 installers.
\b Changing Source/exehead/fileform.h to alter the internal structure of installers is no longer enough. The compiler has its own definitions of the structures which must also be changed in Source/fileform.cpp. In the future, fileform.cpp should be automatically generated from fileform.h, but for now, the synchronization must be done manually.
@@ -3357,7 +3357,7 @@ Released on December 27th, 2003
\S2{} Major Changes
-\b LZMA compression support. Added \R{asetcompressordictsize}{SetCompresssorDictSize}.
+\b LZMA compression support. Added \R{asetcompressordictsize}{SetCompressorDictSize}.
\b \L{../Docs/Modern UI/Readme.html}{Modern UI 1.68}: New settings for extra space for title and text on Welcome page and Finish page, improved handling of verbose settings, language file string for uninstaller reboot information, more
diff --git a/Docs/src/modernui.but b/Docs/src/modernui.but
index 0d0bfacd1d..2b19ad9c6f 100644
--- a/Docs/src/modernui.but
+++ b/Docs/src/modernui.but
@@ -6,6 +6,6 @@ Using the Modern UI macros and language files, writing scripts with a modern int
For more information and documentation see the \L{../Docs/Modern UI 2/Readme.html}{Modern UI 2 Readme}.
-NSIS 2.34 brought with it a new version of Modern UI - version 2. It is faster and more extendible. It allows plug-ins to add new types of pages and even change existing pages using a simple NSH file. It also uses \L{../Docs/nsDialogs/Readme.html}{nsDialogs} which faster than its elder sibling - InstallOptions.
+NSIS 2.34 brought with it a new version of Modern UI - version 2. It is faster and more extendable. It allows plug-ins to add new types of pages and even change existing pages using a simple NSH file. It also uses \L{../Docs/nsDialogs/Readme.html}{nsDialogs} which faster than its elder sibling - InstallOptions.
-For more information and documentation of the old version see the \L{../Docs/Modern UI/Readme.html}{Modern UI Readme}.
\ No newline at end of file
+For more information and documentation of the old version see the \L{../Docs/Modern UI/Readme.html}{Modern UI Readme}.
diff --git a/Include/FileFunc.nsh b/Include/FileFunc.nsh
index f993da4ead..618094fc2a 100644
--- a/Include/FileFunc.nsh
+++ b/Include/FileFunc.nsh
@@ -255,11 +255,11 @@ RefreshShellIcons
!verbose pop
!macroend
-!macro BannerTrimPathCall _PATH _LENGHT _RESULT
+!macro BannerTrimPathCall _PATH _LENGTH _RESULT
!verbose push
!verbose ${_FILEFUNC_VERBOSE}
Push `${_PATH}`
- Push `${_LENGHT}`
+ Push `${_LENGTH}`
${CallArtificialFunction} BannerTrimPath_
Pop ${_RESULT}
!verbose pop
diff --git a/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp b/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
index 0b92bfd65c..c43597d2d5 100644
--- a/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
+++ b/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
@@ -93,8 +93,8 @@ HRESULT CLZInWindow::ReadBlock()
if(numReadBytes == 0)
{
_posLimit = _streamPos;
- const Byte *pointerToPostion = _buffer + _posLimit;
- if(pointerToPostion > _pointerToLastSafePosition)
+ const Byte *pointerToPosition = _buffer + _posLimit;
+ if(pointerToPosition > _pointerToLastSafePosition)
_posLimit = (UInt32)(_pointerToLastSafePosition - _buffer);
_streamEndWasReached = true;
return S_OK;
diff --git a/Source/7zip/7zip/Compress/LZ/LZInWindow.h b/Source/7zip/7zip/Compress/LZ/LZInWindow.h
index 0f2e48130f..c9443a6d3a 100644
--- a/Source/7zip/7zip/Compress/LZ/LZInWindow.h
+++ b/Source/7zip/7zip/Compress/LZ/LZInWindow.h
@@ -30,7 +30,7 @@ class CLZInWindow
protected:
Byte *_buffer; // Pointer to virtual Buffer begin
UInt32 _blockSize; // Size of Allocated memory block
- UInt32 _pos; // offset (from _buffer) of curent byte
+ UInt32 _pos; // offset (from _buffer) of current byte
UInt32 _keepSizeBefore; // how many BYTEs must be kept in buffer before _pos
UInt32 _keepSizeAfter; // how many BYTEs must be kept buffer after _pos
UInt32 _streamPos; // offset (from _buffer) of first not read byte from Stream
@@ -58,8 +58,8 @@ class CLZInWindow
_pos++;
if (_pos > _posLimit)
{
- const Byte *pointerToPostion = _buffer + _pos;
- if(pointerToPostion > _pointerToLastSafePosition)
+ const Byte *pointerToPosition = _buffer + _pos;
+ if(pointerToPosition > _pointerToLastSafePosition)
MoveBlock();
return ReadBlock();
}
diff --git a/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp b/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
index ab3bc365b8..c530f62863 100644
--- a/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
+++ b/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
@@ -725,7 +725,7 @@ HRESULT CEncoder::GetOptimum(UInt32 position, UInt32 &backRes, UInt32 &lenRes)
UInt32 len = lenEnd;
do
- _optimum[len--].Price = kIfinityPrice;
+ _optimum[len--].Price = kInfinityPrice;
while (len >= 2);
for(i = 0; i < kNumRepDistances; i++)
@@ -934,7 +934,7 @@ HRESULT CEncoder::GetOptimum(UInt32 position, UInt32 &backRes, UInt32 &lenRes)
{
UInt32 offset = cur + 1 + lenTest2;
while(lenEnd < offset)
- _optimum[++lenEnd].Price = kIfinityPrice;
+ _optimum[++lenEnd].Price = kInfinityPrice;
UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(
0, lenTest2, state2, posStateNext);
COptimal &optimum = _optimum[offset];
@@ -962,7 +962,7 @@ HRESULT CEncoder::GetOptimum(UInt32 position, UInt32 &backRes, UInt32 &lenRes)
for (lenTest = 2; lenTest < numAvailableBytes &&
data[lenTest] == data[(size_t)lenTest - backOffset]; lenTest++);
while(lenEnd < cur + lenTest)
- _optimum[++lenEnd].Price = kIfinityPrice;
+ _optimum[++lenEnd].Price = kInfinityPrice;
UInt32 lenTestTemp = lenTest;
UInt32 price = repMatchPrice + GetPureRepPrice(repIndex, state, posState);
do
@@ -1010,7 +1010,7 @@ HRESULT CEncoder::GetOptimum(UInt32 position, UInt32 &backRes, UInt32 &lenRes)
{
UInt32 offset = cur + lenTest + 1 + lenTest2;
while(lenEnd < offset)
- _optimum[++lenEnd].Price = kIfinityPrice;
+ _optimum[++lenEnd].Price = kInfinityPrice;
UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(
0, lenTest2, state2, posStateNext);
COptimal &optimum = _optimum[offset];
@@ -1041,7 +1041,7 @@ HRESULT CEncoder::GetOptimum(UInt32 position, UInt32 &backRes, UInt32 &lenRes)
{
UInt32 normalMatchPrice = matchPrice + _isRep[state.Index].GetPrice0();
while(lenEnd < cur + newLen)
- _optimum[++lenEnd].Price = kIfinityPrice;
+ _optimum[++lenEnd].Price = kInfinityPrice;
UInt32 offs = 0;
while(startLen > matchDistances[offs])
@@ -1096,7 +1096,7 @@ HRESULT CEncoder::GetOptimum(UInt32 position, UInt32 &backRes, UInt32 &lenRes)
{
UInt32 offset = cur + lenTest + 1 + lenTest2;
while(lenEnd < offset)
- _optimum[++lenEnd].Price = kIfinityPrice;
+ _optimum[++lenEnd].Price = kInfinityPrice;
UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext);
COptimal &optimum = _optimum[offset];
if (curAndLenPrice < optimum.Price)
diff --git a/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h b/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
index 7db6617102..c91b264a48 100644
--- a/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
+++ b/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
@@ -85,7 +85,7 @@ inline UInt32 GetPosSlot2(UInt32 pos)
return g_FastPos[pos >> 26] + 52;
}
-const UInt32 kIfinityPrice = 0xFFFFFFF;
+const UInt32 kInfinityPrice = 0xFFFFFFF;
const UInt32 kNumOpts = 1 << 12;
@@ -312,7 +312,7 @@ class CEncoder :
UInt32 GetPosLen2Price(UInt32 pos, UInt32 posState) const
{
if (pos >= kNumFullDistances)
- return kIfinityPrice;
+ return kInfinityPrice;
return _distancesPrices[0][pos] + _lenEncoder.GetPrice(0, posState);
}
UInt32 GetPosLen3Price(UInt32 pos, UInt32 len, UInt32 posState) const
diff --git a/Source/ResourceVersionInfo.cpp b/Source/ResourceVersionInfo.cpp
index 9885ad807c..b5cddffbee 100644
--- a/Source/ResourceVersionInfo.cpp
+++ b/Source/ResourceVersionInfo.cpp
@@ -44,7 +44,7 @@ struct version_string_list
DefineList *pChildStrings;
};
-CVersionStrigList::~CVersionStrigList()
+CVersionStringList::~CVersionStringList()
{
struct version_string_list *itr = (struct version_string_list *) m_gr.get();
int i = m_gr.getlen() / sizeof(struct version_string_list);
@@ -55,7 +55,7 @@ CVersionStrigList::~CVersionStrigList()
}
}
-int CVersionStrigList::add(LANGID langid, int codepage)
+int CVersionStringList::add(LANGID langid, int codepage)
{
TCHAR Buff[10];
_stprintf(Buff, _T("%04x"), langid);
@@ -69,32 +69,32 @@ int CVersionStrigList::add(LANGID langid, int codepage)
return pos;
}
-LANGID CVersionStrigList::get_lang(int idx)
+LANGID CVersionStringList::get_lang(int idx)
{
version_string_list *data=(version_string_list *)m_gr.get();
return data[idx].lang_id;
}
-int CVersionStrigList::get_codepage(int idx)
+int CVersionStringList::get_codepage(int idx)
{
version_string_list *data=(version_string_list *)m_gr.get();
return data[idx].codepage;
}
-DefineList* CVersionStrigList::get_strings(int idx)
+DefineList* CVersionStringList::get_strings(int idx)
{
version_string_list *data=(version_string_list *)m_gr.get();
return data[idx].pChildStrings;
}
-int CVersionStrigList::find(LANGID lang_id, int codepage)
+int CVersionStringList::find(LANGID lang_id, int codepage)
{
TCHAR Buff[10];
_stprintf(Buff, _T("%04x"), lang_id);
return SortedStringListND::find(Buff);
}
-int CVersionStrigList::getnum()
+int CVersionStringList::getnum()
{
return m_gr.getlen()/sizeof(struct version_string_list);
}
diff --git a/Source/ResourceVersionInfo.h b/Source/ResourceVersionInfo.h
index 235fb0e554..17123176f0 100644
--- a/Source/ResourceVersionInfo.h
+++ b/Source/ResourceVersionInfo.h
@@ -31,10 +31,10 @@
struct version_string_list;
-class CVersionStrigList : public SortedStringListND
+class CVersionStringList : public SortedStringListND
{
public:
- ~CVersionStrigList();
+ ~CVersionStringList();
/**
* Add a version_string_list struct referred to by langid. Then add the
@@ -77,7 +77,7 @@ class CVersionStrigList : public SortedStringListND
class CResourceVersionInfo
{
VS_FIXEDFILEINFO m_FixedInfo;
- CVersionStrigList m_ChildStringLists;
+ CVersionStringList m_ChildStringLists;
public:
CResourceVersionInfo();
diff --git a/Source/build.h b/Source/build.h
index 4527a68c35..2fd5c0a57e 100644
--- a/Source/build.h
+++ b/Source/build.h
@@ -488,7 +488,7 @@ class CEXEBuild {
* @param lang [in/out] Language ID reference. If LANG_NEUTRAL, it gets
* set to thelast used language ID.
* @param create Create a new LanguageTable? Default = true.
- * @return Appropriate LanguagTable* if exists, otherwise NULL.
+ * @return Appropriate LanguageTable* if exists, otherwise NULL.
*/
LanguageTable *GetLangTable(LANGID &lang, bool create = true);