dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed minor issues and typos

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6584 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-05-14 20:17:14 +00:00
parent aaa2aa2b56
commit c89cac5262
12 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Plugins.cpp
View file

@ -67,7 +67,7 @@ typename C::value_type::second_type get_paired_value(const C& cntnr, const K& ke
{
return get_iterator(cntnr,key)->second;
}
template <class V,class C, class K>
template <class V, class C, class K>
V get_paired_value(const C& cntnr, const K& key, const V& defval)
{
typename C::const_iterator it = cntnr.find(key);

2
Source/exehead/Ui.c
View file

@ -874,7 +874,7 @@ static void NSISCALL SetSizeText64(int dlgItem, int prefix, ULARGE_INTEGER kb64)
int scale = LANG_GIGA;
UINT intgr, fract;
if (kb64.HighPart) // 4TB+ ?
if (kb64.HighPart) // >= 4 TiB ?
{
kb64.QuadPart = NRT_U64Shr32(kb64.QuadPart, 20); // Convert from KiB to GiB
// wsprintf only supports the I64 size specifier on WinXP+.

6
Source/manifest.cpp
View file

@ -33,15 +33,15 @@ static bool isstrhexchars(const TCHAR*s,UINT cch)
{
while(cch-- && *s)
{
const TCHAR c = *s++, clw = ((char)c) | 32;
const TCHAR c = *s++, clw = ((TCHAR)c) | 32;
if (!(c >= '0' && c <= '9') && !(clw >= 'a' && clw <= 'f')) return false;
}
return true;
}
static const struct { const TCHAR *name, *guidstr; } g_soslmap[] = {
{ _T("WinVista"), _T("{e2011457-1546-43c5-a5fe-008deee3d3f0}") },
{ _T("Win7"), _T("{35138b9a-5d96-4fbd-8e2d-a2440225f93a}") },
{ _T("WinVista"), _T("{e2011457-1546-43c5-a5fe-008deee3d3f0}") }, //msdn.microsoft.com/en-us/library/aa374191
{ _T("Win7"), _T("{35138b9a-5d96-4fbd-8e2d-a2440225f93a}") }, //msdn.microsoft.com/en-us/library/dd371711
{ _T("Win8"), _T("{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}") }, //msdn.microsoft.com/en-us/library/hh848036
{ _T("Win8.1"), _T("{1f676c76-80e1-4239-95bb-83d0f6d0da78}") }, //msdn.microsoft.com/en-us/library/windows/desktop/dn481241
{ _T("Win10"), _T("{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}") } //blogs.msdn.com/b/chuckw/archive/2013/09/10/manifest-madness.aspx

10
Source/script.cpp
View file

@ -69,10 +69,8 @@ static UINT read_line_helper(NStreamLineReader&lr, TCHAR*buf, UINT cch)
}
const bool unicode = lr.IsUnicode();
for(cch = 0;; ++cch)
{
TCHAR ch = buf[cch];
if (!ch || NStream::IsNewline(ch, unicode)) break;
}
if (!buf[cch] || NStream::IsNewline(buf[cch], unicode))
break;
if (cch) eof = 0; // Read something, postpone EOF
return ++cch - eof;
}
@ -6134,7 +6132,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
return ret;
}
// DLL name on the user machine
// DLL name on the users machine
TCHAR tempDLL[NSIS_MAX_STRLEN];
wsprintf(tempDLL, _T("$PLUGINSDIR\\%") NPRIs, dllName.c_str());
@ -6205,7 +6203,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
// First push dll args
int parmst=i; // we push em in reverse order
int parmst=i; // we push 'em in reverse order
int nounloadmisused=0;
for (; i < line.getnumtokens(); i++) {
int w=parmst + (line.getnumtokens()-i - 1);

2
Source/util.cpp
View file

@ -681,7 +681,7 @@ tstring get_executable_path(const TCHAR* argv0) {
#else /* Linux/BSD/POSIX/etc */
const TCHAR *envpath = _tgetenv(_T("_"));
if( envpath != NULL )
return get_full_path( envpath );
return get_full_path(envpath);
else {
char *path = NULL, *pathtmp;
size_t len = 100;