Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Contrib/BgImage/BgImage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~
Expand Down Expand Up @@ -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
Jason Reis - Coding help
2 changes: 1 addition & 1 deletion Contrib/nsDialogs/Readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ <h2><a name="ref"></a>Function Reference</h2>

<h3><a name="ref-create"></a>Create</h3>
<p><code>nsDialogs::Create <i>rect</i></code></p>
<p>Creates a new dialog. <i>rect</i> 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.</p>
<p>Creates a new dialog. <i>rect</i> 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.</p>
<p>Returns the new dialog's HWND on the stack or <i>error</i>.</p>

<h3><a name="ref-createcontrol"></a>CreateControl</h3>
Expand Down
6 changes: 3 additions & 3 deletions Docs/src/history.but
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Docs/src/modernui.but
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
For more information and documentation of the old version see the \L{../Docs/Modern UI/Readme.html}{Modern UI Readme}.
4 changes: 2 additions & 2 deletions Include/FileFunc.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions Source/7zip/7zip/Compress/LZ/LZInWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
}
Expand Down
12 changes: 6 additions & 6 deletions Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -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])
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions Source/ResourceVersionInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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<struct version_string_list>::find(Buff);
}

int CVersionStrigList::getnum()
int CVersionStringList::getnum()
{
return m_gr.getlen()/sizeof(struct version_string_list);
}
Expand Down
6 changes: 3 additions & 3 deletions Source/ResourceVersionInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

struct version_string_list;

class CVersionStrigList : public SortedStringListND<struct version_string_list>
class CVersionStringList : public SortedStringListND<struct version_string_list>
{
public:
~CVersionStrigList();
~CVersionStringList();

/**
* Add a version_string_list struct referred to by langid. Then add the
Expand Down Expand Up @@ -77,7 +77,7 @@ class CVersionStrigList : public SortedStringListND<struct version_string_list>
class CResourceVersionInfo
{
VS_FIXEDFILEINFO m_FixedInfo;
CVersionStrigList m_ChildStringLists;
CVersionStringList m_ChildStringLists;

public:
CResourceVersionInfo();
Expand Down
2 changes: 1 addition & 1 deletion Source/build.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down