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

Attempt to fix VC6

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6972 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-01-29 14:42:13 +00:00
parent eea90f5362
commit e17e508012
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/build.h
View file

@ -171,7 +171,7 @@ class DiagState {
template<class C, class K, class V> void insert_or_assign(C&c, const K&k, V val) template<class C, class K, class V> void insert_or_assign(C&c, const K&k, V val)
{ {
typename C::value_type item(k, val); typename C::value_type item(k, val);
std::pair<typename C::iterator, bool> ret = c.insert(item); std::pair<C::iterator, bool> ret = c.insert(item);
if (!ret.second) ret.first->second = val; if (!ret.second) ret.first->second = val;
} }
template<class C, class K> typename mapped_type_helper<C>::type get_paired_value(const C&c, const K&k, typename mapped_type_helper<C>::type defval) const template<class C, class K> typename mapped_type_helper<C>::type get_paired_value(const C&c, const K&k, typename mapped_type_helper<C>::type defval) const

6
Source/util.cpp
View file

@ -1021,7 +1021,7 @@ int RunChildProcessRedirected(LPCWSTR cmdprefix, LPCWSTR cmdmain, bool ForceUTF8
DWORD childec = -1; DWORD childec = -1;
if (ok) if (ok)
{ {
bool utf8 = CP_UTF8 == cp, okt; bool fullbuf = false, utf8 = CP_UTF8 == cp, okt;
char iobuf[512]; char iobuf[512];
DWORD cbRead, cbOfs = 0, cchwb = 0; DWORD cbRead, cbOfs = 0, cchwb = 0;
WCHAR wbuf[100], wchbuf[2+1]; // A surrogate pair + \0 WCHAR wbuf[100], wchbuf[2+1]; // A surrogate pair + \0
@ -1067,7 +1067,7 @@ switchcp: cp = orgwinconoutcp, mbtwcf = 0, utf8 = false;
if (!cch) continue; if (!cch) continue;
wbuf[cchwb++] = wchbuf[0]; wbuf[cchwb++] = wchbuf[0];
if (--cch) wbuf[cchwb++] = wchbuf[1]; if (--cch) wbuf[cchwb++] = wchbuf[1];
const bool fullbuf = cchwb+cch >= COUNTOF(wbuf)-1; // cch is 1 for surrogate pairs fullbuf = cchwb+cch >= COUNTOF(wbuf)-1; // cch is 1 for surrogate pairs
if (!okr || fullbuf || L'\n' == wchbuf[0]) // Stop on \n so \r\n conversion has enough context (...\r\n vs ...\n) if (!okr || fullbuf || L'\n' == wchbuf[0]) // Stop on \n so \r\n conversion has enough context (...\r\n vs ...\n)
{ finalwrite: { finalwrite:
#ifdef MAKENSIS #ifdef MAKENSIS
@ -1082,7 +1082,7 @@ switchcp: cp = orgwinconoutcp, mbtwcf = 0, utf8 = false;
} }
if (!okr) if (!okr)
{ {
if (cchwb) goto finalwrite; if (cchwb) goto finalwrite; // End of stream without a ending newline, write out the remaining data.
break; break;
} }
} }