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

Added ExecShellWait

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6839 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-03-21 22:04:40 +00:00
parent 7650898389
commit 024e01a71e
9 changed files with 60 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/exehead/exec.c
View file

@ -876,20 +876,29 @@ static int NSISCALL ExecuteEntry(entry *entry_)
#ifdef NSIS_SUPPORT_SHELLEXECUTE
case EW_SHELLEXEC: // this uses improvements of Andras Varga
{
int x;
TCHAR *buf0=GetStringFromParm(0x00);
TCHAR *buf3=GetStringFromParm(0x31);
TCHAR *buf2=GetStringFromParm(0x22);
SHELLEXECUTEINFO sei;
TCHAR *buf0=GetStringFromParm(0x00); // Verb
TCHAR *buf3=GetStringFromParm(0x31); // File
TCHAR *buf2=GetStringFromParm(0x22); // Parameters
GetStringFromParm(0x15); // For update_status_text_buf1
update_status_text_buf1(LANG_EXECSHELL);
x=(int)(INT_PTR)ShellExecute(g_hwnd,buf0[0]?buf0:NULL,buf3,buf2[0]?buf2:NULL,state_output_directory,parm3);
if (x < 33)
sei.cbSize=sizeof(SHELLEXECUTEINFO);
sei.fMask=parm4;
sei.hwnd=g_hwnd, sei.nShow=parm3;
sei.lpVerb=buf0[0]?buf0:NULL, sei.lpFile=buf3, sei.lpParameters=buf2[0]?buf2:NULL, sei.lpDirectory=state_output_directory;
sei.lpIDList=NULL; // Must set this because SEE_MASK_INVOKEIDLIST might be set
if (!ShellExecuteEx(&sei))
{
log_printf5(_T("ExecShell: warning: error (\"%s\": file:\"%s\" params:\"%s\")=%d"),buf0,buf3,buf2,x);
exec_error++;
}
else
{
if (SEE_MASK_NOCLOSEPROCESS & sei.fMask)
{
WaitForProcess(sei.hProcess);
CloseHandle(sei.hProcess);
}
log_printf4(_T("ExecShell: success (\"%s\": file:\"%s\" params:\"%s\")"),buf0,buf3,buf2);
}
}
@ -910,17 +919,11 @@ static int NSISCALL ExecuteEntry(entry *entry_)
log_printf2(_T("Exec: success (\"%s\")"),buf0);
if (parm2)
{
DWORD lExitCode;
while (WaitForSingleObject(hProc,100) == WAIT_TIMEOUT)
{
MessageLoop(WM_PAINT);
}
GetExitCodeProcess(hProc, &lExitCode);
DWORD lExitCode=WaitForProcess(hProc);
if (parm1>=0) myitoa(var1,lExitCode);
else if (lExitCode) exec_error++;
}
CloseHandle( hProc );
CloseHandle(hProc);
}
else
{

4
Source/exehead/fileform.h
View file

@ -50,7 +50,7 @@
enum
{
EW_INVALID_OPCODE, // zero is invalid. useful for catching errors. (otherwise an all zeroes instruction
// does nothing, which is easily ignored but means something is wrong.
// does nothing, which is easily ignored but means something is wrong)
EW_RET, // return from function call
EW_NOP, // Nop/Jump, do nothing: 1, [?new address+1:advance one]
EW_ABORT, // Abort: 1 [status]
@ -118,7 +118,7 @@ enum
#endif
#ifdef NSIS_SUPPORT_SHELLEXECUTE
EW_SHELLEXEC, // ShellExecute program: 4, [shell action, complete commandline, parameters, showwindow]
EW_SHELLEXEC, // ShellExecute program: 5, [SEE_MASK_FLAG_*, verb, file, parameters, showwindow] (Will wait if SEE_MASK_NOCLOSEPROCESS is set)
#endif
#ifdef NSIS_SUPPORT_EXECUTE

10
Source/exehead/util.c
View file

@ -1192,3 +1192,13 @@ void * NSISCALL NSISGetProcAddress(HANDLE dllHandle, TCHAR* funcName)
return GetProcAddress(dllHandle, funcName);
#endif
}
DWORD NSISCALL WaitForProcess(HANDLE hProcess)
{
DWORD excod;
while (WaitForSingleObject(hProcess, 100) == WAIT_TIMEOUT)
MessageLoop(WM_PAINT);
GetExitCodeProcess(hProcess, &excod);
return excod;
}

4
Source/exehead/util.h
View file

@ -157,7 +157,9 @@ void NSISCALL MessageLoop(UINT uCheckedMsg);
* @param funcName The name of the function to get the address of.
* @return The pointer to the function. Null if failure.
*/
void * NSISCALL NSISGetProcAddress(HANDLE dllHandle, TCHAR* funcName);
void* NSISCALL NSISGetProcAddress(HANDLE dllHandle, TCHAR* funcName);
DWORD NSISCALL WaitForProcess(HANDLE hProcess);
// Turn a pair of chars into a word
// Turn four chars into a dword