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

Kill warning with a cast in Ansi version of RunChildProcessRedirected. CppUnit still uses Ansi util.cpp?

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6662 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-12-08 01:54:30 +00:00
parent d7d6c3561d
commit 667abcff94
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/exehead/util.c
View file

@ -1105,9 +1105,11 @@ struct MGA_FUNC MGA_FUNCS[] = {
{"SHELL32", (CHAR*) 680}, // IsUserAnAdmin {"SHELL32", (CHAR*) 680}, // IsUserAnAdmin
{"SHLWAPI", "SHAutoComplete"}, {"SHLWAPI", "SHAutoComplete"},
{"SHFOLDER", "SHGetFolderPathW"}, {"SHFOLDER", "SHGetFolderPathW"},
#ifdef NSIS_SUPPORT_GETDLLVERSION
{"VERSION", "GetFileVersionInfoSizeW"}, {"VERSION", "GetFileVersionInfoSizeW"},
{"VERSION", "GetFileVersionInfoW"}, {"VERSION", "GetFileVersionInfoW"},
{"VERSION", "VerQueryValueW"} {"VERSION", "VerQueryValueW"}
#endif
}; };
#else #else
{"KERNEL32", "SetDefaultDllDirectories"}, {"KERNEL32", "SetDefaultDllDirectories"},
@ -1118,9 +1120,11 @@ struct MGA_FUNC MGA_FUNCS[] = {
{"SHELL32", (CHAR*) 680}, // IsUserAnAdmin {"SHELL32", (CHAR*) 680}, // IsUserAnAdmin
{"SHLWAPI", "SHAutoComplete"}, {"SHLWAPI", "SHAutoComplete"},
{"SHFOLDER", "SHGetFolderPathA"}, {"SHFOLDER", "SHGetFolderPathA"},
#ifdef NSIS_SUPPORT_GETDLLVERSION
{"VERSION", "GetFileVersionInfoSizeA"}, {"VERSION", "GetFileVersionInfoSizeA"},
{"VERSION", "GetFileVersionInfoA"}, {"VERSION", "GetFileVersionInfoA"},
{"VERSION", "VerQueryValueA"} {"VERSION", "VerQueryValueA"}
#endif
}; };
#endif #endif

2
Source/exehead/util.h
View file

@ -126,7 +126,7 @@ void NSISCALL mini_memcpy(void *out, const void *in, UINT_PTR cb);
#endif #endif
enum myGetProcAddressFunctions { enum myGetProcAddressFunctions {
MGA_SetDefaultDllDirectories, // Win8+ but exists on Vista/2008/7/2008R2 if KB2533623 is installed MGA_SetDefaultDllDirectories, // Win8+ but also exists on Vista/2008/7/2008R2 if KB2533623 is installed
#ifndef _WIN64 #ifndef _WIN64
MGA_GetDiskFreeSpaceEx, MGA_GetDiskFreeSpaceEx,
MGA_GetUserDefaultUILanguage, MGA_GetUserDefaultUILanguage,

2
Source/util.cpp
View file

@ -967,7 +967,7 @@ int RunChildProcessRedirected(LPCSTR cmd)
{ {
STARTUPINFO si = { sizeof(STARTUPINFO), }; STARTUPINFO si = { sizeof(STARTUPINFO), };
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) if (!CreateProcess(NULL, const_cast<LPSTR>(cmd), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
return GetLastError(); return GetLastError();
WaitForSingleObject(pi.hProcess, INFINITE); WaitForSingleObject(pi.hProcess, INFINITE);
GetExitCodeProcess(pi.hProcess, &si.cb); GetExitCodeProcess(pi.hProcess, &si.cb);