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

Added !makensis command

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6498 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-06-21 23:55:24 +00:00
parent a81d5dfb49
commit bf2f0fad80
8 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/util.cpp
View file

@ -828,7 +828,8 @@ const TCHAR* GetFriendlySize(UINT64 n, unsigned int&fn, GETFRIENDLYSIZEFLAGS f)
return s >= COUNTOF(scale) ? _T(" ?") : scale[s];
}
#if defined(_WIN32) && defined(_UNICODE)
#ifdef _WIN32
#ifdef _UNICODE
int RunChildProcessRedirected(LPCWSTR cmdprefix, LPCWSTR cmdmain)
{
// We have to deliver the requested output encoding to our host (if any) and the
@ -837,7 +838,7 @@ int RunChildProcessRedirected(LPCWSTR cmdprefix, LPCWSTR cmdmain)
// child to call GetConsoleOutputCP(), and even if we could, UTF-16 is not valid there.
UINT cp = CP_UTF8, mbtwcf = MB_ERR_INVALID_CHARS, oemcp = GetOEMCP();
errno = ENOMEM;
if (!cmdprefix) cmdprefix = _T("");
if (!cmdprefix) cmdprefix = L"";
size_t cch1 = _tcslen(cmdprefix), cch2 = _tcslen(cmdmain);
WCHAR *cmd = (WCHAR*) malloc( (cch1 + cch2 + 1) * sizeof(WCHAR) );
if (!cmd) return -1;
@ -938,7 +939,20 @@ switchcp: cp = orgwinconoutcp, mbtwcf = 0, utf8 = false;
CloseHandle(hPipRd);
return childec;
}
#endif
#else
int RunChildProcessRedirected(LPCWSTR cmd)
{
STARTUPINFO si = { sizeof(STARTUPINFO), };
PROCESS_INFORMATION pi;
if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
return GetLastError();
WaitForSingleObject(pi.hProcess, INFINITE);
GetExitCodeProcess(pi.hProcess, &si.cb);
CloseHandle(pi.hThread), CloseHandle(pi.hProcess);
return (int) si.cb;
}
#endif //~ _UNICODE
#endif //~ _WIN32
int sane_system(const TCHAR *command)
{