Fixes in installer script for NSIS 3.10 update

The plugin ExecCmd is not supported and not working anymore.
The replacement plugin is ExecDos.

While the API of ExecDos looks similar to ExecCmd it
behaves in a lot aspects differently.

Also some documented functionality like "application output to log file"
was not possible to get working.
Environment variables as part of the command line are not supported.
(Need to be resolved before)

Thus, the method used now is where the plugin puts the output on the stack.
As workaround for the piping the stack is written to a file.
Then the second command is called in a separate call.

Author: MichaelHuth

tools/installer/installer.nsi

@@ -42,6 +42,9 @@
 !define IGOR9DEFPATH "$PROGRAMFILES64\WaveMetrics\Igor Pro 9 Folder"
 !define IGOR10DEFPATH "$PROGRAMFILES64\WaveMetrics\Igor Pro 10 Folder"
 
+# Temp file for command execution output for ExecDos::Exec
+!define EXECDOSOUTPUT "ExecOutput.log"
+
 #Unicode true
 SetCompressor /SOLID lzma
 !include "${NSISREQUEST}"
@@ -128,11 +131,42 @@ Var NSD_IF_CB4
     Quit
 !macroend
 
-!macro FindProc result processName
-  ExecCmd::exec "%SystemRoot%\System32\tasklist /NH /FI $\"IMAGENAME eq ${processName}$\" | %SystemRoot%\System32\find /I $\"${processName}$\""
-  Pop $0 ; The handle for the process
-  ExecCmd::wait $0
+!macro FindProc result processName uid
+  ReadEnvStr $0 SYSTEMROOT
+  Push "ExecDos::End"
+; In contradiction to the docs the two empty strings at the end are mandatory. Otherwise the stack gets cleared.
+; The logfile name (third string) is put on the stack before the command output.
+; I could not get the plugin to generate any logfile output by itself.
+; Stack:
+;   <command output>
+;   ...
+;   <logfile name>
+;   <Marker> if pushed before
+; I found no way that allows piping to a second application
+  ExecDos::exec /NOUNLOAD /TOSTACK "$0\System32\tasklist.exe /NH /FI $\"IMAGENAME eq ${processName}$\"" "" ""
+  Pop $0
+  ${if} $0 <> 0
+    IfSilent +2
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Can not get current task list through tasklist.exe."
+    Quit
+  ${EndIf}
+
+  ReadEnvStr $0 TEMP
+  FileOpen $4 "$0\${EXECDOSOUTPUT}" w
+  Loop_${uid}:
+    Pop $1
+    StrCmp $1 "ExecDos::End" LoopEnd_${uid}
+    FileWrite $4 $1
+    Goto Loop_${uid}
+  LoopEnd_${uid}:
+  FileClose $4
+
+  ReadEnvStr $0 SYSTEMROOT
+  ReadEnvStr $1 TEMP
+  ExecDos::exec /NOUNLOAD "$0\System32\find.exe /I $\"${processName}$\" $1\${EXECDOSOUTPUT}" "" ""
+
   Pop ${result} ; The exit code
+  Delete $1\${EXECDOSOUTPUT}
 !macroend
 
 !macro CheckAllUninstalled
@@ -195,7 +229,7 @@ Var NSD_IF_CB4
 !macro WaitForProc ProcName
 !define WFPID ${__LINE__}
 WFUWaitUninstA_${WFPID}:
-    !insertmacro FindProc $processFound "${ProcName}"
+    !insertmacro FindProc $processFound "${ProcName}" ${__LINE__}
     IntCmp $processFound ${FindProc_NOT_FOUND} WFUEndWaitUninstA_${WFPID}
       Sleep 100
       Goto WFUWaitUninstA_${WFPID}
@@ -219,15 +253,15 @@ WFUEndWaitUninstA_${WFPID}:
 !macroend
 
 !macro StopOnIgor32
-  !insertmacro FindProc $processFound "Igor.exe"
+  !insertmacro FindProc $processFound "Igor.exe" ${__LINE__}
   IntCmp $processFound ${FindProc_NOT_FOUND} +4
     IfSilent +2
       MessageBox MB_OK|MB_ICONEXCLAMATION "Igor Pro is running. Please close it first" /SD IDOK
     Quit
 !macroend
 
 !macro StopOnIgor64
-  !insertmacro FindProc $processFound "Igor64.exe"
+  !insertmacro FindProc $processFound "Igor64.exe" ${__LINE__}
   IntCmp $processFound ${FindProc_NOT_FOUND} +4
     IfSilent +2
       MessageBox MB_OK|MB_ICONEXCLAMATION "Igor Pro (64-bit) is running. Please close it first" /SD IDOK
@@ -833,9 +867,9 @@ ReadLoop:
   FileRead $FILEHANDLE $LINESTR
   IfErrors +1 +2
     Goto EndReadLoop
-  ExecCmd::exec "cmd.exe /Cdel $\"$LINESTR$\""
+  ExecDos::exec /NOUNLOAD "cmd.exe /Cdel $\"$LINESTR$\"" "" ""
   Pop $0
-  ExecCmd::wait $0
+  ExecDos::wait $0
   Pop $0
   Goto ReadLoop
 EndReadLoop: