From 6efa17bc3a5ec1c036c3d1dbee8fa8e7966f8e0c Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthonylavado@me.com>
Date: Wed, 1 May 2024 23:06:37 -0400
Subject: [PATCH 1/4] Revised installer screens and functions

---
 nsis/dialogs/service-config.nsddef |   4 +-
 nsis/dialogs/service-config.nsdinc |   4 +-
 nsis/dialogs/setuptype.nsddef      |   6 +-
 nsis/dialogs/setuptype.nsdinc      |   6 +-
 nsis/dialogs/warning.nsddef        |   8 +-
 nsis/dialogs/warning.nsdinc        |  10 +-
 nsis/helpers/FindProcess.nsh       | 122 ++++++++++
 nsis/helpers/UnInst.nsh            | 362 +++++++++++++++++++++++++++++
 nsis/helpers/nsProcess.nsh         |  28 +++
 nsis/jellyfin.nsi                  | 106 ++++++---
 nsis/plugins/UnFiles.cmd           |  39 ++++
 nsis/plugins/nsProcess.dll         | Bin 0 -> 4608 bytes
 12 files changed, 650 insertions(+), 45 deletions(-)
 create mode 100644 nsis/helpers/FindProcess.nsh
 create mode 100644 nsis/helpers/UnInst.nsh
 create mode 100644 nsis/helpers/nsProcess.nsh
 create mode 100644 nsis/plugins/UnFiles.cmd
 create mode 100644 nsis/plugins/nsProcess.dll

diff --git a/nsis/dialogs/service-config.nsddef b/nsis/dialogs/service-config.nsddef
index 05ed8ad..a09b8a1 100644
--- a/nsis/dialogs/service-config.nsddef
+++ b/nsis/dialogs/service-config.nsddef
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This file was created by NSISDialogDesigner 1.5.0.0
+This file was created by NSISDialogDesigner 1.6.0.0
 https://coolsoft.altervista.org/nsisdialogdesigner
 Do not edit manually!
 -->
-<Dialog Name="service_config" Title="CoOnfigure the service" Subtitle="This controls what type of access the server gets to this system." GenerateShowFunction="False">
+<Dialog Name="service_config" Title="Configure the service" Subtitle="This controls what type of access the server gets to this system." GenerateShowFunction="False">
   <CheckBox Name="StartServiceAfterInstall" Location="12, 192" Size="426, 24" Text="Start Service after Install" Checked="True" TabIndex="0" />
   <Label Name="LocalSystemAccountLabel" Location="12, 115" Size="426, 46" Text="The Local System account has full access to every resource and file on the system. This can have very real security implications. Do not use unless absolutely necessary." TabIndex="1" />
   <Label Name="NetworkServiceAccountLabel" Location="12, 39" Size="426, 46" Text="The NetworkService account is a predefined local account used by the service control manager. It is the recommended way to install the Jellyfin Server service." TabIndex="2" />
diff --git a/nsis/dialogs/service-config.nsdinc b/nsis/dialogs/service-config.nsdinc
index bc668a2..093a31c 100644
--- a/nsis/dialogs/service-config.nsdinc
+++ b/nsis/dialogs/service-config.nsdinc
@@ -1,5 +1,5 @@
 ; =========================================================
-; This file was generated by NSISDialogDesigner 1.5.0.0
+; This file was generated by NSISDialogDesigner 1.6.0.0
 ; https://coolsoft.altervista.org/nsisdialogdesigner
 ;
 ; Do not edit it manually, use NSISDialogDesigner instead!
@@ -27,7 +27,7 @@ Function fnc_service_config_Create
   ${If} $hCtl_service_config == error
     Abort
   ${EndIf}
-  !insertmacro MUI_HEADER_TEXT "CoOnfigure the service" "This controls what type of access the server gets to this system."
+  !insertmacro MUI_HEADER_TEXT "Configure the service" "This controls what type of access the server gets to this system."
   
   ; === StartServiceAfterInstall (type: Checkbox) ===
   ${NSD_CreateCheckbox} 8u 118u 280u 15u "Start Service after Install"
diff --git a/nsis/dialogs/setuptype.nsddef b/nsis/dialogs/setuptype.nsddef
index 63acf9b..17b7a78 100644
--- a/nsis/dialogs/setuptype.nsddef
+++ b/nsis/dialogs/setuptype.nsddef
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This file was created by NSISDialogDesigner 1.5.0.0
+This file was created by NSISDialogDesigner 1.6.0.0
 https://coolsoft.altervista.org/nsisdialogdesigner
 Do not edit manually!
 -->
 <Dialog Name="setuptype" Title="Setup Type" Subtitle="Control how Jellyfin is installed.">
-  <Label Name="Label1" Location="12, 148" Size="351, 23" Text="This method is not recommended and is for Advanced Users. " Font="Microsoft Sans Serif, 9pt, style=Bold" ForeColor="Red" TabIndex="0" />
-  <Label Name="InstallasaServiceLabel" Location="12, 115" Size="426, 46" Text="Install Jellyfin as a service. Additional setup is required to access network shares. Hardware Accelaration may not work." Font="Microsoft Sans Serif, 8.25pt" TabIndex="1" />
+  <Label Name="Label1" Location="12, 135" Size="379, 26" Text="Service Install is not recommended." Font="Microsoft Sans Serif, 9pt, style=Bold" ForeColor="Red" TabIndex="0" />
+  <Label Name="InstallasaServiceLabel" Location="12, 115" Size="426, 20" Text="Install Jellyfin as a service. Additional setup is required to access network shares." Font="Microsoft Sans Serif, 8.25pt" TabIndex="1" />
   <RadioButton Name="InstallasaService" Location="12, 88" Size="426, 24" Text="Install as a Service (Advanced Users Only)" TabIndex="2" />
   <Label Name="BasicInstallLabel" Location="12, 39" Size="426, 46" Text="The basic install will run Jellyfin in your current user account.$\nThis is recommended for most users." TabIndex="3" />
   <RadioButton Name="BasicInstall" Location="12, 12" Size="426, 24" Text="Basic Install (Recommended)" Font="Microsoft Sans Serif, 8.25pt, style=Bold" Checked="True" TabIndex="4" />
diff --git a/nsis/dialogs/setuptype.nsdinc b/nsis/dialogs/setuptype.nsdinc
index aae30b7..c130536 100644
--- a/nsis/dialogs/setuptype.nsdinc
+++ b/nsis/dialogs/setuptype.nsdinc
@@ -1,5 +1,5 @@
 ; =========================================================
-; This file was generated by NSISDialogDesigner 1.5.0.0
+; This file was generated by NSISDialogDesigner 1.6.0.0
 ; https://coolsoft.altervista.org/nsisdialogdesigner
 ;
 ; Do not edit it manually, use NSISDialogDesigner instead!
@@ -32,13 +32,13 @@ Function fnc_setuptype_Create
   !insertmacro MUI_HEADER_TEXT "Setup Type" "Control how Jellyfin is installed."
   
   ; === Label1 (type: Label) ===
-  ${NSD_CreateLabel} 8u 91u 231u 14u "This method is not recommended and is for Advanced Users. "
+  ${NSD_CreateLabel} 8u 83u 249u 16u "Service Install is not recommended."
   Pop $hCtl_setuptype_Label1
   SendMessage $hCtl_setuptype_Label1 ${WM_SETFONT} $hCtl_setuptype_Font1 0
   SetCtlColors $hCtl_setuptype_Label1 0xFF0000 0xF0F0F0
   
   ; === InstallasaServiceLabel (type: Label) ===
-  ${NSD_CreateLabel} 8u 71u 280u 28u "Install Jellyfin as a service. Additional setup is required to access network shares. Hardware Accelaration may not work."
+  ${NSD_CreateLabel} 8u 71u 280u 12u "Install Jellyfin as a service. Additional setup is required to access network shares."
   Pop $hCtl_setuptype_InstallasaServiceLabel
   
   ; === InstallasaService (type: RadioButton) ===
diff --git a/nsis/dialogs/warning.nsddef b/nsis/dialogs/warning.nsddef
index 335ea4a..78aec6f 100644
--- a/nsis/dialogs/warning.nsddef
+++ b/nsis/dialogs/warning.nsddef
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This file was created by NSISDialogDesigner 1.5.0.0
+This file was created by NSISDialogDesigner 1.6.0.0
 https://coolsoft.altervista.org/nsisdialogdesigner
 Do not edit manually!
 -->
-<Dialog Name="warning" Title="Dialog title..." Subtitle="Dialog subtitle...">
-  <Label Name="Label3" Location="15, 98" Size="380, 37" Text="Do not choose any folder that contains other data or media. Upon uninstall, they will be erased." Font="Microsoft Sans Serif, 10pt, style=Bold" ForeColor="Red" TabIndex="0" />
+<Dialog Name="warning" Title="Folder Location" Subtitle="A note concerning Install and Data folder paths.">
+  <Label Name="Label3" Location="15, 98" Size="384, 22" Text="Do not choose any folder that contains other data or media." Font="Microsoft Sans Serif, 9pt, style=Bold" ForeColor="Red" TabIndex="0" />
   <Label Name="Label2" Location="15, 54" Size="423, 35" Text="When choosing an install directory and data directory, it is recommended to leave them at their default paths." TabIndex="1" />
-  <Label Name="Label1" Location="12, 9" Text="Folder Warning" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="2" />
+  <Label Name="Label1" Location="12, 9" Text="Folder Location" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="2" />
 </Dialog>
\ No newline at end of file
diff --git a/nsis/dialogs/warning.nsdinc b/nsis/dialogs/warning.nsdinc
index 8a468a4..384a909 100644
--- a/nsis/dialogs/warning.nsdinc
+++ b/nsis/dialogs/warning.nsdinc
@@ -1,5 +1,5 @@
 ; =========================================================
-; This file was generated by NSISDialogDesigner 1.5.0.0
+; This file was generated by NSISDialogDesigner 1.6.0.0
 ; https://coolsoft.altervista.org/nsisdialogdesigner
 ;
 ; Do not edit it manually, use NSISDialogDesigner instead!
@@ -18,7 +18,7 @@ Var hCtl_warning_Font2
 Function fnc_warning_Create
   
   ; custom font definitions
-  CreateFont $hCtl_warning_Font1 "Microsoft Sans Serif" "10" "700"
+  CreateFont $hCtl_warning_Font1 "Microsoft Sans Serif" "9" "700"
   CreateFont $hCtl_warning_Font2 "Microsoft Sans Serif" "8.25" "700"
   
   ; === warning (type: Dialog) ===
@@ -27,10 +27,10 @@ Function fnc_warning_Create
   ${If} $hCtl_warning == error
     Abort
   ${EndIf}
-  !insertmacro MUI_HEADER_TEXT "Dialog title..." "Dialog subtitle..."
+  !insertmacro MUI_HEADER_TEXT "Folder Location" "A note concerning Install and Data folder paths."
   
   ; === Label3 (type: Label) ===
-  ${NSD_CreateLabel} 10u 60u 250u 23u "Do not choose any folder that contains other data or media. Upon uninstall, they will be erased."
+  ${NSD_CreateLabel} 10u 60u 253u 14u "Do not choose any folder that contains other data or media."
   Pop $hCtl_warning_Label3
   SendMessage $hCtl_warning_Label3 ${WM_SETFONT} $hCtl_warning_Font1 0
   SetCtlColors $hCtl_warning_Label3 0xFF0000 0xF0F0F0
@@ -40,7 +40,7 @@ Function fnc_warning_Create
   Pop $hCtl_warning_Label2
   
   ; === Label1 (type: Label) ===
-  ${NSD_CreateLabel} 8u 6u 66u 14u "Folder Warning"
+  ${NSD_CreateLabel} 8u 6u 66u 14u "Folder Location"
   Pop $hCtl_warning_Label1
   SendMessage $hCtl_warning_Label1 ${WM_SETFONT} $hCtl_warning_Font2 0
   
diff --git a/nsis/helpers/FindProcess.nsh b/nsis/helpers/FindProcess.nsh
new file mode 100644
index 0000000..d3e1e58
--- /dev/null
+++ b/nsis/helpers/FindProcess.nsh
@@ -0,0 +1,122 @@
+/*  FindProcess.nsh
+*   https://nsis.sourceforge.io/FindProcess
+*   written by Donald Miller
+*   Mar 7, 2007
+*
+*/
+
+!include LogicLib.nsh
+!include WordFunc.nsh
+!insertmacro WordFind
+
+!ifndef FindProcess
+!define FindProcess         '!insertmacro FindProcess'
+
+!macro FindProcess ProcessList BoolReturn
+    Push '${ProcessList}'
+    Call FindProcess
+    Pop ${BoolReturn}
+!macroend
+
+Function FindProcess
+  # return True if any process in ProcessList is active
+  Exch $0     ; get ProcessList, save $0
+  Push $1
+  Push $2
+  Push $R0
+  Push $R1
+  Push $R2
+
+  StrCpy $2 "$0,"                 ; $2 = ProcessList
+
+  Push 0                          ; set return value = False
+
+  # method based upon one by Phoenix1701@gmail.com  1/27/07
+
+  System::Alloc 1024
+  Pop $R0                         ; process list buffer
+
+  # get an array of all process ids
+  System::Call "Psapi::EnumProcesses(i R0, i 1024, *i .R1)i .r0"
+  ${Unless} $0 = 0
+
+      IntOp $R1 $R1 / 4           ; Divide by sizeof(DWORD) to get $R1 process count
+      IntOp $R1 $R1 - 1           ; decr for 0 base loop
+
+      ClearErrors
+      ${For} $R2 0 $R1
+          # get a PID from the array
+          IntOp $0 $R2 << 2
+          IntOp $0 $0 + $R0           ; buffer.dword[i]
+          System::Call "*$0(i .r0)"   ; Get next PID
+
+          ${Unless} $0 = 0
+              Push $0
+              Call GetProcessName
+              Pop $1
+
+              # is this process one we are looking for?
+              ${WordFind} '$2' ',' 'E/$1' $0
+              ${Unless} ${Errors}
+                  # yes, change return value
+                  Pop $0          ; discard old result
+                  Push 1          ; set return True
+
+                  # exit the loop
+                  ${Break}
+              ${EndUnless}
+          ${EndUnless}
+      ${Next}
+
+  ${EndUnless}
+
+  System::Free $R0
+
+  Pop $0              ; get return value
+  Pop $R2             ; restore registers
+  Pop $R1
+  Pop $R0
+  Pop $2
+  Pop $1
+  Exch $0
+FunctionEnd
+
+Function GetProcessName
+  # ( Pid -- ProcessName )
+  Exch $2                     ; get Pid, save $2
+  Push $0
+  Push $1
+  Push $3
+  Push $R0
+
+  System::Call "Kernel32::OpenProcess(i 1040, i 0, i r2)i .r3"
+
+  StrCpy $2 "<unknown>"       ; set return value
+
+  ${Unless} $3 = 0            ; $3 is hProcess
+      # get hMod array
+      System::Alloc 1024
+      Pop $R0
+
+      # params: Pid, &hMod, sizeof(hMod), &cb
+      System::Call "Psapi::EnumProcessModules(i r3, i R0, i 1024, *i .r1)i .r0"
+
+      ${Unless} $0 = 0
+          # get first hMod
+          System::Call "*$R0(i .r0)"
+
+          # get BaseName; params: Pid, hMod, szBuffer, sizeof(szBuffer)
+          System::Call "Psapi::GetModuleBaseName(i r3, i r0, t .r2, i 256)i .r0"
+      ${EndUnless}
+
+      System::Free $R0
+      System::Call "kernel32::CloseHandle(i r3)"
+  ${EndUnless}
+
+  Pop $R0                     ; restore registers
+  Pop $3
+  Pop $1
+  Pop $0
+  Exch $2                     ; save process name
+FunctionEnd
+!endif
diff --git a/nsis/helpers/UnInst.nsh b/nsis/helpers/UnInst.nsh
new file mode 100644
index 0000000..f96a3f7
--- /dev/null
+++ b/nsis/helpers/UnInst.nsh
@@ -0,0 +1,362 @@
+/*
+
+NSIS Uninstaller Data
+Copyright 2014 Aleksandr Ivankiv
+
+*/
+
+;--------------------------------
+
+!ifndef UNINST_INCLUDED
+!define UNINST_INCLUDED
+
+!verbose push
+!verbose 3
+
+!ifndef UNINST_VERBOSE
+  !define UNINST_VERBOSE 3
+!endif
+
+!verbose ${UNINST_VERBOSE}
+
+;--------------------------------
+;Header files required by Uninstaller Data
+
+!include "FileFunc.nsh"
+!include "TextFunc.nsh"
+
+;--------------------------------
+;Variables
+
+Var List
+Var Log
+Var Tmp
+Var UNINST_DAT
+Var UNINST_EXE
+Var UNINST_DEL_FILE
+
+;--------------------------------
+;Default language strings
+
+!define UNINST_EXCLUDE_ERROR_DEFAULT "Error creating an exclusion list."
+!define UNINST_DATA_ERROR_DEFAULT "Error creating the uninstaller data: $\r$\nCannot find an exclusion list."
+!define UNINST_DAT_NOT_FOUND_DEFAULT "$UNINST_DAT not found, unable to perform uninstall. Manually delete files."
+!define UNINST_DAT_MISSING_DEFAULT "$UNINST_DAT is missing, some elements could not be removed. These can be removed manually."
+!define UNINST_DEL_FILE_DEFAULT "Delete File"
+
+;--------------------------------
+;Language strings macro
+
+!macro SETSTRING NAME
+
+  !ifndef "${NAME}"
+    !ifdef UNINST_LOCALIZE
+      !define "${NAME}" "$(${NAME})"
+    !else
+      !define "${NAME}" "${${NAME}_DEFAULT}"
+    !endif
+  !endif
+
+!macroend
+
+;--------------------------------
+;Initialization macro
+
+!macro UNINST_INIT
+
+  ;Default settings
+  !ifndef UninstName
+    !define UninstName "Uninstall"
+  !endif
+  !ifndef UninstHeader
+    !define UninstHeader "=========== Uninstaller Data please do not edit this file ==========="
+  !endif
+  !insertmacro SETSTRING "UNINST_EXCLUDE_ERROR"
+  !insertmacro SETSTRING "UNINST_DATA_ERROR"
+  !insertmacro SETSTRING "UNINST_DAT_NOT_FOUND"
+  !insertmacro SETSTRING "UNINST_DAT_MISSING"
+  !insertmacro SETSTRING "UNINST_DEL_FILE"
+  StrCpy $UNINST_DEL_FILE "${UNINST_DEL_FILE}"
+  StrCpy $UNINST_DAT "$OUTDIR\${UninstName}.dat"
+  StrCpy $UNINST_EXE "$OUTDIR\${UninstName}.exe"
+
+!macroend
+
+;--------------------------------
+;Change name of file
+
+!macro UNINST_NAME Name
+
+  !ifdef UninstName
+    !undef UninstName
+    !define UninstName "${Name}"
+  !else
+    !define UninstName "${Name}"
+  !endif
+  !insertmacro UNINST_INIT
+
+!macroend
+
+;--------------------------------
+;Create an exclusion list
+
+!macro UNINSTALLER_DATA_BEGIN
+
+  !insertmacro UNINST_EXCLUDE
+
+!macroend
+
+!macro UNINST_EXCLUDE
+
+  !verbose push
+  !verbose ${UNINST_VERBOSE}
+
+  !insertmacro UNINST_INIT
+
+  StrCmp "$PLUGINSDIR" "" 0 +2
+    InitPluginsDir
+
+  GetTempFileName $Tmp $PLUGINSDIR
+
+  IfErrors 0 UninstExclude
+    !ifndef UNINST_ERROR
+      !define UNINST_ERROR
+      MessageBox MB_OK|MB_ICONEXCLAMATION "${UNINST_EXCLUDE_ERROR}" /SD IDOK
+      Goto +3
+    !endif
+
+  UninstExclude:
+    FileOpen $List "$Tmp" w
+    ${Locate} "$OUTDIR" "/L=FD" "${ExcludeList_Func_CallBack}"
+    FileClose $List
+
+  !verbose pop
+
+!macroend
+
+!macro UNINST_FUNCTION_EXCLUDELIST
+
+  Function ExcludeList
+
+    FileWrite $List "$R9$\r$\n"
+    Push $0
+
+  FunctionEnd
+
+!macroend
+
+!ifndef ExcludeList_Func_CallBack
+  !insertmacro UNINST_FUNCTION_EXCLUDELIST
+  !define ExcludeList_Func_CallBack "ExcludeList"
+!endif
+
+;----------------------------------------------------------------
+;Write Uninstaller Data
+
+!macro UNINSTALLER_DATA_END
+
+  !insertmacro UNINST_DATA
+
+!macroend
+
+!macro UNINST_DATA
+
+  !verbose push
+  !verbose ${UNINST_VERBOSE}
+
+  !insertmacro UNINST_INIT
+
+  IfFileExists "$Tmp" UninstData
+    !ifndef UNINST_ERROR
+      !define UNINST_ERROR
+      ${GetFileName} "$UNINST_DAT" $R0
+      MessageBox MB_OK|MB_ICONEXCLAMATION "${UNINST_DATA_ERROR}" /SD IDOK
+    !endif
+    Goto DoneUninstData
+
+  UninstData:
+    FileOpen $Log "$UNINST_DAT" a
+    FileOpen $List "$Tmp" r
+
+    FileRead $Log $1
+    IfErrors 0 +2
+    FileWrite $Log "${UninstHeader}$\r$\n"
+
+    ${Locate} "$OUTDIR" "/L=FD" "${UninstallData_Func_CallBack}"
+
+    FileClose $List
+    FileClose $Log
+
+  DoneUninstData:
+    StrCpy $Tmp ""
+
+  !verbose pop
+
+!macroend
+
+!macro UNINST_FUNCTION_UNINSTDATA
+
+  Function UninstallData
+
+    StrCmp $R9 $UNINST_DAT Done
+
+    FileSeek $List 0 SET
+
+    LoopReadList:
+      FileRead $List $1 ${NSIS_MAX_STRLEN}
+      IfErrors DoneReadList
+
+      ${TrimNewLines} $1 $R0
+      StrCmp $R0 $R9 Done
+
+    Goto LoopReadList
+
+    DoneReadList:
+      FileSeek $Log 0 SET
+
+      LoopReadLog:
+        FileRead $Log $1 ${NSIS_MAX_STRLEN}
+        IfErrors DoneReadLog
+
+        ${TrimNewLines} $1 $R0
+        StrCmp $R0 $R9 Done
+
+      Goto LoopReadLog
+
+      DoneReadLog:
+        FileSeek $Log 0 END
+        FileWrite $Log "$R9$\r$\n"
+
+    Done:
+      Push $0
+
+  FunctionEnd
+
+!macroend
+
+!ifndef UninstallData_Func_CallBack
+  !insertmacro UNINST_FUNCTION_UNINSTDATA
+  !define UninstallData_Func_CallBack "UninstallData"
+!endif
+
+;----------------------------------------------------------------
+;Uninstall Files
+
+!macro UNINST_DELETE Path Name
+
+  !verbose push
+  !verbose ${UNINST_VERBOSE}
+
+  !if "${Path}" == ""
+    StrCpy $OUTDIR "$INSTDIR"
+  !else
+    StrCpy $OUTDIR "${Path}"
+  !endif
+  !if "${Name}" == ""
+    !insertmacro UNINST_NAME "Uninstall"
+  !else
+    !insertmacro UNINST_NAME "${Name}"
+  !endif
+
+  !insertmacro UNINST_INIT
+
+  IfFileExists "$UNINST_DAT" +3
+    !ifdef UNINST_TERMINATE
+      MessageBox MB_OK|MB_ICONSTOP "${UNINST_DAT_NOT_FOUND}" /SD IDOK
+      Quit
+    !else
+      MessageBox MB_OK|MB_ICONEXCLAMATION "${UNINST_DAT_MISSING}" /SD IDOK
+      StrCpy $0 "error"
+    !endif
+
+  ${If} $0 != "error"
+
+    FileOpen $Log "$UNINST_DAT" r
+      Call un.Delete
+    FileClose $Log
+
+    Delete "$UNINST_DAT"
+
+    !ifdef UNINST_INTERACTIVE
+      ${Locate} "$OUTDIR" "/L=F" "${un.InterActive_Func_CallBack}"
+      ${Locate} "$OUTDIR" "/L=DE" "${un.InterActive_Func_CallBack}"
+    !else
+      Call un.InterActive
+    !endif
+
+  ${Else}
+    StrCpy $0 ""
+  ${EndIf}
+
+  Delete "$UNINST_EXE"
+  RMDir $OUTDIR
+  ClearErrors
+
+  !verbose pop
+
+!macroend
+
+!macro UNINST_FUNCTION_DELETE
+
+  Function un.Delete
+
+    LoopReadFile:
+      FileRead $Log $1 ${NSIS_MAX_STRLEN}
+      IfErrors DoneReadFile
+
+      ${TrimNewLines} $1 $R0
+
+      IfFileExists $R0\*.* +3
+      IfFileExists $R0 0 +2
+      Delete $R0
+
+    Goto LoopReadFile
+
+    DoneReadFile:
+      FileSeek $Log 0 SET
+
+    LoopReadDIR:
+      FileRead $Log $1 ${NSIS_MAX_STRLEN}
+      IfErrors DoneReadDIR
+
+      ${TrimNewLines} $1 $R0
+
+      IfFileExists $R0\*.* 0 +3
+      RMDir $R0
+      ClearErrors
+
+    Goto LoopReadDIR
+
+    DoneReadDIR:
+
+  FunctionEnd
+
+!macroend
+
+!insertmacro UNINST_FUNCTION_DELETE
+
+!macro UNINST_FUNCTION_INTERACTIVE
+
+  Function un.InterActive
+
+    StrCmp $R9 "" +8
+    IfFileExists $R9\*.* 0 +3
+      RMDir $R9
+      Goto +4
+    StrCmp $R9 $UNINST_EXE +3
+      MessageBox MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2 "$UNINST_DEL_FILE '$R9'?" /SD IDNO IDNO +2
+      Delete $R9
+    Push $0
+
+  FunctionEnd
+
+!macroend
+
+!ifndef un.InterActive_Func_CallBack
+  !insertmacro UNINST_FUNCTION_INTERACTIVE
+  !define un.InterActive_Func_CallBack "un.InterActive"
+!endif
+
+!verbose pop
+
+!endif
diff --git a/nsis/helpers/nsProcess.nsh b/nsis/helpers/nsProcess.nsh
new file mode 100644
index 0000000..9ef6098
--- /dev/null
+++ b/nsis/helpers/nsProcess.nsh
@@ -0,0 +1,28 @@
+!define nsProcess::FindProcess `!insertmacro nsProcess::FindProcess`
+
+!macro nsProcess::FindProcess _FILE _ERR
+	nsProcess::_FindProcess /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define nsProcess::KillProcess `!insertmacro nsProcess::KillProcess`
+
+!macro nsProcess::KillProcess _FILE _ERR
+	nsProcess::_KillProcess /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+!define nsProcess::CloseProcess `!insertmacro nsProcess::CloseProcess`
+
+!macro nsProcess::CloseProcess _FILE _ERR
+	nsProcess::_CloseProcess /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define nsProcess::Unload `!insertmacro nsProcess::Unload`
+
+!macro nsProcess::Unload
+	nsProcess::_Unload
+!macroend
diff --git a/nsis/jellyfin.nsi b/nsis/jellyfin.nsi
index 762d6cb..0e978df 100644
--- a/nsis/jellyfin.nsi
+++ b/nsis/jellyfin.nsi
@@ -1,14 +1,24 @@
 !verbose 3
-SetCompressor /SOLID bzip2
+;SetCompressor /SOLID bzip2 TODO ENABLE FOR RELEASE
 ShowInstDetails show
 ShowUninstDetails show
 Unicode True
 
 !define SF_USELECTED  0 ; used to check selected options status, rest are inherited from Sections.nsh
+!define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\JellyfinServer" ;Registry to show up in Add/Remove Programs
+!define INSTDIR_REG_ROOT "HKLM" ;Define root hive to use
 
 !include "MUI2.nsh"
 !include "Sections.nsh"
 !include "LogicLib.nsh"
+!addplugindir "plugins"
+;!include "helpers\UnInst.nsh" TODO TAKE OUT THESE TWO INCLUDES
+;!include "helpers\nsProcess.nsh"
+!include "helpers\FindProcess.nsh"
+
+
+;Define uninstall list name (optimal) TODO TAKE OUT THESE TWO  LINES
+;!define UninstName "Uninstall"
 
 !include "helpers\ShowError.nsh"
 
@@ -43,7 +53,7 @@ Unicode True
 
 ;--------------------------------
 
-!define REG_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\JellyfinServer" ;Registry to show up in Add/Remove Programs
+
 !define REG_CONFIG_KEY "Software\Jellyfin\Server" ;Registry to store all configuration
 
 !getdllversion "$%InstallLocation%\jellyfin.dll" ver_ ;Align installer version with jellyfin.dll version
@@ -57,7 +67,7 @@ VIProductVersion "${ver_1}.${ver_2}.${ver_3}.0" ; VIProductVersion format, shoul
 VIFileVersion "${ver_1}.${ver_2}.${ver_3}.0" ; VIFileVersion format, should be X.X.X.X
 VIAddVersionKey "ProductName" "Jellyfin Server"
 VIAddVersionKey "FileVersion" "${ver_1}.${ver_2}.${ver_3}.0"
-VIAddVersionKey "LegalCopyright" "(c) 2019 Jellyfin Contributors. Code released under the GNU General Public License"
+VIAddVersionKey "LegalCopyright" "(c) 2024 Jellyfin Contributors. Code released under the GNU General Public License."
 VIAddVersionKey "FileDescription" "Jellyfin Server: The Free Software Media System"
 
 ;TODO, check defaults
@@ -96,15 +106,21 @@ CRCCheck on ; make sure the installer wasn't corrupted while downloading
 ; Components Page
     !define MUI_PAGE_CUSTOMFUNCTION_PRE HideComponentsPage
     !insertmacro MUI_PAGE_COMPONENTS
+
+; Folder Warning Page
+    Page custom ShowFolderWarningPage
+
+; Install folder page
     !define MUI_PAGE_CUSTOMFUNCTION_PRE HideInstallDirectoryPage ; Controls when to hide / show
     !define MUI_DIRECTORYPAGE_TEXT_DESTINATION "Install folder" ; shows just above the folder selection dialog
+    !define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install Jellyfin in the following folder.$\nTo install in a different folder, click Browse and select another folder."
     !insertmacro MUI_PAGE_DIRECTORY
 
 ; Data folder Page
     !define MUI_PAGE_CUSTOMFUNCTION_PRE HideDataDirectoryPage ; Controls when to hide / show
     !define MUI_PAGE_HEADER_TEXT "Choose Data Location"
     !define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which to install the Jellyfin Server data."
-    !define MUI_DIRECTORYPAGE_TEXT_TOP "The installer will set the following folder for Jellyfin Server data. To install in a different folder, click Browse and select another folder. Please make sure the folder exists and is accessible. Do not choose the server install folder. Click Next to continue."
+    !define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will set the following folder for Jellyfin Server data. To install in a different folder, click Browse and select another folder.$\nPlease make sure the folder exists and is accessible.$\nDo not choose the server install folder."
     !define MUI_DIRECTORYPAGE_TEXT_DESTINATION "Data folder"
     !define MUI_DIRECTORYPAGE_VARIABLE $_JELLYFINDATADIR_
     !insertmacro MUI_PAGE_DIRECTORY
@@ -113,6 +129,7 @@ CRCCheck on ; make sure the installer wasn't corrupted while downloading
     !include "dialogs\setuptype.nsdinc"
     !include "dialogs\service-config.nsdinc"
     !include "dialogs\confirmation.nsdinc"
+    !include "dialogs\warning.nsdinc"
 
 ; Select service account type
     #!define MUI_PAGE_CUSTOMFUNCTION_PRE HideServiceConfigPage ; Controls when to hide / show (This does not work for Page, might need to go PageEx)
@@ -166,9 +183,18 @@ Section "!Jellyfin Server (required)" InstallJellyfinServer
 
     SetOutPath "$INSTDIR"
 
+    ; ;Create an exclusion list
+    ; !insertmacro UNINSTALLER_DATA_BEGIN
+
     File "/oname=icon.ico" "${UXPATH}\branding\NSIS\modern-install.ico"
     File /r $%InstallLocation%\*
 
+    ; ;Change uninstall list name (optimal)
+    ; !insertmacro UNINST_NAME "unins000"
+
+    ; ;Store uninstaller data
+    ; !insertmacro UNINSTALLER_DATA_END
+
     ; Write the InstallFolder, DataFolder, Network Service info into the registry for later use
     WriteRegExpandStr HKLM "${REG_CONFIG_KEY}" "InstallFolder" "$INSTDIR"
     WriteRegExpandStr HKLM "${REG_CONFIG_KEY}" "DataFolder" "$_JELLYFINDATADIR_"
@@ -178,14 +204,14 @@ Section "!Jellyfin Server (required)" InstallJellyfinServer
     StrCpy $_JELLYFINVERSION_ "${ver_1}.${ver_2}.${ver_3}" ;
 
     ; Write the uninstall keys for Windows
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayName" "Jellyfin Server $_JELLYFINVERSION_ ${NAMESUFFIX}"
-    WriteRegExpandStr HKLM "${REG_UNINST_KEY}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayIcon" '"$INSTDIR\Uninstall.exe",0'
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "Publisher" "The Jellyfin Project"
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "URLInfoAbout" "https://jellyfin.org/"
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayVersion" "$_JELLYFINVERSION_"
-    WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoModify" 1
-    WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoRepair" 1
+    WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayName" "Jellyfin Server $_JELLYFINVERSION_ ${NAMESUFFIX}"
+    WriteRegExpandStr HKLM "${INSTDIR_REG_KEY}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+    WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayIcon" '"$INSTDIR\Uninstall.exe",0'
+    WriteRegStr HKLM "${INSTDIR_REG_KEY}" "Publisher" "The Jellyfin Project"
+    WriteRegStr HKLM "${INSTDIR_REG_KEY}" "URLInfoAbout" "https://jellyfin.org/"
+    WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayVersion" "$_JELLYFINVERSION_"
+    WriteRegDWORD HKLM "${INSTDIR_REG_KEY}" "NoModify" 1
+    WriteRegDWORD HKLM "${INSTDIR_REG_KEY}" "NoRepair" 1
 
     ; Create uninstaller
     WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -302,6 +328,8 @@ SectionEnd
 ;Uninstaller Section
 
 Section "Uninstall"
+    ;!define UNINST_TERMINATE TODO TAKE OUT
+
     ReadRegStr $INSTDIR HKLM "${REG_CONFIG_KEY}" "InstallFolder"  ; read the installation folder
     ReadRegStr $_JELLYFINDATADIR_ HKLM "${REG_CONFIG_KEY}" "DataFolder"  ; read the data folder
     ReadRegStr $_SERVICEACCOUNTTYPE_ HKLM "${REG_CONFIG_KEY}" "ServiceAccountType"  ; read the account name
@@ -309,7 +337,10 @@ Section "Uninstall"
     DetailPrint "Jellyfin Install location: $INSTDIR"
     DetailPrint "Jellyfin Data folder: $_JELLYFINDATADIR_"
 
-    MessageBox MB_YESNO|MB_ICONINFORMATION "Do you want to retain the Jellyfin Server data folder? The media will not be touched. $\r$\nIf unsure choose YES." /SD IDYES IDYES PreserveData
+    MessageBox MB_YESNO|MB_ICONINFORMATION "Do you want to keep the Jellyfin Server data folder? $\r$\nIf unsure choose YES." /SD IDYES IDYES PreserveData IDNO DeleteConfirmation
+
+    DeleteConfirmation:
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "Are you sure? Everything in $\r$\n$_JELLYFINDATADIR_ $\r$\nwill be deleted. $\r$\nIf you are sure, press OK." IDCANCEL PreserveData
 
     RMDir /r /REBOOTOK "$_JELLYFINDATADIR_"
 
@@ -345,13 +376,10 @@ Section "Uninstall"
             DetailPrint "Removed old shortcuts..."
         ${EndIf}
 
-    Delete "$INSTDIR\*.*"
-    RMDir /r /REBOOTOK "$INSTDIR\jellyfin-web"
-    Delete "$INSTDIR\Uninstall.exe"
-    RMDir /r /REBOOTOK "$INSTDIR"
+    ;!insertmacro UNINST_DELETE "$INSTDIR" "${UninstName}" TAKE OUT TODO
 
     DeleteRegKey HKLM "Software\Jellyfin"
-    DeleteRegKey HKLM "${REG_UNINST_KEY}"
+    DeleteRegKey HKLM "${INSTDIR_REG_KEY}"
 SectionEnd
 
 Function .onInit
@@ -366,11 +394,26 @@ Function .onInit
     SetShellVarContext current
     StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server"
 
-    System::Call 'kernel32::CreateMutex(p 0, i 0, t "JellyfinServerMutex") p .r1 ?e'
-    Pop $R0
+    ;System::Call 'kernel32::CreateMutex(p 0, i 0, t "JellyfinServerMutex") p .r1 ?e'
+    ;Pop $R0
+
+    ;StrCmp $R0 0 +3
+    ;!insertmacro ShowErrorFinal "The installer is already running."
+
 
-    StrCmp $R0 0 +3
-    !insertmacro ShowErrorFinal "The installer is already running."
+    ${FindProcess} "jellyfin.exe" $0
+    ${If} $0 <> 0
+        MessageBox MB_OK|MB_ICONEXCLAMATION "Jellyfin is running. Please close it first." /SD IDOK
+        Abort
+    ${EndIf}
+
+    ; StrCpy $1 "jellyfin.exe"
+    ; nsProcess::_FindProcess "$1"
+    ; Pop $R1
+    ; ${If} $R1 = 0
+    ;   MessageBox MB_OK|MB_ICONEXCLAMATION "Jellyfin is running. Please close it first." /SD IDOK
+    ; Abort
+    ; ${EndIf}
 
 ;Detect if Jellyfin is already installed.
 ; In case it is installed, let the user choose either
@@ -430,6 +473,12 @@ Function .onInit
     NoExisitingInstall: ; by this time, the variables have been correctly set to reflect previous install details
 FunctionEnd
 
+Function HideFolderWarningPage
+    ${If} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't warn for folder directories
+        Abort
+    ${EndIf}
+FunctionEnd
+
 Function HideInstallDirectoryPage
     ${If} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't ask for InstallFolder
         Abort
@@ -437,7 +486,7 @@ Function HideInstallDirectoryPage
 FunctionEnd
 
 Function HideDataDirectoryPage
-    ${If} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't ask for InstallFolder
+    ${If} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't ask for DataFolder
         Abort
     ${EndIf}
 FunctionEnd
@@ -470,8 +519,13 @@ FunctionEnd
 ; Setup Type dialog show function
 Function ShowSetupTypePage
   Call HideSetupTypePage
-  Call fnc_setuptype_Create
-  nsDialogs::Show
+  Call fnc_setuptype_Show
+FunctionEnd
+
+; Folder Warning dialog show function
+Function ShowFolderWarningPage
+  Call HideFolderWarningPage
+  Call fnc_warning_Show
 FunctionEnd
 
 ; Service Config dialog show function
@@ -567,5 +621,5 @@ Function .onSelChange
 FunctionEnd
 
 Function .onInstSuccess
-    #ExecShell "open" "http://localhost:8096"
+    #ExecShell "open" "http://localhost:8096" TODO MAKE THIS HAPPEN IF FIRST INSTALL
 FunctionEnd
diff --git a/nsis/plugins/UnFiles.cmd b/nsis/plugins/UnFiles.cmd
new file mode 100644
index 0000000..608c9d1
--- /dev/null
+++ b/nsis/plugins/UnFiles.cmd
@@ -0,0 +1,39 @@
+@rem NSIS Uninstall Header Recursive File List Maker
+@rem Copyright 2014 Aleksandr Ivankiv, 2017 Dani Mantovani
+@rem https://nsis.sourceforge.io/Uninstall_Header_Recursive_File_List_Maker
+
+@SET DIR=%~1
+@SET HEADER=%~2
+@IF "%~1" == "/?" goto Help
+@IF NOT DEFINED DIR goto Help
+@IF NOT DEFINED HEADER SET HEADER=UnFiles.nsh
+@IF NOT EXIST "%DIR%" ECHO Error: Cannot find the folder %DIR%. & SET "DIR=" & goto :EOF
+
+@SetLocal EnableDelayedExpansion
+
+IF %DIR:~-1%==\ SET DIR=%DIR:~0,-1%
+
+@FOR /F "tokens=*" %%f IN ('DIR %DIR%\*.* /A:-D /B /S') DO @(
+  set string=%%f
+  set string=!string:%CD%\%DIR%=!
+  set string=!string:$=$$!
+  echo Delete "$OUTDIR\!string:~1!" >> %HEADER%
+  echo !string:~1!
+)
+
+@FOR /F "tokens=*" %%d IN ('DIR %DIR%\*.* /A:D /B /S ^| SORT /R') DO @(
+  set string=%%d
+  set string=!string:%CD%\%DIR%=!
+  set string=!string:$=$$!
+  echo RMDir "$OUTDIR\!string:~1!" >> %HEADER%
+  echo !string:~1!
+)
+
+@EndLocal
+@goto :EOF
+
+:Help
+@echo.
+@echo Usage: UnFiles FolderName [OutFile]
+@echo.
+@goto :EOF
diff --git a/nsis/plugins/nsProcess.dll b/nsis/plugins/nsProcess.dll
new file mode 100644
index 0000000000000000000000000000000000000000..2478624ee0bcceb6e2c0eee3a563e7cea272ba9a
GIT binary patch
literal 4608
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
I{EsW}54bMdo&W#<

literal 0
HcmV?d00001


From d98f6ea0b6f46d1e53dee3cc2ede91a82940cbf2 Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthonylavado@me.com>
Date: Sat, 11 May 2024 02:24:25 -0400
Subject: [PATCH 2/4] Add nsprocess source and installer changes

---
 Support Files/nsProcess/COPYING               | 144 +++
 Support Files/nsProcess/ConvFunc.h            | 825 ++++++++++++++++++
 .../nsProcess/README_JamulusChanges.txt       |  12 +
 Support Files/nsProcess/Readme.txt            |  68 ++
 Support Files/nsProcess/api.h                 |  83 ++
 Support Files/nsProcess/build_nsprocess.ps1   | 262 ++++++
 Support Files/nsProcess/nsProcess.c           | 416 +++++++++
 Support Files/nsProcess/nsProcess.sln         |  28 +
 Support Files/nsProcess/nsProcess.vcxproj     | 219 +++++
 .../nsProcess/nsProcess.vcxproj.filters       |  36 +
 Support Files/nsProcess/nsis_tchar.h          | 214 +++++
 Support Files/nsProcess/pluginapi.c           | 290 ++++++
 Support Files/nsProcess/pluginapi.h           | 101 +++
 nsis/helpers/FindProcess.nsh                  | 122 ---
 nsis/jellyfin.nsi                             |  65 +-
 nsis/plugins/UnFiles.cmd                      |  39 -
 nsis/plugins/nsProcess.dll                    | Bin 4608 -> 6144 bytes
 17 files changed, 2716 insertions(+), 208 deletions(-)
 create mode 100644 Support Files/nsProcess/COPYING
 create mode 100644 Support Files/nsProcess/ConvFunc.h
 create mode 100644 Support Files/nsProcess/README_JamulusChanges.txt
 create mode 100644 Support Files/nsProcess/Readme.txt
 create mode 100644 Support Files/nsProcess/api.h
 create mode 100644 Support Files/nsProcess/build_nsprocess.ps1
 create mode 100644 Support Files/nsProcess/nsProcess.c
 create mode 100644 Support Files/nsProcess/nsProcess.sln
 create mode 100644 Support Files/nsProcess/nsProcess.vcxproj
 create mode 100644 Support Files/nsProcess/nsProcess.vcxproj.filters
 create mode 100644 Support Files/nsProcess/nsis_tchar.h
 create mode 100644 Support Files/nsProcess/pluginapi.c
 create mode 100644 Support Files/nsProcess/pluginapi.h
 delete mode 100644 nsis/helpers/FindProcess.nsh
 delete mode 100644 nsis/plugins/UnFiles.cmd

diff --git a/Support Files/nsProcess/COPYING b/Support Files/nsProcess/COPYING
new file mode 100644
index 0000000..bb6b304
--- /dev/null
+++ b/Support Files/nsProcess/COPYING	
@@ -0,0 +1,144 @@
+COPYRIGHT
+---------
+
+Copyright (C) 1999-2021 Contributors
+
+More detailed copyright information can be found in the individual source code files.
+
+APPLICABLE LICENSES
+-------------------
+
+* All NSIS source code, plug-ins, documentation, examples, header files and graphics, with the exception of the compression modules and where otherwise noted, are licensed under the zlib/libpng license.
+
+* The zlib compression module for NSIS is licensed under the zlib/libpng license.
+
+* The bzip2 compression module for NSIS is licensed under the bzip2 license.
+
+* The LZMA compression module for NSIS is licensed under the Common Public License version 1.0.
+
+ZLIB/LIBPNG LICENSE
+-------------------
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+      1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+      2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+      3. This notice may not be removed or altered from any source distribution.
+
+BZIP2 LICENSE
+-------------
+
+This program, "bzip2" and associated library "libbzip2", are copyright (C) 1996-2000 Julian R Seward. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+      1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    
+      2. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+      3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+      4. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, Cambridge, UK.
+
+jseward@acm.org
+
+COMMON PUBLIC LICENSE VERSION 1.0
+---------------------------------
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+      b) in the case of each subsequent Contributor:
+
+      i) changes to the Program, and
+
+      ii) additions to the Program;
+
+      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
+
+      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+      a) it complies with the terms and conditions of this Agreement; and
+
+      b) its license agreement:
+
+      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
+
+      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
+
+      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+      a) it must be made available under this Agreement; and 
+
+      b) a copy of this Agreement must be included with each copy of the Program. 
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
+
+SPECIAL EXCEPTION FOR LZMA COMPRESSION MODULE
+---------------------------------------------
+
+Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for NSIS, expressly permit you to statically or dynamically link your code (or bind by name) to the files from the LZMA compression module for NSIS without subjecting your linked code to the terms of the Common Public license version 1.0. Any modifications or additions to files from the LZMA compression module for NSIS, however, are subject to the terms of the Common Public License version 1.0.
diff --git a/Support Files/nsProcess/ConvFunc.h b/Support Files/nsProcess/ConvFunc.h
new file mode 100644
index 0000000..739737b
--- /dev/null
+++ b/Support Files/nsProcess/ConvFunc.h	
@@ -0,0 +1,825 @@
+/*****************************************************************
+ *           Conversion functions header v1.9                    *
+ *                                                               *
+ * 2006 Shengalts Aleksander aka Instructor (Shengalts@mail.ru)  *
+ *                                                               *
+ *                                                               *
+ *Functions (ALLCONVFUNC):                                       *
+ * xatoi, xatoiW, xitoa, xitoaW, xatoui, xatouiW,                *
+ * xuitoa, xuitoaW, xatoi64, xatoi64W, xi64toa, xi64toaW,        *
+ * hex2dec, hex2decW, dec2hex, dec2hexW                          *
+ *                                                               *
+ *Special functions (ALLCONVFUNCS):                              *
+ * str2hex, hex2str                                              *
+ *                                                               *
+ *****************************************************************/
+
+#ifndef _CONVFUNC_
+#define _CONVFUNC_ 
+
+int xatoi(char *str);
+int xatoiW(wchar_t *wstr);
+char* xitoa(int number, char *str, int width);
+wchar_t* xitoaW(int number, wchar_t *wstr, int width);
+unsigned int xatoui(char *str);
+unsigned int xatouiW(wchar_t *wstr);
+char* xuitoa(unsigned int number, char *str, int width);
+wchar_t* xuitoaW(unsigned int number, wchar_t *wstr, int width);
+__int64 xatoi64(char *str);
+__int64 xatoi64W(wchar_t *wstr);
+char* xi64toa(__int64 number, char *str, int width);
+wchar_t* xi64toaW(__int64 number, wchar_t *wstr, int width);
+int hex2dec(char *hex);
+int hex2decW(wchar_t *whex);
+void dec2hex(unsigned int dec, char *hex, BOOL lowercase, unsigned int width);
+void dec2hexW(unsigned int dec, wchar_t *whex, BOOL lowercase, unsigned int width);
+
+void str2hex(unsigned char *str, char *hex, BOOL lowercase, unsigned int bytes);
+void hex2str(char *hex, char *str);
+
+#endif
+
+/********************************************************************
+ *
+ *  xatoi
+ *
+ *Converts string to int.
+ *
+ *[in]  char *str   -string number
+ *
+ *Returns: integer
+ *
+ *Examples:
+ *  xatoi("45") == 45;
+ *  xatoi("  -0045:value") == -45;
+ ********************************************************************/
+#if defined xatoi || defined ALLCONVFUNC
+#define xatoi_INCLUDED
+#undef xatoi
+int xatoi(char *str)
+{
+  int nNumber=0;
+  BOOL bMinus=FALSE;
+
+  while (*str == ' ')
+    ++str;
+  if (*str == '+')
+    ++str;
+  else if (*str == '-')
+  {
+    bMinus=TRUE;
+    ++str;
+  }
+  for (; *str != '\0' && *str >= '0' && *str <= '9'; ++str)
+    nNumber=(nNumber * 10) + (*str - '0');
+  if (bMinus == TRUE)
+    nNumber=0 - nNumber;
+  return nNumber;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xatoiW
+ *
+ *Converts unicode string to int.
+ *
+ *[in]  wchar_t *wstr   -string number
+ *
+ *Returns: integer
+ *
+ *Examples:
+ *  xatoiW(L"45") == 45;
+ *  xatoiW(L"  -0045:value") == -45;
+ ********************************************************************/
+#if defined xatoiW || defined ALLCONVFUNC
+#define xatoiW_INCLUDED
+#undef xatoiW
+int xatoiW(wchar_t *wstr)
+{
+  int nNumber=0;
+  BOOL bMinus=FALSE;
+
+  while (*wstr == ' ')
+    ++wstr;
+  if (*wstr == '+')
+    ++wstr;
+  else if (*wstr == '-')
+  {
+    bMinus=TRUE;
+    ++wstr;
+  }
+  for (; *wstr != '\0' && *wstr >= '0' && *wstr <= '9'; ++wstr)
+    nNumber=(nNumber * 10) + (*wstr - '0');
+  if (bMinus == TRUE)
+    nNumber=0 - nNumber;
+  return nNumber;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xitoa   [API: wsprintf(szResult, "%d", 45)]
+ *
+ *Converts int to string.
+ *
+ *[in]   int number   -integer
+ *[out]  char *str    -string number
+ *[in]   int width    -minimum number of characters to the output
+ *
+ *Returns: a pointer to string
+ *
+ *Examples:
+ *  xitoa(45, szResult, 0);   //szResult == "45"
+ *  xitoa(-45, szResult, 0);  //szResult == "-45"
+ *  xitoa(45, szResult, 4);   //szResult == "0045"
+ ********************************************************************/
+#if defined xitoa || defined ALLCONVFUNC
+#define xitoa_INCLUDED
+#undef xitoa
+char* xitoa(int number, char *str, int width)
+{
+  char tmp[128];
+  int a=0;
+  int b=0;
+  *tmp = 0;
+
+  if (number == 0)
+  {
+    str[0]='0';
+    --width;
+    b=1;
+  }
+  else if (number < 0)
+  {
+    str[0]='-';
+    number=0 - number;
+    --width;
+    b=1;
+  }
+  for (tmp[a]='\0'; number != 0; ++a)
+  {
+    tmp[a]=(number % 10) + '0';
+    number=number / 10;
+  }
+  if (a < width)
+  do
+  {
+	tmp[a]='0';
+  } while (++a<width);
+  for (--a; a >= 0; --a, ++b) str[b]=tmp[a];
+
+  str[b]='\0';
+  return str;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xitoaW   [API: wsprintfW(wszResult, L"%d", 45)]
+ *
+ *Converts int to unicode string.
+ *
+ *[in]   int number      -integer
+ *[out]  wchar_t *wstr   -unicode string number
+ *[in]   int width       -minimum number of characters to the output
+ *
+ *Returns: a pointer to unicode string
+ *
+ *Examples:
+ *  xitoaW(45, wszResult, 0);   //wszResult == L"45"
+ *  xitoaW(-45, wszResult, 0);  //wszResult == L"-45"
+ *  xitoaW(45, wszResult, 4);   //wszResult == L"0045"
+ ********************************************************************/
+#if defined xitoaW || defined ALLCONVFUNC
+#define xitoaW_INCLUDED
+#undef xitoaW
+wchar_t* xitoaW(int number, wchar_t *wstr, int width)
+{
+  wchar_t wtmp[128]=L"";
+  int a=0;
+  int b=0;
+
+  if (number == 0)
+  {
+    wstr[0]='0';
+    --width;
+    b=1;
+  }
+  else if (number < 0)
+  {
+    wstr[0]='-';
+    number=0 - number;
+    --width;
+    b=1;
+  }
+  for (wtmp[a]='\0'; number != 0; ++a)
+  {
+    wtmp[a]=(number % 10) + '0';
+    number=number / 10;
+  }
+  for (; width > a; ++a) wtmp[a]='0';
+  for (--a; a >= 0; --a, ++b) wstr[b]=wtmp[a];
+
+  wstr[b]='\0';
+  return wstr;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xatoui
+ *
+ *Converts string to unsigned int.
+ *
+ *[in]  char *str   -string number
+ *
+ *Returns: unsigned integer
+ *
+ *Examples:
+ *  xatoui("45") == 45;
+ *  xatoui("  -0045:value") == 0;
+ ********************************************************************/
+#if defined xatoui || defined ALLCONVFUNC
+#define xatoui_INCLUDED
+#undef xatoui
+unsigned int xatoui(char *str)
+{
+  unsigned int nNumber=0;
+
+  while (*str == ' ')
+    ++str;
+  if (*str == '+')
+    ++str;
+  else if (*str == '-')
+    return 0;
+  for (; *str != '\0' && *str >= '0' && *str <= '9'; ++str)
+    nNumber=(nNumber * 10) + (*str - '0');
+  return nNumber;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xatouiW
+ *
+ *Converts unicode string to unsigned int.
+ *
+ *[in]  wchar_t *wstr   -unicode string number
+ *
+ *Returns: unsigned integer
+ *
+ *Examples:
+ *  xatouiW(L"45") == 45;
+ *  xatouiW(L"  -0045:value") == 0;
+ ********************************************************************/
+#if defined xatouiW || defined ALLCONVFUNC
+#define xatouiW_INCLUDED
+#undef xatouiW
+unsigned int xatouiW(wchar_t *wstr)
+{
+  unsigned int nNumber=0;
+
+  while (*wstr == ' ')
+    ++wstr;
+  if (*wstr == '+')
+    ++wstr;
+  else if (*wstr == '-')
+    return 0;
+  for (; *wstr != '\0' && *wstr >= '0' && *wstr <= '9'; ++wstr)
+    nNumber=(nNumber * 10) + (*wstr - '0');
+  return nNumber;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xuitoa
+ *
+ *Converts unsigned int to string.
+ *
+ *[in]   unsigned int number   -unsigned integer
+ *[out]  char *str             -string number
+ *[in]   int width             -minimum number of characters to the output
+ *
+ *Returns: a pointer to string
+ *
+ *Examples:
+ *  xuitoa(45, szResult, 0);   //szResult == "45"
+ *  xuitoa(45, szResult, 4);   //szResult == "0045"
+ ********************************************************************/
+#if defined xuitoa || defined ALLCONVFUNC
+#define xuitoa_INCLUDED
+#undef xuitoa
+char* xuitoa(unsigned int number, char *str, int width)
+{
+  char tmp[128]="";
+  int a=0;
+  int b=0;
+
+  if (number == 0)
+  {
+    str[0]='0';
+    --width;
+    b=1;
+  }
+  for (tmp[a]='\0'; number != 0; ++a)
+  {
+    tmp[a]=(number % 10) + '0';
+    number=number / 10;
+  }
+  for (; width > a; ++a) tmp[a]='0';
+  for (--a; a >= 0; --a, ++b) str[b]=tmp[a];
+
+  str[b]='\0';
+  return str;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xuitoaW
+ *
+ *Converts unsigned int to unicode string.
+ *
+ *[in]   unsigned int number   -unsigned integer
+ *[out]  wchar_t *wstr         -unicode string number
+ *[in]   int width             -minimum number of characters to the output
+ *
+ *Returns: a pointer to unicode string
+ *
+ *Examples:
+ *  xuitoaW(45, wszResult, 0);   //wszResult == L"45"
+ *  xuitoaW(45, wszResult, 4);   //wszResult == L"0045"
+ ********************************************************************/
+#if defined xuitoaW || defined ALLCONVFUNC
+#define xuitoaW_INCLUDED
+#undef xuitoaW
+wchar_t* xuitoaW(unsigned int number, wchar_t *wstr, int width)
+{
+  wchar_t wtmp[128]=L"";
+  int a=0;
+  int b=0;
+
+  if (number == 0)
+  {
+    wstr[0]='0';
+    --width;
+    b=1;
+  }
+  for (wtmp[a]='\0'; number != 0; ++a)
+  {
+    wtmp[a]=(number % 10) + '0';
+    number=number / 10;
+  }
+  for (; width > a; ++a) wtmp[a]='0';
+  for (--a; a >= 0; --a, ++b) wstr[b]=wtmp[a];
+
+  wstr[b]='\0';
+  return wstr;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xatoi64
+ *
+ *Converts string to int64.
+ *
+ *[in]  char *str   -string number
+ *
+ *Returns: 64-bit integer
+ *
+ *Examples:
+ *  xatoi64("45") == 45;
+ *  xatoi64("  -0045:value") == -45;
+ ********************************************************************/
+#if defined xatoi64 || defined ALLCONVFUNC
+#define xatoi64_INCLUDED
+#undef xatoi64
+__int64 xatoi64(char *str)
+{
+  __int64 nNumber=0;
+  BOOL bMinus=FALSE;
+
+  while (*str == ' ')
+    ++str;
+  if (*str == '+')
+    ++str;
+  else if (*str == '-')
+  {
+    bMinus=TRUE;
+    ++str;
+  }
+  for (; *str != '\0' && *str >= '0' && *str <= '9'; ++str)
+    nNumber=(nNumber * 10) + (*str - '0');
+  if (bMinus == TRUE)
+    nNumber=0 - nNumber;
+  return nNumber;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xatoi64W
+ *
+ *Converts unicode string to int64.
+ *
+ *[in]  wchar_t *wstr   -unicode string number
+ *
+ *Returns: 64-bit integer
+ *
+ *Examples:
+ *  xatoi64W(L"45") == 45;
+ *  xatoi64W(L"  -0045:value") == -45;
+ ********************************************************************/
+#if defined xatoi64W || defined ALLCONVFUNC
+#define xatoi64W_INCLUDED
+#undef xatoi64W
+__int64 xatoi64W(wchar_t *wstr)
+{
+  __int64 nNumber=0;
+  BOOL bMinus=FALSE;
+
+  while (*wstr == ' ')
+    ++wstr;
+  if (*wstr == '+')
+    ++wstr;
+  else if (*wstr == '-')
+  {
+    bMinus=TRUE;
+    ++wstr;
+  }
+  for (; *wstr != '\0' && *wstr >= '0' && *wstr <= '9'; ++wstr)
+    nNumber=(nNumber * 10) + (*wstr - '0');
+  if (bMinus == TRUE)
+    nNumber=0 - nNumber;
+  return nNumber;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xitoa64
+ *
+ *Converts int64 to string.
+ *
+ *[in]   __int64 number  -64-bit integer
+ *[out]  char *str       -string number
+ *[in]   int width       -minimum number of characters to the output
+ *
+ *Returns: a pointer to string
+ *
+ *Examples:
+ *  xi64toa(45, szResult, 0);   //szResult == "45"
+ *  xi64toa(-45, szResult, 0);  //szResult == "-45"
+ *  xi64toa(45, szResult, 4);   //szResult == "0045"
+ ********************************************************************/
+#if defined xi64toa || defined ALLCONVFUNC
+#define xi64toa_INCLUDED
+#undef xi64toa
+char* xi64toa(__int64 number, char *str, int width)
+{
+  char tmp[128]="";
+  int a=0;
+  int b=0;
+
+  if (number == 0)
+  {
+    str[0]='0';
+    --width;
+    b=1;
+  }
+  else if (number < 0)
+  {
+    str[0]='-';
+    number=0 - number;
+    --width;
+    b=1;
+  }
+  for (tmp[a]='\0'; number != 0; ++a)
+  {
+    tmp[a]=(char)((number % 10) + '0');
+    number=number / 10;
+  }
+  for (; width > a; ++a) tmp[a]='0';
+  for (--a; a >= 0; --a, ++b) str[b]=tmp[a];
+
+  str[b]='\0';
+  return str;
+}
+#endif
+
+/********************************************************************
+ *
+ *  xitoa64W
+ *
+ *Converts int64 to unicode string.
+ *
+ *[in]   __int64 number  -64-bit integer
+ *[out]  wchar_t *wstr   -unicode string number
+ *[in]   int width       -minimum number of characters to the output
+ *
+ *Returns: a pointer to unicode string
+ *
+ *Examples:
+ *  xi64toaW(45, wszResult, 0);   //wszResult == L"45"
+ *  xi64toaW(-45, wszResult, 0);  //wszResult == L"-45"
+ *  xi64toaW(45, wszResult, 4);   //wszResult == L"0045"
+ ********************************************************************/
+#if defined xi64toaW || defined ALLCONVFUNC
+#define xi64toaW_INCLUDED
+#undef xi64toaW
+wchar_t* xi64toaW(__int64 number, wchar_t *wstr, int width)
+{
+  wchar_t wtmp[128]=L"";
+  int a=0;
+  int b=0;
+
+  if (number == 0)
+  {
+    wstr[0]='0';
+    --width;
+    b=1;
+  }
+  else if (number < 0)
+  {
+    wstr[0]='-';
+    number=0 - number;
+    --width;
+    b=1;
+  }
+  for (wtmp[a]='\0'; number != 0; ++a)
+  {
+    wtmp[a]=(char)((number % 10) + '0');
+    number=number / 10;
+  }
+  for (; width > a; ++a) wtmp[a]='0';
+  for (--a; a >= 0; --a, ++b) wstr[b]=wtmp[a];
+
+  wstr[b]='\0';
+  return wstr;
+}
+#endif
+
+/********************************************************************
+ *
+ *  hex2dec
+ *
+ *Converts hex value to decimal.
+ *
+ *[in]  char *hex   -hex value
+ *
+ *Returns: integer
+ *         -1 wrong hex value
+ *
+ *Examples:
+ *  hex2dec("A1F") == 2591;
+ ********************************************************************/
+#if defined hex2dec || defined ALLCONVFUNC
+#define hex2dec_INCLUDED
+#undef hex2dec
+int hex2dec(char *hex)
+{
+  int a;
+  int b=0;
+
+  while (1)
+  {
+    a=*hex++;
+    if (a >= '0' && a <= '9') a-='0';
+    else if (a >= 'a' && a <= 'f') a-='a'-10;
+    else if (a >= 'A' && a <= 'F') a-='A'-10;
+    else return -1;
+
+    if (*hex) b=(b + a) * 16;
+    else return (b + a);
+  }
+}
+#endif
+
+/********************************************************************
+ *
+ *  hex2decW
+ *
+ *Converts unicode hex value to decimal.
+ *
+ *[in]  wchar_t *whex   -unicode hex value
+ *
+ *Returns: integer
+ *         -1 wrong hex value
+ *
+ *Examples:
+ *  hex2decW(L"A1F") == 2591;
+ ********************************************************************/
+#if defined hex2decW || defined ALLCONVFUNC
+#define hex2decW_INCLUDED
+#undef hex2decW
+int hex2decW(wchar_t *whex)
+{
+  int a;
+  int b=0;
+
+  while (1)
+  {
+    a=*whex++;
+    if (a >= '0' && a <= '9') a-='0';
+    else if (a >= 'a' && a <= 'f') a-='a'-10;
+    else if (a >= 'A' && a <= 'F') a-='A'-10;
+    else return -1;
+
+    if (*whex) b=(b + a) * 16;
+    else return (b + a);
+  }
+}
+#endif
+
+/********************************************************************
+ *
+ *  dec2hex   [API: wsprintf(szResult, "%02x", 2591)]
+ *
+ *Converts decimal to hex value.
+ *
+ *[in]   unsigned int dec   -positive integer
+ *[out]  char *hex          -hex value (output)
+ *[in]   BOOL lowercase     -if TRUE hexadecimal value in lowercase
+ *                           if FALSE in uppercase.
+ *[in]   unsigned int width -minimum number of characters to the output
+ *
+ *Examples:
+ *  dec2hex(2591, szResult, FALSE, 2);   //szResult == "A1F"
+ *  dec2hex(10, szResult, TRUE, 2);      //szResult == "0a"
+ ********************************************************************/
+#if defined dec2hex || defined ALLCONVFUNC
+#define dec2hex_INCLUDED
+#undef dec2hex
+void dec2hex(unsigned int dec, char *hex, BOOL lowercase, unsigned int width)
+{
+  unsigned int a=dec;
+  unsigned int b=0;
+  unsigned int c=0;
+  char d='1';
+  if (a == 0) d='0';
+
+  while (a)
+  {
+    b=a % 16;
+    a=a / 16;
+    if (b < 10) hex[c++]=b + '0';
+    else if (lowercase == TRUE) hex[c++]=b + 'a' - 10;
+    else hex[c++]=b + 'A' - 10;
+  }
+  while (width > c) hex[c++]='0';
+  hex[c]='\0';
+
+  if (d == '1')
+    for (b=0, --c; b < c; d=hex[b], hex[b++]=hex[c], hex[c--]=d);
+}
+#endif
+
+/********************************************************************
+ *
+ *  dec2hexW   [API: wsprintfW(wszResult, L"%02x", 2591)]
+ *
+ *Converts decimal to unicode hex value.
+ *
+ *[in]   unsigned int dec   -positive integer
+ *[out]  wchar_t *whex      -unicode hex value (output)
+ *[in]   BOOL lowercase     -if TRUE hexadecimal value in lowercase
+ *                           if FALSE in uppercase.
+ *[in]   unsigned int width -minimum number of characters to the output
+ *
+ *Examples:
+ *  dec2hexW(2591, wszResult, FALSE, 2);   //wszResult == L"A1F"
+ *  dec2hexW(10, wszResult, TRUE, 2);      //wszResult == L"0a"
+ ********************************************************************/
+#if defined dec2hexW || defined ALLCONVFUNC
+#define dec2hexW_INCLUDED
+#undef dec2hexW
+void dec2hexW(unsigned int dec, wchar_t *whex, BOOL lowercase, unsigned int width)
+{
+  unsigned int a=dec;
+  unsigned int b=0;
+  unsigned int c=0;
+  wchar_t d='1';
+  if (a == 0) d='0';
+
+  while (a)
+  {
+    b=a % 16;
+    a=a / 16;
+    if (b < 10) whex[c++]=b + '0';
+    else if (lowercase == TRUE) whex[c++]=b + 'a' - 10;
+    else whex[c++]=b + 'A' - 10;
+  }
+  while (width > c) whex[c++]='0';
+  whex[c]='\0';
+
+  if (d == '1')
+    for (b=0, --c; b < c; d=whex[b], whex[b++]=whex[c], whex[c--]=d);
+}
+#endif
+
+/********************************************************************
+ *
+ *  str2hex
+ *
+ *Converts string to hex values.
+ *
+ *[in]   unsigned char *str   -string
+ *[out]  char *hex            -hex string
+ *[in]   BOOL lowercase       -if TRUE hexadecimal value in lowercase
+ *                             if FALSE in uppercase.
+ *[in]   unsigned int bytes   -number of bytes in string
+ *
+ *Note:
+ *  str2hex uses dec2hex
+ *
+ *Examples:
+ *  str2hex((unsigned char *)"Some Text", szResult, TRUE, lstrlen("Some Text"));   //szResult == "536f6d652054657874"
+ ********************************************************************/
+#if defined str2hex || defined ALLCONVFUNCS
+#define str2hex_INCLUDED
+#undef str2hex
+void str2hex(unsigned char *str, char *hex, BOOL lowercase, unsigned int bytes)
+{
+  char a[16];
+  unsigned int b=0;
+
+  for (hex[0]='\0'; b < bytes; ++b)
+  {
+    //wsprintf(a, "%02x", (unsigned int)str[b]);
+    dec2hex((unsigned int)str[b], a, lowercase, 2);
+    lstrcat(hex, a);
+  }
+}
+#endif
+
+/********************************************************************
+ *
+ *  hex2str
+ *
+ *Converts hex values to string.
+ *
+ *[in]   char *hex   -hex string
+ *[out]  char *str   -string
+ *
+ *Examples:
+ *  hex2str("536f6d652054657874", szResult);   //szResult == "Some Text"
+ ********************************************************************/
+#if defined hex2str || defined ALLCONVFUNCS
+#define hex2str_INCLUDED
+#undef hex2str
+void hex2str(char *hex, char *str)
+{
+  char a[4];
+  int b;
+
+  while (*hex)
+  {
+    a[0]=*hex;
+    a[1]=*++hex;
+    a[2]='\0';
+
+    if (*hex++)
+    {
+      if ((b=hex2dec(a)) > 0) *str++=b;
+      else break;
+            }
+    else break;
+  }
+  *str='\0';
+}
+#endif
+
+
+/********************************************************************
+ *                                                                  *
+ *                           Example                                *
+ *                                                                  *
+ ********************************************************************
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <stdio.h>
+#include "ConvFunc.h"
+
+//insert functions
+#define xatoi
+#define xitoa
+#include "ConvFunc.h"
+
+void main()
+{
+  char szResult[MAX_PATH]="43";
+  char *pResult;
+  int nError;
+
+  nError=xatoi(szResult);
+  printf("nError={%d}\n", nError);
+
+  pResult=xitoa(45, szResult, 0);
+  printf("szResult={%s}, pResult={%s}\n", szResult, pResult);
+}
+
+*/
\ No newline at end of file
diff --git a/Support Files/nsProcess/README_JamulusChanges.txt b/Support Files/nsProcess/README_JamulusChanges.txt
new file mode 100644
index 0000000..7f37b65
--- /dev/null
+++ b/Support Files/nsProcess/README_JamulusChanges.txt	
@@ -0,0 +1,12 @@
+Since we do not want to use the binary of nsProcess (https://nsis.sourceforge.io/NsProcess_plugin),
+we compile the source code of the NSIS Plugin. Unfortunately it seems to be quite old. That's
+why I (@ann0see) updated it on 2020-02-06 to support compilation
+with Visual Studio 2019. Probably a lot more could be done to this.
+
+According to Anders from the NSIS forum:
+
+> The nsProcess plug-in also exists on the NSIS wiki and all files on this wiki are ZLib licensed unless otherwise noted.
+
+See: http://forums.winamp.com/showthread.php?t=230998&page=2
+
+And: http://forums.winamp.com/showpost.php?p=3200634&postcount=68
diff --git a/Support Files/nsProcess/Readme.txt b/Support Files/nsProcess/Readme.txt
new file mode 100644
index 0000000..099e645
--- /dev/null
+++ b/Support Files/nsProcess/Readme.txt	
@@ -0,0 +1,68 @@
+*****************************************************************
+***                nsProcess NSIS plugin v1.6                 ***
+*****************************************************************
+
+2006 Shengalts Aleksander aka Instructor (Shengalts@mail.ru)
+
+Source function FIND_PROC_BY_NAME based
+   upon the Ravi Kochhar (kochhar@physiology.wisc.edu) code
+Thanks iceman_k (FindProcDLL plugin) and
+   DITMan (KillProcDLL plugin) for direct me
+NSIS UNICODE compatible version (1.6) by brainsucker
+   (sorry, installer missing, i'm too lazy :)
+Move project files to vcxproj for Jamulus by ann0see <https://github.com/ann0see>
+
+Features:
+- Find a process by name
+- Kill all processes with specified name (not only one)
+- Close all processes with specified name (first tries to close all process windows,
+waits for 3 seconds for process to exit, terminates if still alive)
+- The process name is case-insensitive
+- Win95/98/ME/NT/2000/XP/Win7 support
+- Small plugin size (4 Kb)
+- NSIS UNICODE support (just rename nsProcessW.dll into nsProcess.dll)
+
+**** Find process ****
+${nsProcess::FindProcess} "[file.exe]" $var
+
+"[file.exe]"  - Process name (e.g. "notepad.exe")
+
+$var     0    Success
+         603  Process was not currently running
+         604  Unable to identify system type
+         605  Unsupported OS
+         606  Unable to load NTDLL.DLL
+         607  Unable to get procedure address from NTDLL.DLL
+         608  NtQuerySystemInformation failed
+         609  Unable to load KERNEL32.DLL
+         610  Unable to get procedure address from KERNEL32.DLL
+         611  CreateToolhelp32Snapshot failed
+
+
+**** Kill/Close process ****
+${nsProcess::KillProcess} "[file.exe]" $var
+${nsProcess::CloseProcess} "[file.exe]" $var
+
+"[file.exe]"  - Process name (e.g. "notepad.exe")
+
+$var     0    Success
+         601  No permission to terminate process
+         602  Not all processes terminated successfully
+         603  Process was not currently running
+         604  Unable to identify system type
+         605  Unsupported OS
+         606  Unable to load NTDLL.DLL
+         607  Unable to get procedure address from NTDLL.DLL
+         608  NtQuerySystemInformation failed
+         609  Unable to load KERNEL32.DLL
+         610  Unable to get procedure address from KERNEL32.DLL
+         611  CreateToolhelp32Snapshot failed
+
+**** Comment from brainsucker ****
+I'm actually not using macros in my code, plugin calls are easy:
+
+nsProcess:_CloseProcess "notepad.exe"
+Pop $R0
+
+**** Unload plugin ****
+${nsProcess::Unload}
diff --git a/Support Files/nsProcess/api.h b/Support Files/nsProcess/api.h
new file mode 100644
index 0000000..ed014b2
--- /dev/null
+++ b/Support Files/nsProcess/api.h	
@@ -0,0 +1,83 @@
+/*
+ * apih
+ * 
+ * This file is a part of NSIS.
+ * 
+ * Copyright (C) 1999-2008 Nullsoft and Contributors
+ * 
+ * Licensed under the zlib/libpng license (the "License");
+ * you may not use this file except in compliance with the License.
+ * 
+ * Licence details can be found in the file COPYING.
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty.
+ */
+
+#ifndef _NSIS_EXEHEAD_API_H_
+#define _NSIS_EXEHEAD_API_H_
+
+// Starting with NSIS 2.42, you can check the version of the plugin API in exec_flags->plugin_api_version
+// The format is 0xXXXXYYYY where X is the major version and Y is the minor version (MAKELONG(y,x))
+// When doing version checks, always remember to use >=, ex: if (pX->exec_flags->plugin_api_version >= NSISPIAPIVER_1_0) {}
+
+#define NSISPIAPIVER_1_0 0x00010000
+#define NSISPIAPIVER_CURR NSISPIAPIVER_1_0
+
+// NSIS Plug-In Callback Messages
+enum NSPIM 
+{
+	NSPIM_UNLOAD,    // This is the last message a plugin gets, do final cleanup
+	NSPIM_GUIUNLOAD, // Called after .onGUIEnd
+};
+
+// Prototype for callbacks registered with extra_parameters->RegisterPluginCallback()
+// Return NULL for unknown messages
+// Should always be __cdecl for future expansion possibilities
+typedef UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM);
+
+// extra_parameters data structures containing other interesting stuff
+// but the stack, variables and HWND passed on to plug-ins.
+typedef struct
+{
+  int autoclose;
+  int all_user_var;
+  int exec_error;
+  int abort;
+  int exec_reboot; // NSIS_SUPPORT_REBOOT
+  int reboot_called; // NSIS_SUPPORT_REBOOT
+  int XXX_cur_insttype; // depreacted
+  int plugin_api_version; // see NSISPIAPIVER_CURR
+                          // used to be XXX_insttype_changed
+  int silent; // NSIS_CONFIG_SILENT_SUPPORT
+  int instdir_error;
+  int rtl;
+  int errlvl;
+  int alter_reg_view;
+  int status_update;
+} exec_flags_t;
+
+#ifndef NSISCALL
+#  define NSISCALL __stdcall
+#endif
+
+typedef struct {
+  exec_flags_t *exec_flags;
+  int (NSISCALL *ExecuteCodeSegment)(int, HWND);
+  void (NSISCALL *validate_filename)(TCHAR *);
+  BOOL (NSISCALL *RegisterPluginCallback)(HMODULE, NSISPLUGINCALLBACK);
+} extra_parameters;
+
+// Definitions for page showing plug-ins
+// See Ui.c to understand better how they're used
+
+// sent to the outer window to tell it to go to the next inner window
+#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
+
+// custom pages should send this message to let NSIS know they're ready
+#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
+
+// sent as wParam with WM_NOTIFY_OUTER_NEXT when user cancels - heed its warning
+#define NOTIFY_BYE_BYE 'x'
+
+#endif /* _PLUGIN_H_ */
diff --git a/Support Files/nsProcess/build_nsprocess.ps1 b/Support Files/nsProcess/build_nsprocess.ps1
new file mode 100644
index 0000000..4d3a1cf
--- /dev/null
+++ b/Support Files/nsProcess/build_nsprocess.ps1	
@@ -0,0 +1,262 @@
+param (
+    [string] $BuildOption = ""
+)
+
+# Fail early on all errors
+$ErrorActionPreference = "Stop"
+
+# Invoke-WebRequest is really slow by default because it renders a progress bar.
+# Disabling this, improves vastly performance:
+$ProgressPreference = 'SilentlyContinue'
+
+# change directory to the directory above (if needed)
+Set-Location -Path "$PSScriptRoot\..\"
+
+# Global constants
+$RootPath = "$PWD"
+$BuildPath = "$RootPath\build"
+$DeployPath = "$RootPath\deploy"
+$WindowsPath ="$RootPath\windows"
+
+# Execute native command with errorlevel handling
+Function Invoke-Native-Command {
+    param(
+        [string] $Command,
+        [string[]] $Arguments
+    )
+
+    & "$Command" @Arguments
+
+    if ($LastExitCode -Ne 0)
+    {
+        Throw "Native command $Command returned with exit code $LastExitCode"
+    }
+}
+
+# Cleanup existing build folders
+Function Clean-Build-Environment
+{
+    if (Test-Path -Path $BuildPath) { Remove-Item -Path $BuildPath -Recurse -Force }
+    if (Test-Path -Path $DeployPath) { Remove-Item -Path $DeployPath -Recurse -Force }
+
+    New-Item -Path $BuildPath -ItemType Directory
+    New-Item -Path $DeployPath -ItemType Directory
+}
+
+# For sourceforge links we need to get the correct mirror (especially NISIS) Thanks: https://www.powershellmagazine.com/2013/01/29/pstip-retrieve-a-redirected-url/
+Function Get-RedirectedUrl {
+    param(
+        [Parameter(Mandatory=$true)]
+        [string] $url
+    )
+
+    $numAttempts = 10
+    $sleepTime = 10
+    $maxSleepTime = 80
+    for ($attempt = 1; $attempt -le $numAttempts; $attempt++) {
+        try {
+            $request = [System.Net.WebRequest]::Create($url)
+            $request.AllowAutoRedirect=$true
+            $response=$request.GetResponse()
+            $response.ResponseUri.AbsoluteUri
+            $response.Close()
+            return
+        } catch {
+            if ($attempt -lt $numAttempts) {
+                Write-Warning "Caught error: $_"
+                Write-Warning "Get-RedirectedUrl: Fetch attempt #${attempt}/${numAttempts} for $url failed, trying again in ${sleepTime}s"
+                Start-Sleep -Seconds $sleepTime
+                $sleepTime = [Math]::Min($sleepTime * 2, $maxSleepTime)
+                continue
+            }
+            Write-Error "Get-RedirectedUrl: All ${numAttempts} fetch attempts for $url failed, failing whole call"
+            throw
+        }
+    }
+}
+
+function Initialize-Module-Here ($m) { # see https://stackoverflow.com/a/51692402
+
+    # If module is imported say that and do nothing
+    if (Get-Module | Where-Object {$_.Name -eq $m}) {
+        Write-Output "Module $m is already imported."
+    }
+    else {
+
+        # If module is not imported, but available on disk then import
+        if (Get-Module -ListAvailable | Where-Object {$_.Name -eq $m}) {
+            Import-Module $m
+        }
+        else {
+
+            # If module is not imported, not available on disk, but is in online gallery then install and import
+            if (Find-Module -Name $m | Where-Object {$_.Name -eq $m}) {
+                Install-Module -Name $m -Force -Verbose -Scope CurrentUser
+                Import-Module $m
+            }
+            else {
+
+                # If module is not imported, not available and not in online gallery then abort
+                Write-Output "Module $m not imported, not available and not in online gallery, exiting."
+                EXIT 1
+            }
+        }
+    }
+}
+
+# Download and uncompress dependency in ZIP format
+Function Install-Dependency
+{
+    param(
+        [Parameter(Mandatory=$true)]
+        [string] $Uri,
+        [Parameter(Mandatory=$true)]
+        [string] $Name,
+        [Parameter(Mandatory=$true)]
+        [string] $Destination
+    )
+
+    if (Test-Path -Path "$WindowsPath\$Destination")
+    {
+        echo "Using ${WindowsPath}\${Destination} from previous run (e.g. actions/cache)"
+        return
+    }
+
+    $TempFileName = [System.IO.Path]::GetTempFileName() + ".zip"
+    $TempDir = [System.IO.Path]::GetTempPath()
+
+    if ($Uri -Match "downloads.sourceforge.net")
+    {
+      $Uri = Get-RedirectedUrl -URL $Uri
+    }
+
+    Invoke-WebRequest -Uri $Uri -OutFile $TempFileName
+    echo $TempFileName
+    Expand-Archive -Path $TempFileName -DestinationPath $TempDir -Force
+    echo $WindowsPath\$Destination
+    Move-Item -Path "$TempDir\$Name" -Destination "$WindowsPath\$Destination" -Force
+    Remove-Item -Path $TempFileName -Force
+}
+
+# Install VSSetup (Visual Studio detection), ASIO SDK and NSIS Installer
+Function Install-Dependencies
+{
+    if (-not (Get-PackageProvider -Name nuget).Name -eq "nuget") {
+      Install-PackageProvider -Name "Nuget" -Scope CurrentUser -Force
+    }
+    Initialize-Module-Here -m "VSSetup"
+}
+
+# Setup environment variables and build tool paths
+Function Initialize-Build-Environment
+{
+    param(
+        [Parameter(Mandatory=$true)]
+        [string] $BuildArch
+    )
+
+    # Look for Visual Studio/Build Tools 2017 or later (version 15.0 or above)
+    $VsInstallPath = Get-VSSetupInstance | `
+        Select-VSSetupInstance -Product "*" -Version "15.0" -Latest | `
+        Select-Object -ExpandProperty "InstallationPath"
+
+    if ($VsInstallPath -Eq "") { $VsInstallPath = "<N/A>" }
+
+    if ($BuildArch -Eq "x86_64")
+    {
+        $VcVarsBin = "$VsInstallPath\VC\Auxiliary\build\vcvars64.bat"
+    }
+    else
+    {
+        $VcVarsBin = "$VsInstallPath\VC\Auxiliary\build\vcvars32.bat"
+    }
+
+    ""
+    "**********************************************************************"
+    "Using Visual Studio/Build Tools environment settings located at"
+    $VcVarsBin
+    "**********************************************************************"
+    ""
+
+    if (-Not (Test-Path -Path $VcVarsBin))
+    {
+        Throw "Microsoft Visual Studio ($BuildArch variant) is not installed. " + `
+            "Please install Visual Studio 2017 or above it before running this script."
+    }
+
+    # Import environment variables set by vcvarsXX.bat into current scope
+    $EnvDump = [System.IO.Path]::GetTempFileName()
+    Invoke-Native-Command -Command "cmd" `
+        -Arguments ("/c", "`"$VcVarsBin`" && set > `"$EnvDump`"")
+
+    foreach ($_ in Get-Content -Path $EnvDump)
+    {
+        if ($_ -Match "^([^=]+)=(.*)$")
+        {
+            Set-Item "Env:$($Matches[1])" $Matches[2]
+        }
+    }
+
+    Remove-Item -Path $EnvDump -Force
+}
+
+
+
+# Build Windows installer
+Function Build-Installer
+{
+    param(
+        [string] $BuildOption
+    )
+
+    foreach ($_ in Get-Content -Path "$RootPath\$AppName.pro")
+    {
+        if ($_ -Match "^VERSION *= *(.*)$")
+        {
+            $AppVersion = $Matches[1]
+            break
+        }
+    }
+
+    if ($BuildOption -ne "")
+    {
+        Invoke-Native-Command -Command "$RootPath\libs\NSIS\NSIS-source\makensis" `
+            -Arguments ("/v4", "/DAPP_NAME=$AppName", "/DAPP_VERSION=$AppVersion", `
+            "/DROOT_PATH=$RootPath", "/DWINDOWS_PATH=$WindowsPath", "/DDEPLOY_PATH=$DeployPath", `
+            "/DBUILD_OPTION=$BuildOption", `
+            "$WindowsPath\installer.nsi")
+    }
+    else
+    {
+        Invoke-Native-Command -Command "$RootPath\libs\NSIS\NSIS-source\makensis" `
+            -Arguments ("/v4", "/DAPP_NAME=$AppName", "/DAPP_VERSION=$AppVersion", `
+            "/DROOT_PATH=$RootPath", "/DWINDOWS_PATH=$WindowsPath", "/DDEPLOY_PATH=$DeployPath", `
+            "$WindowsPath\installer.nsi")
+    }
+}
+
+# Build and copy NS-Process dll
+Function Build-NSProcess
+{
+    if (!(Test-Path -path "$RootPath\libs\NSIS\nsProcess.dll")) {
+
+        echo "Building nsProcess..."
+
+        $OriginalEnv = Get-ChildItem Env:
+        Initialize-Build-Environment -BuildArch "x86"
+
+        Invoke-Native-Command -Command "msbuild" `
+            -Arguments ("$RootPath\libs\NSIS\nsProcess\nsProcess.sln", '/p:Configuration="Release UNICODE"', `
+            "/p:Platform=Win32")
+
+        Move-Item -Path "$RootPath\libs\NSIS\nsProcess\Release\nsProcess.dll" -Destination "$RootPath\libs\NSIS\nsProcess.dll" -Force
+        Remove-Item -Path "$RootPath\libs\NSIS\nsProcess\Release\" -Force -Recurse
+        $OriginalEnv | % { Set-Item "Env:$($_.Name)" $_.Value }
+    }
+}
+
+Clean-Build-Environment
+Install-Dependencies
+
+Build-NSProcess
+
diff --git a/Support Files/nsProcess/nsProcess.c b/Support Files/nsProcess/nsProcess.c
new file mode 100644
index 0000000..b792db4
--- /dev/null
+++ b/Support Files/nsProcess/nsProcess.c	
@@ -0,0 +1,416 @@
+/*****************************************************************
+ *               nsProcess NSIS plugin v1.5                      *
+ *                                                               *
+ * 2006 Shengalts Aleksander aka Instructor (Shengalts@mail.ru)  *
+ *                                                               *
+ * Source function FIND_PROC_BY_NAME based                       *
+ *   upon the Ravi Kochhar (kochhar@physiology.wisc.edu) code    *
+ * Thanks iceman_k (FindProcDLL plugin) and                      *
+ *   DITMan (KillProcDLL plugin) for point me up                 *
+ *****************************************************************/
+
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <Tlhelp32.h>
+//#include "ConvFunc.h"
+#include "pluginapi.h"
+
+/* Defines */
+#define NSIS_MAX_STRLEN 1024
+
+#define SystemProcessInformation     5
+#define STATUS_SUCCESS               0x00000000L
+#define STATUS_INFO_LENGTH_MISMATCH  0xC0000004L
+
+typedef struct _SYSTEM_THREAD_INFO {
+  FILETIME ftCreationTime;
+  DWORD dwUnknown1;
+  DWORD dwStartAddress;
+  DWORD dwOwningPID;
+  DWORD dwThreadID;
+  DWORD dwCurrentPriority;
+  DWORD dwBasePriority;
+  DWORD dwContextSwitches;
+  DWORD dwThreadState;
+  DWORD dwUnknown2;
+  DWORD dwUnknown3;
+  DWORD dwUnknown4;
+  DWORD dwUnknown5;
+  DWORD dwUnknown6;
+  DWORD dwUnknown7;
+} SYSTEM_THREAD_INFO;
+
+typedef struct _SYSTEM_PROCESS_INFO {
+  DWORD dwOffset;
+  DWORD dwThreadCount;
+  DWORD dwUnkown1[6];
+  FILETIME ftCreationTime;
+  DWORD dwUnkown2;
+  DWORD dwUnkown3;
+  DWORD dwUnkown4;
+  DWORD dwUnkown5;
+  DWORD dwUnkown6;
+  WCHAR *pszProcessName;
+  DWORD dwBasePriority;
+  DWORD dwProcessID;
+  DWORD dwParentProcessID;
+  DWORD dwHandleCount;
+  DWORD dwUnkown7;
+  DWORD dwUnkown8;
+  DWORD dwVirtualBytesPeak;
+  DWORD dwVirtualBytes;
+  DWORD dwPageFaults;
+  DWORD dwWorkingSetPeak;
+  DWORD dwWorkingSet;
+  DWORD dwUnkown9;
+  DWORD dwPagedPool;
+  DWORD dwUnkown10;
+  DWORD dwNonPagedPool;
+  DWORD dwPageFileBytesPeak;
+  DWORD dwPageFileBytes;
+  DWORD dwPrivateBytes;
+  DWORD dwUnkown11;
+  DWORD dwUnkown12;
+  DWORD dwUnkown13;
+  DWORD dwUnkown14;
+  SYSTEM_THREAD_INFO ati[ANYSIZE_ARRAY];
+} SYSTEM_PROCESS_INFO;
+
+
+/* Include conversion functions */
+//#define xatoi
+//#define xitoa
+//#include "ConvFunc.h"
+
+/* Global variables */
+TCHAR szBuf[NSIS_MAX_STRLEN];
+
+/* Funtions prototypes and macros */
+int FIND_PROC_BY_NAME(TCHAR *szProcessName, BOOL bTerminate, BOOL bClose);
+
+/* NSIS functions code */
+void __declspec(dllexport) _FindProcess(HWND hwndParent, int string_size,
+                                      TCHAR *variables, stack_t **stacktop, extra_parameters *extra)
+{
+  EXDLL_INIT();
+  {
+    int nError;
+
+    popstringn(szBuf, NSIS_MAX_STRLEN);
+    nError=FIND_PROC_BY_NAME(szBuf, FALSE, FALSE);
+    pushint(nError);
+  }
+}
+
+void __declspec(dllexport) _KillProcess(HWND hwndParent, int string_size,
+                                      TCHAR *variables, stack_t **stacktop, extra_parameters *extra)
+{
+  EXDLL_INIT();
+  {
+    int nError=0;
+
+    popstringn(szBuf, NSIS_MAX_STRLEN);
+    nError=FIND_PROC_BY_NAME(szBuf, TRUE, FALSE);
+    pushint(nError);
+  }
+}
+
+void __declspec(dllexport) _CloseProcess(HWND hwndParent, int string_size,
+                                      TCHAR *variables, stack_t **stacktop, extra_parameters *extra)
+{
+  EXDLL_INIT();
+  {
+    int nError=0;
+
+    popstringn(szBuf, NSIS_MAX_STRLEN);
+    nError=FIND_PROC_BY_NAME(szBuf, TRUE, TRUE);
+    pushint(nError);
+  }
+}
+
+void __declspec(dllexport) _Unload(HWND hwndParent, int string_size,
+                                      TCHAR *variables, stack_t **stacktop, extra_parameters *extra)
+{
+}
+
+BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
+{
+  return TRUE;
+}
+
+BOOL CALLBACK EnumWindowsProc(          HWND hwnd,
+    LPARAM lParam
+)
+{
+	HANDLE *data = lParam;
+	DWORD pid;
+	GetWindowThreadProcessId(hwnd, &pid);
+	if (pid == data[0])
+	{
+		PostMessage(data[1], WM_CLOSE, 0, 0);
+		data[1] = hwnd;
+	}
+	return TRUE;
+}
+
+void NiceTerminate(DWORD id, BOOL bClose, BOOL *bSuccess, BOOL *bFailed)
+{
+  HANDLE hProc;
+  HANDLE data[2];
+  DWORD ec;
+  BOOL bDone = FALSE;
+  if (hProc=OpenProcess(PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, id))
+  {
+	data[0] = id;
+	data[1] = NULL;
+
+	if (bClose)
+		EnumWindows(EnumWindowsProc, data);
+	if (data[1] != NULL)
+	{	  
+	  if (GetExitCodeProcess(hProc,&ec) && ec == STILL_ACTIVE)
+		if (WaitForSingleObject(hProc, 3000) == WAIT_OBJECT_0)
+		{
+		  *bSuccess = bDone = TRUE;
+		}
+		else;
+	  else 
+	  {
+		  *bSuccess = bDone = TRUE;
+	  }
+	}
+	if (!bDone)
+	{
+            // Open for termination
+              if (TerminateProcess(hProc, 0))
+                *bSuccess=TRUE;
+              else
+                *bFailed=TRUE;
+	}
+    CloseHandle(hProc);
+  }
+}
+
+int FIND_PROC_BY_NAME(TCHAR *szProcessName, BOOL bTerminate, BOOL bClose)
+// Find the process "szProcessName" if it is currently running.
+// This works for Win95/98/ME and also WinNT/2000/XP.
+// The process name is case-insensitive, i.e. "notepad.exe" and "NOTEPAD.EXE"
+// will both work. If bTerminate is TRUE, then process will be terminated.
+//
+// Return codes are as follows:
+//   0   = Success
+//   601 = No permission to terminate process
+//   602 = Not all processes terminated successfully
+//   603 = Process was not currently running
+//   604 = Unable to identify system type
+//   605 = Unsupported OS
+//   606 = Unable to load NTDLL.DLL
+//   607 = Unable to get procedure address from NTDLL.DLL
+//   608 = NtQuerySystemInformation failed
+//   609 = Unable to load KERNEL32.DLL
+//   610 = Unable to get procedure address from KERNEL32.DLL
+//   611 = CreateToolhelp32Snapshot failed
+//
+// Change history:
+//   created  06/23/2000  - Ravi Kochhar (kochhar@physiology.wisc.edu)
+//                            http://www.neurophys.wisc.edu/ravi/software/
+//   modified 03/08/2002  - Ravi Kochhar (kochhar@physiology.wisc.edu)
+//                          - Borland-C compatible if BORLANDC is defined as
+//                            suggested by Bob Christensen
+//   modified 03/10/2002  - Ravi Kochhar (kochhar@physiology.wisc.edu)
+//                          - Removed memory leaks as suggested by
+//                            Jonathan Richard-Brochu (handles to Proc and Snapshot
+//                            were not getting closed properly in some cases)
+//   modified 14/11/2005  - Shengalts Aleksander aka Instructor (Shengalts@mail.ru):
+//                          - Combine functions FIND_PROC_BY_NAME and KILL_PROC_BY_NAME
+//                          - Code has been optimized
+//                          - Now kill all processes with specified name (not only one)
+//                          - Cosmetic improvements
+//                          - Removed error 632 (Invalid process name)
+//                          - Changed error 602 (Unable to terminate process for some other reason)
+//                          - BORLANDC define not needed
+//   modified 04/01/2006  - Shengalts Aleksander aka Instructor (Shengalts@mail.ru):
+//                          - Removed CRT dependency
+//   modified 21/04/2006  - Shengalts Aleksander aka Instructor (Shengalts@mail.ru):
+//                          - Removed memory leak as suggested by {_trueparuex^}
+//                            (handle to hSnapShot was not getting closed properly in some cases)
+//   modified 21/04/2006  - Shengalts Aleksander aka Instructor (Shengalts@mail.ru):
+//                          - Removed memory leak as suggested by {_trueparuex^}
+//                            (handle to hSnapShot was not getting closed properly in some cases)
+//   modified 19/07/2006  - Shengalts Aleksander aka Instructor (Shengalts@mail.ru):
+//                          - Code for WinNT/2000/XP has been rewritten
+//                          - Changed error codes
+//   modified 31/08/2006  - Shengalts Aleksander aka Instructor (Shengalts@mail.ru):
+//                          - Removed memory leak as suggested by Daniel Vanesse
+{
+  TCHAR szName[MAX_PATH];
+  OSVERSIONINFO osvi;
+  HMODULE hLib;
+  HANDLE hProc;
+  ULONG uError;
+  BOOL bFound=FALSE;
+  BOOL bSuccess=FALSE;
+  BOOL bFailed=FALSE;
+
+  // First check what version of Windows we're in
+  osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
+  if (!GetVersionEx(&osvi)) return 604;
+
+  if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT &&
+      osvi.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS)
+    return 605;
+
+  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)
+  {
+    // WinNT/2000/XP
+
+    SYSTEM_PROCESS_INFO *spi;
+    SYSTEM_PROCESS_INFO *spiCount;
+    DWORD dwSize=0x4000;
+    DWORD dwData;
+    ULONG (WINAPI *NtQuerySystemInformationPtr)(ULONG, PVOID, LONG, PULONG);
+
+    if (hLib=LoadLibraryW(L"NTDLL.DLL"))
+    {
+      NtQuerySystemInformationPtr=(ULONG(WINAPI *)(ULONG, PVOID, LONG, PULONG))GetProcAddress(hLib, "NtQuerySystemInformation");
+
+      if (NtQuerySystemInformationPtr)
+      {
+        while (1)
+        {
+          if (spi=LocalAlloc(LMEM_FIXED, dwSize))
+          {
+            uError=(*NtQuerySystemInformationPtr)(SystemProcessInformation, spi, dwSize, &dwData);
+
+            if (uError == STATUS_SUCCESS) break;
+
+            LocalFree(spi);
+
+            if (uError != STATUS_INFO_LENGTH_MISMATCH)
+            {
+              uError=608;
+              break;
+            }
+          }
+          else
+          {
+            uError=608;
+            break;
+          }
+          dwSize*=2;
+        }
+      }
+      else uError=607;
+
+      FreeLibrary(hLib);
+    }
+    else uError=606;
+
+    if (uError != STATUS_SUCCESS) return uError;
+
+    spiCount=spi;
+
+    while (1)
+    {
+      if (spiCount->pszProcessName)
+      {
+
+#ifdef UNICODE
+	    lstrcpyn(szName, spiCount->pszProcessName, MAX_PATH);
+#else
+	    WideCharToMultiByte(CP_ACP, 0, spiCount->pszProcessName, -1, szName, MAX_PATH, NULL, NULL);
+#endif		
+
+        if (!lstrcmpi(szName, szProcessName))
+        {
+          // Process found
+          bFound=TRUE;
+
+          if (bTerminate == TRUE)
+          {
+			  NiceTerminate(spiCount->dwProcessID, bClose, &bSuccess, &bFailed);
+          }
+          else break;
+        }
+      }
+      if (spiCount->dwOffset == 0) break;
+      spiCount=(SYSTEM_PROCESS_INFO *)((char *)spiCount + spiCount->dwOffset);
+    }
+    LocalFree(spi);
+  }
+  else
+  {
+    // Win95/98/ME
+
+    PROCESSENTRY32 pe;
+    char *pName;
+    HANDLE hSnapShot;
+    BOOL bResult;
+    HANDLE (WINAPI *CreateToolhelp32SnapshotPtr)(DWORD, DWORD);
+    BOOL (WINAPI *Process32FirstPtr)(HANDLE, LPPROCESSENTRY32);
+    BOOL (WINAPI *Process32NextPtr)(HANDLE, LPPROCESSENTRY32);
+
+    if (hLib=LoadLibraryA("KERNEL32.DLL"))
+    {
+      CreateToolhelp32SnapshotPtr=(HANDLE(WINAPI *)(DWORD, DWORD)) GetProcAddress(hLib, "CreateToolhelp32Snapshot");
+      Process32FirstPtr=(BOOL(WINAPI *)(HANDLE, LPPROCESSENTRY32)) GetProcAddress(hLib, "Process32First");
+      Process32NextPtr=(BOOL(WINAPI *)(HANDLE, LPPROCESSENTRY32)) GetProcAddress(hLib, "Process32Next");
+
+      if (CreateToolhelp32SnapshotPtr && Process32NextPtr && Process32FirstPtr)
+      {
+        // Get a handle to a Toolhelp snapshot of all the systems processes.
+        if ((hSnapShot=(*CreateToolhelp32SnapshotPtr)(TH32CS_SNAPPROCESS, 0)) != INVALID_HANDLE_VALUE)
+        {
+          // Get the first process' information.
+          pe.dwSize=sizeof(PROCESSENTRY32);
+          bResult=(*Process32FirstPtr)(hSnapShot, &pe);
+
+          // While there are processes, keep looping and checking.
+          while (bResult)
+          {
+            //Get file name
+            for (pName=pe.szExeFile + lstrlen(pe.szExeFile) - 1; *pName != '\\' && *pName != '\0'; --pName);
+
+			++pName;
+
+#ifdef UNICODE
+			MultiByteToWideChar(CP_ACP, 0, pName, lstrlenA(pName)+1, szName, MAX_PATH);
+#else
+			lstrcpyn(szName, pName, MAX_PATH);
+#endif		
+
+            if (!lstrcmpi(szName, szProcessName))
+            {
+              // Process found
+              bFound=TRUE;
+
+              if (bTerminate == TRUE)
+              {
+                // Open for termination
+				  NiceTerminate(pe.th32ProcessID, bClose, &bSuccess, &bFailed);
+              }
+              else break;
+            }
+            //Keep looking
+            bResult=(*Process32NextPtr)(hSnapShot, &pe);
+          }
+          CloseHandle(hSnapShot);
+        }
+        else uError=611;
+      }
+      else uError=610;
+
+      FreeLibrary(hLib);
+    }
+    else uError=609;
+  }
+
+  if (bFound == FALSE) return 603;
+  if (bTerminate == TRUE)
+  {
+    if (bSuccess == FALSE) return 601;
+    if (bFailed == TRUE) return 602;
+  }
+  return 0;
+}
diff --git a/Support Files/nsProcess/nsProcess.sln b/Support Files/nsProcess/nsProcess.sln
new file mode 100644
index 0000000..3e1f748
--- /dev/null
+++ b/Support Files/nsProcess/nsProcess.sln	
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30907.101
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsProcess", "nsProcess.vcxproj", "{BD73F235-28DE-40F5-B047-14222BC77FDC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release ANSI|Win32 = Release ANSI|Win32
+		Release UNICODE|Win32 = Release UNICODE|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BD73F235-28DE-40F5-B047-14222BC77FDC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD73F235-28DE-40F5-B047-14222BC77FDC}.Debug|Win32.Build.0 = Debug|Win32
+		{BD73F235-28DE-40F5-B047-14222BC77FDC}.Release ANSI|Win32.ActiveCfg = Release ANSI|Win32
+		{BD73F235-28DE-40F5-B047-14222BC77FDC}.Release ANSI|Win32.Build.0 = Release ANSI|Win32
+		{BD73F235-28DE-40F5-B047-14222BC77FDC}.Release UNICODE|Win32.ActiveCfg = Release UNICODE|Win32
+		{BD73F235-28DE-40F5-B047-14222BC77FDC}.Release UNICODE|Win32.Build.0 = Release UNICODE|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9188A750-3130-4D95-BFC9-C8FA7601EBAA}
+	EndGlobalSection
+EndGlobal
diff --git a/Support Files/nsProcess/nsProcess.vcxproj b/Support Files/nsProcess/nsProcess.vcxproj
new file mode 100644
index 0000000..e33f84b
--- /dev/null
+++ b/Support Files/nsProcess/nsProcess.vcxproj	
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release ANSI|Win32">
+      <Configuration>Release ANSI</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release UNICODE|Win32">
+      <Configuration>Release UNICODE</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BD73F235-28DE-40F5-B047-14222BC77FDC}</ProjectGuid>
+    <RootNamespace>nsProcess</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release ANSI|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release UNICODE|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release ANSI|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release UNICODE|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>16.0.30804.86</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\Debug\</OutDir>
+    <IntDir>.\Debug\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release UNICODE|Win32'">
+    <OutDir>.\Release\</OutDir>
+    <IntDir>.\Release\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release ANSI|Win32'">
+    <OutDir>$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/nsProcess.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;nsProcess_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/nsProcess.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>.\Debug/nsProcess.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/nsProcess.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <ImportLibrary>.\Debug/nsProcess.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/nsProcess.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release UNICODE|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/nsProcess.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;nsProcess_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling />
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/nsProcess.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>Release\nsProcess.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <ProgramDatabaseFile>.\Release/nsProcess.pdb</ProgramDatabaseFile>
+      <EntryPointSymbol>DllMain</EntryPointSymbol>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <ImportLibrary>.\Release/nsProcess.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/nsProcess.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release ANSI|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/nsProcess.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;nsProcess_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling />
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/nsProcess.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>nsProcess.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <ProgramDatabaseFile>.\Release/nsProcess.pdb</ProgramDatabaseFile>
+      <EntryPointSymbol>DllMain</EntryPointSymbol>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <ImportLibrary>.\Release/nsProcess.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/nsProcess.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="nsProcess.c" />
+    <ClCompile Include="pluginapi.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="api.h" />
+    <ClInclude Include="nsis_tchar.h" />
+    <ClInclude Include="pluginapi.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Support Files/nsProcess/nsProcess.vcxproj.filters b/Support Files/nsProcess/nsProcess.vcxproj.filters
new file mode 100644
index 0000000..4ece389
--- /dev/null
+++ b/Support Files/nsProcess/nsProcess.vcxproj.filters	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d172976c-738c-43be-8ef9-85cf7b612e55}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{a180c8d9-d81d-4f9e-9a43-1062a49fc171}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{1c8718c3-49cd-4da0-a847-7c19d0891023}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="nsProcess.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pluginapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="nsis_tchar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pluginapi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Support Files/nsProcess/nsis_tchar.h b/Support Files/nsProcess/nsis_tchar.h
new file mode 100644
index 0000000..92025cc
--- /dev/null
+++ b/Support Files/nsProcess/nsis_tchar.h	
@@ -0,0 +1,214 @@
+/*
+ * nsis_tchar.h
+ * 
+ * This file is a part of NSIS.
+ * 
+ * Copyright (C) 1999-2007 Nullsoft and Contributors
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty.
+ *
+ * For Unicode support by Jim Park -- 08/30/2007
+ */
+
+// Jim Park: Only those we use are listed here.
+
+#pragma once
+
+#ifdef _UNICODE
+
+#ifndef _T
+#define __T(x)   L ## x
+#define _T(x)    __T(x)
+#define _TEXT(x) __T(x)
+#endif
+typedef wchar_t TCHAR;
+typedef wchar_t _TUCHAR;
+
+// program
+#define _tmain      wmain
+#define _tWinMain   wWinMain
+#define _tenviron   _wenviron
+#define __targv     __wargv
+
+// printfs
+#define _ftprintf   fwprintf
+#define _sntprintf  _snwprintf
+#define _stprintf   _swprintf
+#define _tprintf    wprintf
+#define _vftprintf  vfwprintf
+#define _vsntprintf _vsnwprintf
+#define _vstprintf  _vswprintf
+
+// scanfs
+#define _tscanf     wscanf
+#define _stscanf    swscanf
+
+// string manipulations
+#define _tcscat     wcscat
+#define _tcschr     wcschr
+#define _tcsclen    wcslen
+#define _tcscpy     wcscpy
+#define _tcsdup     _wcsdup
+#define _tcslen     wcslen
+#define _tcsnccpy   wcsncpy
+#define _tcsncpy    wcsncpy
+#define _tcsrchr    wcsrchr
+#define _tcsstr     wcsstr
+#define _tcstok     wcstok
+
+// string comparisons
+#define _tcscmp     wcscmp
+#define _tcsicmp    _wcsicmp
+#define _tcsncicmp  _wcsnicmp
+#define _tcsncmp    wcsncmp
+#define _tcsnicmp   _wcsnicmp
+
+// upper / lower
+#define _tcslwr     _wcslwr
+#define _tcsupr     _wcsupr
+#define _totlower   towlower
+#define _totupper   towupper
+
+// conversions to numbers
+#define _tcstoi64   _wcstoi64
+#define _tcstol     wcstol
+#define _tcstoul    wcstoul
+#define _tstof      _wtof
+#define _tstoi      _wtoi
+#define _tstoi64    _wtoi64
+#define _ttoi       _wtoi
+#define _ttoi64     _wtoi64
+#define _ttol       _wtol
+
+// conversion from numbers to strings
+#define _itot       _itow
+#define _ltot       _ltow
+#define _i64tot     _i64tow
+#define _ui64tot    _ui64tow
+
+// file manipulations
+#define _tfopen     _wfopen
+#define _topen      _wopen
+#define _tremove    _wremove
+#define _tunlink    _wunlink
+
+// reading and writing to i/o
+#define _fgettc     fgetwc
+#define _fgetts     fgetws
+#define _fputts     fputws
+#define _gettchar   getwchar
+
+// directory
+#define _tchdir     _wchdir
+
+// environment
+#define _tgetenv    _wgetenv
+#define _tsystem    _wsystem
+
+// time
+#define _tcsftime   wcsftime
+
+#else // ANSI
+
+#ifndef _T
+#define _T(x)    x
+#define _TEXT(x) x
+#endif
+typedef char            TCHAR;
+typedef unsigned char   _TUCHAR;
+
+// program
+#define _tmain      main
+#define _tWinMain   WinMain
+#define _tenviron   environ
+#define __targv     __argv
+
+// printfs
+#define _ftprintf   fprintf
+#define _sntprintf  _snprintf
+#define _stprintf   sprintf
+#define _tprintf    printf
+#define _vftprintf  vfprintf
+#define _vsntprintf _vsnprintf
+#define _vstprintf  vsprintf
+
+// scanfs
+#define _tscanf     scanf
+#define _stscanf    sscanf
+
+// string manipulations
+#define _tcscat     strcat
+#define _tcschr     strchr
+#define _tcsclen    strlen
+#define _tcscnlen   strnlen
+#define _tcscpy     strcpy
+#define _tcsdup     _strdup
+#define _tcslen     strlen
+#define _tcsnccpy   strncpy
+#define _tcsrchr    strrchr
+#define _tcsstr     strstr
+#define _tcstok     strtok
+
+// string comparisons
+#define _tcscmp     strcmp
+#define _tcsicmp    _stricmp
+#define _tcsncmp    strncmp
+#define _tcsncicmp  _strnicmp
+#define _tcsnicmp   _strnicmp
+
+// upper / lower
+#define _tcslwr     _strlwr
+#define _tcsupr     _strupr
+
+#define _totupper   toupper
+#define _totlower   tolower
+
+// conversions to numbers
+#define _tcstol     strtol
+#define _tcstoul    strtoul
+#define _tstof      atof
+#define _tstoi      atoi
+#define _tstoi64    _atoi64
+#define _tstoi64    _atoi64
+#define _ttoi       atoi
+#define _ttoi64     _atoi64
+#define _ttol       atol
+
+// conversion from numbers to strings
+#define _i64tot     _i64toa
+#define _itot       _itoa
+#define _ltot       _ltoa
+#define _ui64tot    _ui64toa
+
+// file manipulations
+#define _tfopen     fopen
+#define _topen      _open
+#define _tremove    remove
+#define _tunlink    _unlink
+
+// reading and writing to i/o
+#define _fgettc     fgetc
+#define _fgetts     fgets
+#define _fputts     fputs
+#define _gettchar   getchar
+
+// directory
+#define _tchdir     _chdir
+
+// environment
+#define _tgetenv    getenv
+#define _tsystem    system
+
+// time
+#define _tcsftime   strftime
+
+#endif
+
+// is functions (the same in Unicode / ANSI)
+#define _istgraph   isgraph
+#define _istascii   __isascii
+
+#define __TFILE__ _T(__FILE__)
+#define __TDATE__ _T(__DATE__)
+#define __TTIME__ _T(__TIME__)
diff --git a/Support Files/nsProcess/pluginapi.c b/Support Files/nsProcess/pluginapi.c
new file mode 100644
index 0000000..a6562fa
--- /dev/null
+++ b/Support Files/nsProcess/pluginapi.c	
@@ -0,0 +1,290 @@
+#include <windows.h>
+
+#include "pluginapi.h"
+
+unsigned int g_stringsize;
+stack_t **g_stacktop;
+TCHAR *g_variables;
+
+// utility functions (not required but often useful)
+
+int NSISCALL popstring(TCHAR *str)
+{
+  stack_t *th;
+  if (!g_stacktop || !*g_stacktop) return 1;
+  th=(*g_stacktop);
+  lstrcpy(str,th->text);
+  *g_stacktop = th->next;
+  GlobalFree((HGLOBAL)th);
+  return 0;
+}
+
+int NSISCALL popstringn(TCHAR *str, int maxlen)
+{
+  stack_t *th;
+  if (!g_stacktop || !*g_stacktop) return 1;
+  th=(*g_stacktop);
+  if (str) lstrcpyn(str,th->text,maxlen?maxlen:g_stringsize);
+  *g_stacktop = th->next;
+  GlobalFree((HGLOBAL)th);
+  return 0;
+}
+
+void NSISCALL pushstring(const TCHAR *str)
+{
+  stack_t *th;
+  if (!g_stacktop) return;
+  th=(stack_t*)GlobalAlloc(GPTR,(sizeof(stack_t)+(g_stringsize)*sizeof(TCHAR)));
+  lstrcpyn(th->text,str,g_stringsize);
+  th->next=*g_stacktop;
+  *g_stacktop=th;
+}
+
+TCHAR * NSISCALL getuservariable(const int varnum)
+{
+  if (varnum < 0 || varnum >= __INST_LAST) return NULL;
+  return g_variables+varnum*g_stringsize;
+}
+
+void NSISCALL setuservariable(const int varnum, const TCHAR *var)
+{
+	if (var != NULL && varnum >= 0 && varnum < __INST_LAST) 
+		lstrcpy(g_variables + varnum*g_stringsize, var);
+}
+
+#ifdef _UNICODE
+int NSISCALL PopStringA(char* ansiStr)
+{
+   wchar_t* wideStr = (wchar_t*) GlobalAlloc(GPTR, g_stringsize*sizeof(wchar_t));
+   int rval = popstring(wideStr);
+   WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, g_stringsize, NULL, NULL);
+   GlobalFree((HGLOBAL)wideStr);
+   return rval;
+}
+
+int NSISCALL PopStringNA(char* ansiStr, int maxlen)
+{
+   int realLen = maxlen ? maxlen : g_stringsize;
+   wchar_t* wideStr = (wchar_t*) GlobalAlloc(GPTR, realLen*sizeof(wchar_t));
+   int rval = popstringn(wideStr, realLen);
+   WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, realLen, NULL, NULL);
+   GlobalFree((HGLOBAL)wideStr);
+   return rval;
+}
+
+void NSISCALL PushStringA(const char* ansiStr)
+{
+   wchar_t* wideStr = (wchar_t*) GlobalAlloc(GPTR, g_stringsize*sizeof(wchar_t));
+   MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, g_stringsize);
+   pushstring(wideStr);
+   GlobalFree((HGLOBAL)wideStr);
+   return;
+}
+
+void NSISCALL GetUserVariableW(const int varnum, wchar_t* wideStr)
+{
+   lstrcpyW(wideStr, getuservariable(varnum));
+}
+
+void NSISCALL GetUserVariableA(const int varnum, char* ansiStr)
+{
+   wchar_t* wideStr = getuservariable(varnum);
+   WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, g_stringsize, NULL, NULL);
+}
+
+void NSISCALL SetUserVariableA(const int varnum, const char* ansiStr)
+{
+   if (ansiStr != NULL && varnum >= 0 && varnum < __INST_LAST)
+   {
+      wchar_t* wideStr = g_variables + varnum * g_stringsize;
+      MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, g_stringsize);
+   }
+}
+
+#else
+// ANSI defs
+int NSISCALL PopStringW(wchar_t* wideStr)
+{
+   char* ansiStr = (char*) GlobalAlloc(GPTR, g_stringsize);
+   int rval = popstring(ansiStr);
+   MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, g_stringsize);
+   GlobalFree((HGLOBAL)ansiStr);
+   return rval;
+}
+
+int NSISCALL PopStringNW(wchar_t* wideStr, int maxlen)
+{
+   int realLen = maxlen ? maxlen : g_stringsize;
+   char* ansiStr = (char*) GlobalAlloc(GPTR, realLen);
+   int rval = popstringn(ansiStr, realLen);
+   MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, realLen);
+   GlobalFree((HGLOBAL)ansiStr);
+   return rval;
+}
+
+void NSISCALL PushStringW(wchar_t* wideStr)
+{
+   char* ansiStr = (char*) GlobalAlloc(GPTR, g_stringsize);
+   WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, g_stringsize, NULL, NULL);
+   pushstring(ansiStr);
+   GlobalFree((HGLOBAL)ansiStr);
+}
+
+void NSISCALL GetUserVariableW(const int varnum, wchar_t* wideStr)
+{
+   char* ansiStr = getuservariable(varnum);
+   MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, g_stringsize);
+}
+
+void NSISCALL GetUserVariableA(const int varnum, char* ansiStr)
+{
+   lstrcpyA(ansiStr, getuservariable(varnum));
+}
+
+void NSISCALL SetUserVariableW(const int varnum, const wchar_t* wideStr)
+{
+   if (wideStr != NULL && varnum >= 0 && varnum < __INST_LAST)
+   {
+      char* ansiStr = g_variables + varnum * g_stringsize;
+      WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, g_stringsize, NULL, NULL);
+   }
+}
+#endif
+
+// playing with integers
+
+int NSISCALL myatoi(const TCHAR *s)
+{
+  int v=0;
+  if (*s == _T('0') && (s[1] == _T('x') || s[1] == _T('X')))
+  {
+    s++;
+    for (;;)
+    {
+      int c=*(++s);
+      if (c >= _T('0') && c <= _T('9')) c-=_T('0');
+      else if (c >= _T('a') && c <= _T('f')) c-=_T('a')-10;
+      else if (c >= _T('A') && c <= _T('F')) c-=_T('A')-10;
+      else break;
+      v<<=4;
+      v+=c;
+    }
+  }
+  else if (*s == _T('0') && s[1] <= _T('7') && s[1] >= _T('0'))
+  {
+    for (;;)
+    {
+      int c=*(++s);
+      if (c >= _T('0') && c <= _T('7')) c-=_T('0');
+      else break;
+      v<<=3;
+      v+=c;
+    }
+  }
+  else
+  {
+    int sign=0;
+    if (*s == _T('-')) sign++; else s--;
+    for (;;)
+    {
+      int c=*(++s) - _T('0');
+      if (c < 0 || c > 9) break;
+      v*=10;
+      v+=c;
+    }
+    if (sign) v = -v;
+  }
+
+  return v;
+}
+
+unsigned NSISCALL myatou(const TCHAR *s)
+{
+  unsigned int v=0;
+
+  for (;;)
+  {
+    unsigned int c=*s++;
+    if (c >= _T('0') && c <= _T('9')) c-=_T('0');
+    else break;
+    v*=10;
+    v+=c;
+  }
+  return v;
+}
+
+int NSISCALL myatoi_or(const TCHAR *s)
+{
+  int v=0;
+  if (*s == _T('0') && (s[1] == _T('x') || s[1] == _T('X')))
+  {
+    s++;
+    for (;;)
+    {
+      int c=*(++s);
+      if (c >= _T('0') && c <= _T('9')) c-=_T('0');
+      else if (c >= _T('a') && c <= _T('f')) c-=_T('a')-10;
+      else if (c >= _T('A') && c <= _T('F')) c-=_T('A')-10;
+      else break;
+      v<<=4;
+      v+=c;
+    }
+  }
+  else if (*s == _T('0') && s[1] <= _T('7') && s[1] >= _T('0'))
+  {
+    for (;;)
+    {
+      int c=*(++s);
+      if (c >= _T('0') && c <= _T('7')) c-=_T('0');
+      else break;
+      v<<=3;
+      v+=c;
+    }
+  }
+  else
+  {
+    int sign=0;
+    if (*s == _T('-')) sign++; else s--;
+    for (;;)
+    {
+      int c=*(++s) - _T('0');
+      if (c < 0 || c > 9) break;
+      v*=10;
+      v+=c;
+    }
+    if (sign) v = -v;
+  }
+
+  // Support for simple ORed expressions
+  if (*s == _T('|')) 
+  {
+      v |= myatoi_or(s+1);
+  }
+
+  return v;
+}
+
+int NSISCALL popint()
+{
+  TCHAR buf[128];
+  if (popstringn(buf,sizeof(buf)/sizeof(TCHAR)))
+    return 0;
+
+  return myatoi(buf);
+}
+
+int NSISCALL popint_or()
+{
+  TCHAR buf[128];
+  if (popstringn(buf,sizeof(buf)/sizeof(TCHAR)))
+    return 0;
+
+  return myatoi_or(buf);
+}
+
+void NSISCALL pushint(int value)
+{
+	TCHAR buffer[1024];
+	wsprintf(buffer, _T("%d"), value);
+	pushstring(buffer);
+}
diff --git a/Support Files/nsProcess/pluginapi.h b/Support Files/nsProcess/pluginapi.h
new file mode 100644
index 0000000..b9bfee9
--- /dev/null
+++ b/Support Files/nsProcess/pluginapi.h	
@@ -0,0 +1,101 @@
+#ifndef ___NSIS_PLUGIN__H___
+#define ___NSIS_PLUGIN__H___
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "api.h"
+#include "nsis_tchar.h"
+
+#ifndef NSISCALL
+#  define NSISCALL __stdcall
+#endif
+
+#define EXDLL_INIT()           {  \
+        g_stringsize=string_size; \
+        g_stacktop=stacktop;      \
+        g_variables=variables; }
+
+typedef struct _stack_t {
+  struct _stack_t *next;
+  TCHAR text[1]; // this should be the length of string_size
+} stack_t;
+
+enum
+{
+INST_0,         // $0
+INST_1,         // $1
+INST_2,         // $2
+INST_3,         // $3
+INST_4,         // $4
+INST_5,         // $5
+INST_6,         // $6
+INST_7,         // $7
+INST_8,         // $8
+INST_9,         // $9
+INST_R0,        // $R0
+INST_R1,        // $R1
+INST_R2,        // $R2
+INST_R3,        // $R3
+INST_R4,        // $R4
+INST_R5,        // $R5
+INST_R6,        // $R6
+INST_R7,        // $R7
+INST_R8,        // $R8
+INST_R9,        // $R9
+INST_CMDLINE,   // $CMDLINE
+INST_INSTDIR,   // $INSTDIR
+INST_OUTDIR,    // $OUTDIR
+INST_EXEDIR,    // $EXEDIR
+INST_LANG,      // $LANGUAGE
+__INST_LAST
+};
+
+extern unsigned int g_stringsize;
+extern stack_t **g_stacktop;
+extern TCHAR *g_variables;
+
+int NSISCALL popstring(TCHAR *str); // 0 on success, 1 on empty stack
+int NSISCALL popstringn(TCHAR *str, int maxlen); // with length limit, pass 0 for g_stringsize
+int NSISCALL popint(); // pops an integer
+int NSISCALL popint_or(); // with support for or'ing (2|4|8)
+int NSISCALL myatoi(const TCHAR *s); // converts a string to an integer
+unsigned NSISCALL myatou(const TCHAR *s); // converts a string to an unsigned integer, decimal only
+int NSISCALL myatoi_or(const TCHAR *s); // with support for or'ing (2|4|8)
+void NSISCALL pushstring(const TCHAR *str);
+void NSISCALL pushint(int value);
+TCHAR * NSISCALL getuservariable(const int varnum);
+void NSISCALL setuservariable(const int varnum, const TCHAR *var);
+
+#ifdef _UNICODE
+#define PopStringW(x) popstring(x)
+#define PushStringW(x) pushstring(x)
+#define SetUserVariableW(x,y) setuservariable(x,y)
+
+int  NSISCALL PopStringA(char* ansiStr);
+void NSISCALL PushStringA(const char* ansiStr);
+void NSISCALL GetUserVariableW(const int varnum, wchar_t* wideStr);
+void NSISCALL GetUserVariableA(const int varnum, char* ansiStr);
+void NSISCALL SetUserVariableA(const int varnum, const char* ansiStr);
+
+#else
+// ANSI defs
+
+#define PopStringA(x) popstring(x)
+#define PushStringA(x) pushstring(x)
+#define SetUserVariableA(x,y) setuservariable(x,y)
+
+int  NSISCALL PopStringW(wchar_t* wideStr);
+void NSISCALL PushStringW(wchar_t* wideStr);
+void NSISCALL GetUserVariableW(const int varnum, wchar_t* wideStr);
+void NSISCALL GetUserVariableA(const int varnum, char* ansiStr);
+void NSISCALL SetUserVariableW(const int varnum, const wchar_t* wideStr);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif//!___NSIS_PLUGIN__H___
diff --git a/nsis/helpers/FindProcess.nsh b/nsis/helpers/FindProcess.nsh
deleted file mode 100644
index d3e1e58..0000000
--- a/nsis/helpers/FindProcess.nsh
+++ /dev/null
@@ -1,122 +0,0 @@
-/*  FindProcess.nsh
-*   https://nsis.sourceforge.io/FindProcess
-*   written by Donald Miller
-*   Mar 7, 2007
-*
-*/
-
-!include LogicLib.nsh
-!include WordFunc.nsh
-!insertmacro WordFind
-
-!ifndef FindProcess
-!define FindProcess         '!insertmacro FindProcess'
-
-!macro FindProcess ProcessList BoolReturn
-    Push '${ProcessList}'
-    Call FindProcess
-    Pop ${BoolReturn}
-!macroend
-
-Function FindProcess
-  # return True if any process in ProcessList is active
-  Exch $0     ; get ProcessList, save $0
-  Push $1
-  Push $2
-  Push $R0
-  Push $R1
-  Push $R2
-
-  StrCpy $2 "$0,"                 ; $2 = ProcessList
-
-  Push 0                          ; set return value = False
-
-  # method based upon one by Phoenix1701@gmail.com  1/27/07
-
-  System::Alloc 1024
-  Pop $R0                         ; process list buffer
-
-  # get an array of all process ids
-  System::Call "Psapi::EnumProcesses(i R0, i 1024, *i .R1)i .r0"
-  ${Unless} $0 = 0
-
-      IntOp $R1 $R1 / 4           ; Divide by sizeof(DWORD) to get $R1 process count
-      IntOp $R1 $R1 - 1           ; decr for 0 base loop
-
-      ClearErrors
-      ${For} $R2 0 $R1
-          # get a PID from the array
-          IntOp $0 $R2 << 2
-          IntOp $0 $0 + $R0           ; buffer.dword[i]
-          System::Call "*$0(i .r0)"   ; Get next PID
-
-          ${Unless} $0 = 0
-              Push $0
-              Call GetProcessName
-              Pop $1
-
-              # is this process one we are looking for?
-              ${WordFind} '$2' ',' 'E/$1' $0
-              ${Unless} ${Errors}
-                  # yes, change return value
-                  Pop $0          ; discard old result
-                  Push 1          ; set return True
-
-                  # exit the loop
-                  ${Break}
-              ${EndUnless}
-          ${EndUnless}
-      ${Next}
-
-  ${EndUnless}
-
-  System::Free $R0
-
-  Pop $0              ; get return value
-  Pop $R2             ; restore registers
-  Pop $R1
-  Pop $R0
-  Pop $2
-  Pop $1
-  Exch $0
-FunctionEnd
-
-Function GetProcessName
-  # ( Pid -- ProcessName )
-  Exch $2                     ; get Pid, save $2
-  Push $0
-  Push $1
-  Push $3
-  Push $R0
-
-  System::Call "Kernel32::OpenProcess(i 1040, i 0, i r2)i .r3"
-
-  StrCpy $2 "<unknown>"       ; set return value
-
-  ${Unless} $3 = 0            ; $3 is hProcess
-      # get hMod array
-      System::Alloc 1024
-      Pop $R0
-
-      # params: Pid, &hMod, sizeof(hMod), &cb
-      System::Call "Psapi::EnumProcessModules(i r3, i R0, i 1024, *i .r1)i .r0"
-
-      ${Unless} $0 = 0
-          # get first hMod
-          System::Call "*$R0(i .r0)"
-
-          # get BaseName; params: Pid, hMod, szBuffer, sizeof(szBuffer)
-          System::Call "Psapi::GetModuleBaseName(i r3, i r0, t .r2, i 256)i .r0"
-      ${EndUnless}
-
-      System::Free $R0
-      System::Call "kernel32::CloseHandle(i r3)"
-  ${EndUnless}
-
-  Pop $R0                     ; restore registers
-  Pop $3
-  Pop $1
-  Pop $0
-  Exch $2                     ; save process name
-FunctionEnd
-!endif
diff --git a/nsis/jellyfin.nsi b/nsis/jellyfin.nsi
index 0e978df..50d2850 100644
--- a/nsis/jellyfin.nsi
+++ b/nsis/jellyfin.nsi
@@ -7,19 +7,13 @@ Unicode True
 !define SF_USELECTED  0 ; used to check selected options status, rest are inherited from Sections.nsh
 !define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\JellyfinServer" ;Registry to show up in Add/Remove Programs
 !define INSTDIR_REG_ROOT "HKLM" ;Define root hive to use
+!define INSTALL_DIRECTORY "$PROGRAMFILES64\Jellyfin\Server"
 
 !include "MUI2.nsh"
 !include "Sections.nsh"
 !include "LogicLib.nsh"
 !addplugindir "plugins"
-;!include "helpers\UnInst.nsh" TODO TAKE OUT THESE TWO INCLUDES
-;!include "helpers\nsProcess.nsh"
-!include "helpers\FindProcess.nsh"
-
-
-;Define uninstall list name (optimal) TODO TAKE OUT THESE TWO  LINES
-;!define UninstName "Uninstall"
-
+!include "helpers\nsProcess.nsh"
 !include "helpers\ShowError.nsh"
 
 ; Global variables that we'll use
@@ -33,23 +27,8 @@ Unicode True
     Var _EXISTINGSERVICE_
     Var _MAKESHORTCUTS_
     Var _FOLDEREXISTS_
-;
 
-!ifdef x64
-    !define ARCH "x64"
-    !define NAMESUFFIX "(64 bit)"
-    !define INSTALL_DIRECTORY "$PROGRAMFILES64\Jellyfin\Server"
-!endif
 
-!ifdef x84
-    !define ARCH "x86"
-    !define NAMESUFFIX "(32 bit)"
-    !define INSTALL_DIRECTORY "$PROGRAMFILES32\Jellyfin\Server"
-!endif
-
-!ifndef ARCH
-    !error "Set the Arch with /Dx86 or /Dx64"
-!endif
 
 ;--------------------------------
 
@@ -58,8 +37,8 @@ Unicode True
 
 !getdllversion "$%InstallLocation%\jellyfin.dll" ver_ ;Align installer version with jellyfin.dll version
 
-Name "Jellyfin Server ${ver_1}.${ver_2}.${ver_3} ${NAMESUFFIX}" ; This is referred in various header text labels
-OutFile "jellyfin_${ver_1}.${ver_2}.${ver_3}_windows-${ARCH}.exe" ; Naming convention jellyfin_{version}_windows-{arch].exe
+Name "Jellyfin Server ${ver_1}.${ver_2}.${ver_3}" ; This is referred in various header text labels
+OutFile "jellyfin_${ver_1}.${ver_2}.${ver_3}_windows-x64.exe" ; Naming convention jellyfin_{version}_windows-x64.exe
 BrandingText "Jellyfin Server ${ver_1}.${ver_2}.${ver_3} Installer" ; This shows in just over the buttons
 
 ; installer attributes, these show up in details tab on installer properties
@@ -113,14 +92,14 @@ CRCCheck on ; make sure the installer wasn't corrupted while downloading
 ; Install folder page
     !define MUI_PAGE_CUSTOMFUNCTION_PRE HideInstallDirectoryPage ; Controls when to hide / show
     !define MUI_DIRECTORYPAGE_TEXT_DESTINATION "Install folder" ; shows just above the folder selection dialog
-    !define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install Jellyfin in the following folder.$\nTo install in a different folder, click Browse and select another folder."
+    !define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install Jellyfin in the following folder."
     !insertmacro MUI_PAGE_DIRECTORY
 
 ; Data folder Page
     !define MUI_PAGE_CUSTOMFUNCTION_PRE HideDataDirectoryPage ; Controls when to hide / show
     !define MUI_PAGE_HEADER_TEXT "Choose Data Location"
     !define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which to install the Jellyfin Server data."
-    !define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will set the following folder for Jellyfin Server data. To install in a different folder, click Browse and select another folder.$\nPlease make sure the folder exists and is accessible.$\nDo not choose the server install folder."
+    !define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will set the following folder for Jellyfin Server data.$\nDo not choose the server install folder."
     !define MUI_DIRECTORYPAGE_TEXT_DESTINATION "Data folder"
     !define MUI_DIRECTORYPAGE_VARIABLE $_JELLYFINDATADIR_
     !insertmacro MUI_PAGE_DIRECTORY
@@ -204,7 +183,7 @@ Section "!Jellyfin Server (required)" InstallJellyfinServer
     StrCpy $_JELLYFINVERSION_ "${ver_1}.${ver_2}.${ver_3}" ;
 
     ; Write the uninstall keys for Windows
-    WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayName" "Jellyfin Server $_JELLYFINVERSION_ ${NAMESUFFIX}"
+    WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayName" "Jellyfin Server $_JELLYFINVERSION_"
     WriteRegExpandStr HKLM "${INSTDIR_REG_KEY}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
     WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayIcon" '"$INSTDIR\Uninstall.exe",0'
     WriteRegStr HKLM "${INSTDIR_REG_KEY}" "Publisher" "The Jellyfin Project"
@@ -328,7 +307,6 @@ SectionEnd
 ;Uninstaller Section
 
 Section "Uninstall"
-    ;!define UNINST_TERMINATE TODO TAKE OUT
 
     ReadRegStr $INSTDIR HKLM "${REG_CONFIG_KEY}" "InstallFolder"  ; read the installation folder
     ReadRegStr $_JELLYFINDATADIR_ HKLM "${REG_CONFIG_KEY}" "DataFolder"  ; read the data folder
@@ -376,8 +354,6 @@ Section "Uninstall"
             DetailPrint "Removed old shortcuts..."
         ${EndIf}
 
-    ;!insertmacro UNINST_DELETE "$INSTDIR" "${UninstName}" TAKE OUT TODO
-
     DeleteRegKey HKLM "Software\Jellyfin"
     DeleteRegKey HKLM "${INSTDIR_REG_KEY}"
 SectionEnd
@@ -394,27 +370,22 @@ Function .onInit
     SetShellVarContext current
     StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server"
 
-    ;System::Call 'kernel32::CreateMutex(p 0, i 0, t "JellyfinServerMutex") p .r1 ?e'
-    ;Pop $R0
+    System::Call 'kernel32::CreateMutex(p 0, i 0, t "JellyfinServerMutex") p .r1 ?e'
+    Pop $R0
 
-    ;StrCmp $R0 0 +3
-    ;!insertmacro ShowErrorFinal "The installer is already running."
+    StrCmp $R0 0 +3
+    !insertmacro ShowErrorFinal "The installer is already running."
 
 
-    ${FindProcess} "jellyfin.exe" $0
-    ${If} $0 <> 0
-        MessageBox MB_OK|MB_ICONEXCLAMATION "Jellyfin is running. Please close it first." /SD IDOK
-        Abort
+    StrCpy $1 "jellyfin.exe"
+    nsProcess::_FindProcess "$1"
+    Pop $R1
+    ${If} $R1 = 0
+       !insertmacro ShowErrorFinal "Jellyfin is running. Please close it first."
+      ;MessageBox MB_OK|MB_ICONEXCLAMATION "Jellyfin is running. Please close it first." /SD IDOK
+    Abort
     ${EndIf}
 
-    ; StrCpy $1 "jellyfin.exe"
-    ; nsProcess::_FindProcess "$1"
-    ; Pop $R1
-    ; ${If} $R1 = 0
-    ;   MessageBox MB_OK|MB_ICONEXCLAMATION "Jellyfin is running. Please close it first." /SD IDOK
-    ; Abort
-    ; ${EndIf}
-
 ;Detect if Jellyfin is already installed.
 ; In case it is installed, let the user choose either
 ;	1. Exit installer
diff --git a/nsis/plugins/UnFiles.cmd b/nsis/plugins/UnFiles.cmd
deleted file mode 100644
index 608c9d1..0000000
--- a/nsis/plugins/UnFiles.cmd
+++ /dev/null
@@ -1,39 +0,0 @@
-@rem NSIS Uninstall Header Recursive File List Maker
-@rem Copyright 2014 Aleksandr Ivankiv, 2017 Dani Mantovani
-@rem https://nsis.sourceforge.io/Uninstall_Header_Recursive_File_List_Maker
-
-@SET DIR=%~1
-@SET HEADER=%~2
-@IF "%~1" == "/?" goto Help
-@IF NOT DEFINED DIR goto Help
-@IF NOT DEFINED HEADER SET HEADER=UnFiles.nsh
-@IF NOT EXIST "%DIR%" ECHO Error: Cannot find the folder %DIR%. & SET "DIR=" & goto :EOF
-
-@SetLocal EnableDelayedExpansion
-
-IF %DIR:~-1%==\ SET DIR=%DIR:~0,-1%
-
-@FOR /F "tokens=*" %%f IN ('DIR %DIR%\*.* /A:-D /B /S') DO @(
-  set string=%%f
-  set string=!string:%CD%\%DIR%=!
-  set string=!string:$=$$!
-  echo Delete "$OUTDIR\!string:~1!" >> %HEADER%
-  echo !string:~1!
-)
-
-@FOR /F "tokens=*" %%d IN ('DIR %DIR%\*.* /A:D /B /S ^| SORT /R') DO @(
-  set string=%%d
-  set string=!string:%CD%\%DIR%=!
-  set string=!string:$=$$!
-  echo RMDir "$OUTDIR\!string:~1!" >> %HEADER%
-  echo !string:~1!
-)
-
-@EndLocal
-@goto :EOF
-
-:Help
-@echo.
-@echo Usage: UnFiles FolderName [OutFile]
-@echo.
-@goto :EOF
diff --git a/nsis/plugins/nsProcess.dll b/nsis/plugins/nsProcess.dll
index 2478624ee0bcceb6e2c0eee3a563e7cea272ba9a..5d1497ba156030711dfcd0483a158e42a1070673 100644
GIT binary patch
literal 6144
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
Fe*pl3H%0&e

literal 4608
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
I{EsW}54bMdo&W#<


From 92dbfae510d6f6730d846889b3863b58c2fe13cf Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthonylavado@me.com>
Date: Sat, 11 May 2024 14:09:56 -0400
Subject: [PATCH 3/4] Modify support build script, add compiled DLL

---
 Support Files/nsProcess/build_nsprocess.ps1 | 128 +-------------------
 nsis/plugins/nsProcess.dll                  | Bin 6144 -> 6144 bytes
 2 files changed, 6 insertions(+), 122 deletions(-)

diff --git a/Support Files/nsProcess/build_nsprocess.ps1 b/Support Files/nsProcess/build_nsprocess.ps1
index 4d3a1cf..8e4a280 100644
--- a/Support Files/nsProcess/build_nsprocess.ps1	
+++ b/Support Files/nsProcess/build_nsprocess.ps1	
@@ -9,14 +9,9 @@ $ErrorActionPreference = "Stop"
 # Disabling this, improves vastly performance:
 $ProgressPreference = 'SilentlyContinue'
 
-# change directory to the directory above (if needed)
-Set-Location -Path "$PSScriptRoot\..\"
-
 # Global constants
 $RootPath = "$PWD"
-$BuildPath = "$RootPath\build"
-$DeployPath = "$RootPath\deploy"
-$WindowsPath ="$RootPath\windows"
+
 
 # Execute native command with errorlevel handling
 Function Invoke-Native-Command {
@@ -33,48 +28,6 @@ Function Invoke-Native-Command {
     }
 }
 
-# Cleanup existing build folders
-Function Clean-Build-Environment
-{
-    if (Test-Path -Path $BuildPath) { Remove-Item -Path $BuildPath -Recurse -Force }
-    if (Test-Path -Path $DeployPath) { Remove-Item -Path $DeployPath -Recurse -Force }
-
-    New-Item -Path $BuildPath -ItemType Directory
-    New-Item -Path $DeployPath -ItemType Directory
-}
-
-# For sourceforge links we need to get the correct mirror (especially NISIS) Thanks: https://www.powershellmagazine.com/2013/01/29/pstip-retrieve-a-redirected-url/
-Function Get-RedirectedUrl {
-    param(
-        [Parameter(Mandatory=$true)]
-        [string] $url
-    )
-
-    $numAttempts = 10
-    $sleepTime = 10
-    $maxSleepTime = 80
-    for ($attempt = 1; $attempt -le $numAttempts; $attempt++) {
-        try {
-            $request = [System.Net.WebRequest]::Create($url)
-            $request.AllowAutoRedirect=$true
-            $response=$request.GetResponse()
-            $response.ResponseUri.AbsoluteUri
-            $response.Close()
-            return
-        } catch {
-            if ($attempt -lt $numAttempts) {
-                Write-Warning "Caught error: $_"
-                Write-Warning "Get-RedirectedUrl: Fetch attempt #${attempt}/${numAttempts} for $url failed, trying again in ${sleepTime}s"
-                Start-Sleep -Seconds $sleepTime
-                $sleepTime = [Math]::Min($sleepTime * 2, $maxSleepTime)
-                continue
-            }
-            Write-Error "Get-RedirectedUrl: All ${numAttempts} fetch attempts for $url failed, failing whole call"
-            throw
-        }
-    }
-}
-
 function Initialize-Module-Here ($m) { # see https://stackoverflow.com/a/51692402
 
     # If module is imported say that and do nothing
@@ -104,41 +57,8 @@ function Initialize-Module-Here ($m) { # see https://stackoverflow.com/a/5169240
     }
 }
 
-# Download and uncompress dependency in ZIP format
-Function Install-Dependency
-{
-    param(
-        [Parameter(Mandatory=$true)]
-        [string] $Uri,
-        [Parameter(Mandatory=$true)]
-        [string] $Name,
-        [Parameter(Mandatory=$true)]
-        [string] $Destination
-    )
-
-    if (Test-Path -Path "$WindowsPath\$Destination")
-    {
-        echo "Using ${WindowsPath}\${Destination} from previous run (e.g. actions/cache)"
-        return
-    }
-
-    $TempFileName = [System.IO.Path]::GetTempFileName() + ".zip"
-    $TempDir = [System.IO.Path]::GetTempPath()
-
-    if ($Uri -Match "downloads.sourceforge.net")
-    {
-      $Uri = Get-RedirectedUrl -URL $Uri
-    }
-
-    Invoke-WebRequest -Uri $Uri -OutFile $TempFileName
-    echo $TempFileName
-    Expand-Archive -Path $TempFileName -DestinationPath $TempDir -Force
-    echo $WindowsPath\$Destination
-    Move-Item -Path "$TempDir\$Name" -Destination "$WindowsPath\$Destination" -Force
-    Remove-Item -Path $TempFileName -Force
-}
 
-# Install VSSetup (Visual Studio detection), ASIO SDK and NSIS Installer
+# Install VSSetup (Visual Studio detection)
 Function Install-Dependencies
 {
     if (-not (Get-PackageProvider -Name nuget).Name -eq "nuget") {
@@ -201,44 +121,10 @@ Function Initialize-Build-Environment
 }
 
 
-
-# Build Windows installer
-Function Build-Installer
-{
-    param(
-        [string] $BuildOption
-    )
-
-    foreach ($_ in Get-Content -Path "$RootPath\$AppName.pro")
-    {
-        if ($_ -Match "^VERSION *= *(.*)$")
-        {
-            $AppVersion = $Matches[1]
-            break
-        }
-    }
-
-    if ($BuildOption -ne "")
-    {
-        Invoke-Native-Command -Command "$RootPath\libs\NSIS\NSIS-source\makensis" `
-            -Arguments ("/v4", "/DAPP_NAME=$AppName", "/DAPP_VERSION=$AppVersion", `
-            "/DROOT_PATH=$RootPath", "/DWINDOWS_PATH=$WindowsPath", "/DDEPLOY_PATH=$DeployPath", `
-            "/DBUILD_OPTION=$BuildOption", `
-            "$WindowsPath\installer.nsi")
-    }
-    else
-    {
-        Invoke-Native-Command -Command "$RootPath\libs\NSIS\NSIS-source\makensis" `
-            -Arguments ("/v4", "/DAPP_NAME=$AppName", "/DAPP_VERSION=$AppVersion", `
-            "/DROOT_PATH=$RootPath", "/DWINDOWS_PATH=$WindowsPath", "/DDEPLOY_PATH=$DeployPath", `
-            "$WindowsPath\installer.nsi")
-    }
-}
-
 # Build and copy NS-Process dll
 Function Build-NSProcess
 {
-    if (!(Test-Path -path "$RootPath\libs\NSIS\nsProcess.dll")) {
+    if (!(Test-Path -path "$RootPath\..\..\nsis\plugins\nsProcess.dll")) {
 
         echo "Building nsProcess..."
 
@@ -246,17 +132,15 @@ Function Build-NSProcess
         Initialize-Build-Environment -BuildArch "x86"
 
         Invoke-Native-Command -Command "msbuild" `
-            -Arguments ("$RootPath\libs\NSIS\nsProcess\nsProcess.sln", '/p:Configuration="Release UNICODE"', `
+            -Arguments ("$RootPath\nsProcess.sln", '/p:Configuration="Release UNICODE"', `
             "/p:Platform=Win32")
 
-        Move-Item -Path "$RootPath\libs\NSIS\nsProcess\Release\nsProcess.dll" -Destination "$RootPath\libs\NSIS\nsProcess.dll" -Force
-        Remove-Item -Path "$RootPath\libs\NSIS\nsProcess\Release\" -Force -Recurse
+        Move-Item -Path "$RootPath\Release\nsProcess.dll" -Destination "$RootPath\..\..\nsis\plugins\nsProcess.dll" -Force
+        Remove-Item -Path "$RootPath\Release\" -Force -Recurse
         $OriginalEnv | % { Set-Item "Env:$($_.Name)" $_.Value }
     }
 }
 
-Clean-Build-Environment
 Install-Dependencies
-
 Build-NSProcess
 
diff --git a/nsis/plugins/nsProcess.dll b/nsis/plugins/nsProcess.dll
index 5d1497ba156030711dfcd0483a158e42a1070673..a62aa348d1ffa78041fdd82011b9d79c922ee956 100644
GIT binary patch
delta 532
zcmZoLXfT-Yf+=###8+jE4U-cYmor}4%*phfyIw<ufx!%jeSkOth|7Su1&F5r@ggAJ
z0>npv_zDm|0^)Z-{0oTLR2dkAfLIQQO@P=5hy#E)28cmm0+5~u#JhmF0V?Ll5W?WX
z-~)tuP?}+KJzuGB<QDrhkRB!=P6siRfLH*;U|@jB@c`K(K%4=T%RrOk1&XsUGBDHt
z<!UB7@*j4}nf$)n>KBvC(jv>GSvOy92TC$HTg4Qm7UUPlWTochRHkL-=@zFJm8BNx
zmS^Ur<d+x61eX>R<QJ7FxMk*~7Ed-3m<J50ivq&74ay7*8bAZ|GE)*u5><?VOokOe
zF_3ehV#Xk`JwUM>gqR6POk=X5ptmAO1_p{ifuR7@4GcsWI5xRgP&$<^QL&j<=q=-B
IK9Nt%0Ff4Iy8r+H

delta 516
zcmZoLXfT-Yg2{wy;;S;ooXLrd%Nh4==4ATLT`!`-z@P-g7C`I+#7RJ00K^SI+y}%9
zfOrEC9{}QWKzs{`p8@eFApQr$T&fHV3P7v}#5O?e0mL9s1Ejlvco`7qK*jtRLKs{a
ze1K37N;6EZ=PUI!;j&Ky>0tumU=TwIhy_3l1_qcM50EVa#34Yr5HvYnpg0R7149N-
zE@QGI|6x7f2w}%Z<{aK_`#KgLc&YyvD9PY#6;qU2kY5~=m6%(aQ(7F8lbKW;;}`51
zJlRcPo^1|Ljb2eoVo9P(RaI3=QaVsejxqy-29Vav1dAI1nG92aVjzb=#f(8>D<&%n
z3NwmKHWl<%Tmh7afjE%I6@VBRP%yA*@<KuBRJsKFW<{a5jFT5IifrZ+`NRwW!DnC8


From 0dcdafede6fa174b7472d0698eeeea967906c5b9 Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthonylavado@me.com>
Date: Sat, 11 May 2024 15:07:15 -0400
Subject: [PATCH 4/4] Remove uninstall test, add protections around datadir
 removal

---
 nsis/helpers/UnInst.nsh | 362 ----------------------------------------
 nsis/jellyfin.nsi       |  37 ++--
 2 files changed, 22 insertions(+), 377 deletions(-)
 delete mode 100644 nsis/helpers/UnInst.nsh

diff --git a/nsis/helpers/UnInst.nsh b/nsis/helpers/UnInst.nsh
deleted file mode 100644
index f96a3f7..0000000
--- a/nsis/helpers/UnInst.nsh
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
-
-NSIS Uninstaller Data
-Copyright 2014 Aleksandr Ivankiv
-
-*/
-
-;--------------------------------
-
-!ifndef UNINST_INCLUDED
-!define UNINST_INCLUDED
-
-!verbose push
-!verbose 3
-
-!ifndef UNINST_VERBOSE
-  !define UNINST_VERBOSE 3
-!endif
-
-!verbose ${UNINST_VERBOSE}
-
-;--------------------------------
-;Header files required by Uninstaller Data
-
-!include "FileFunc.nsh"
-!include "TextFunc.nsh"
-
-;--------------------------------
-;Variables
-
-Var List
-Var Log
-Var Tmp
-Var UNINST_DAT
-Var UNINST_EXE
-Var UNINST_DEL_FILE
-
-;--------------------------------
-;Default language strings
-
-!define UNINST_EXCLUDE_ERROR_DEFAULT "Error creating an exclusion list."
-!define UNINST_DATA_ERROR_DEFAULT "Error creating the uninstaller data: $\r$\nCannot find an exclusion list."
-!define UNINST_DAT_NOT_FOUND_DEFAULT "$UNINST_DAT not found, unable to perform uninstall. Manually delete files."
-!define UNINST_DAT_MISSING_DEFAULT "$UNINST_DAT is missing, some elements could not be removed. These can be removed manually."
-!define UNINST_DEL_FILE_DEFAULT "Delete File"
-
-;--------------------------------
-;Language strings macro
-
-!macro SETSTRING NAME
-
-  !ifndef "${NAME}"
-    !ifdef UNINST_LOCALIZE
-      !define "${NAME}" "$(${NAME})"
-    !else
-      !define "${NAME}" "${${NAME}_DEFAULT}"
-    !endif
-  !endif
-
-!macroend
-
-;--------------------------------
-;Initialization macro
-
-!macro UNINST_INIT
-
-  ;Default settings
-  !ifndef UninstName
-    !define UninstName "Uninstall"
-  !endif
-  !ifndef UninstHeader
-    !define UninstHeader "=========== Uninstaller Data please do not edit this file ==========="
-  !endif
-  !insertmacro SETSTRING "UNINST_EXCLUDE_ERROR"
-  !insertmacro SETSTRING "UNINST_DATA_ERROR"
-  !insertmacro SETSTRING "UNINST_DAT_NOT_FOUND"
-  !insertmacro SETSTRING "UNINST_DAT_MISSING"
-  !insertmacro SETSTRING "UNINST_DEL_FILE"
-  StrCpy $UNINST_DEL_FILE "${UNINST_DEL_FILE}"
-  StrCpy $UNINST_DAT "$OUTDIR\${UninstName}.dat"
-  StrCpy $UNINST_EXE "$OUTDIR\${UninstName}.exe"
-
-!macroend
-
-;--------------------------------
-;Change name of file
-
-!macro UNINST_NAME Name
-
-  !ifdef UninstName
-    !undef UninstName
-    !define UninstName "${Name}"
-  !else
-    !define UninstName "${Name}"
-  !endif
-  !insertmacro UNINST_INIT
-
-!macroend
-
-;--------------------------------
-;Create an exclusion list
-
-!macro UNINSTALLER_DATA_BEGIN
-
-  !insertmacro UNINST_EXCLUDE
-
-!macroend
-
-!macro UNINST_EXCLUDE
-
-  !verbose push
-  !verbose ${UNINST_VERBOSE}
-
-  !insertmacro UNINST_INIT
-
-  StrCmp "$PLUGINSDIR" "" 0 +2
-    InitPluginsDir
-
-  GetTempFileName $Tmp $PLUGINSDIR
-
-  IfErrors 0 UninstExclude
-    !ifndef UNINST_ERROR
-      !define UNINST_ERROR
-      MessageBox MB_OK|MB_ICONEXCLAMATION "${UNINST_EXCLUDE_ERROR}" /SD IDOK
-      Goto +3
-    !endif
-
-  UninstExclude:
-    FileOpen $List "$Tmp" w
-    ${Locate} "$OUTDIR" "/L=FD" "${ExcludeList_Func_CallBack}"
-    FileClose $List
-
-  !verbose pop
-
-!macroend
-
-!macro UNINST_FUNCTION_EXCLUDELIST
-
-  Function ExcludeList
-
-    FileWrite $List "$R9$\r$\n"
-    Push $0
-
-  FunctionEnd
-
-!macroend
-
-!ifndef ExcludeList_Func_CallBack
-  !insertmacro UNINST_FUNCTION_EXCLUDELIST
-  !define ExcludeList_Func_CallBack "ExcludeList"
-!endif
-
-;----------------------------------------------------------------
-;Write Uninstaller Data
-
-!macro UNINSTALLER_DATA_END
-
-  !insertmacro UNINST_DATA
-
-!macroend
-
-!macro UNINST_DATA
-
-  !verbose push
-  !verbose ${UNINST_VERBOSE}
-
-  !insertmacro UNINST_INIT
-
-  IfFileExists "$Tmp" UninstData
-    !ifndef UNINST_ERROR
-      !define UNINST_ERROR
-      ${GetFileName} "$UNINST_DAT" $R0
-      MessageBox MB_OK|MB_ICONEXCLAMATION "${UNINST_DATA_ERROR}" /SD IDOK
-    !endif
-    Goto DoneUninstData
-
-  UninstData:
-    FileOpen $Log "$UNINST_DAT" a
-    FileOpen $List "$Tmp" r
-
-    FileRead $Log $1
-    IfErrors 0 +2
-    FileWrite $Log "${UninstHeader}$\r$\n"
-
-    ${Locate} "$OUTDIR" "/L=FD" "${UninstallData_Func_CallBack}"
-
-    FileClose $List
-    FileClose $Log
-
-  DoneUninstData:
-    StrCpy $Tmp ""
-
-  !verbose pop
-
-!macroend
-
-!macro UNINST_FUNCTION_UNINSTDATA
-
-  Function UninstallData
-
-    StrCmp $R9 $UNINST_DAT Done
-
-    FileSeek $List 0 SET
-
-    LoopReadList:
-      FileRead $List $1 ${NSIS_MAX_STRLEN}
-      IfErrors DoneReadList
-
-      ${TrimNewLines} $1 $R0
-      StrCmp $R0 $R9 Done
-
-    Goto LoopReadList
-
-    DoneReadList:
-      FileSeek $Log 0 SET
-
-      LoopReadLog:
-        FileRead $Log $1 ${NSIS_MAX_STRLEN}
-        IfErrors DoneReadLog
-
-        ${TrimNewLines} $1 $R0
-        StrCmp $R0 $R9 Done
-
-      Goto LoopReadLog
-
-      DoneReadLog:
-        FileSeek $Log 0 END
-        FileWrite $Log "$R9$\r$\n"
-
-    Done:
-      Push $0
-
-  FunctionEnd
-
-!macroend
-
-!ifndef UninstallData_Func_CallBack
-  !insertmacro UNINST_FUNCTION_UNINSTDATA
-  !define UninstallData_Func_CallBack "UninstallData"
-!endif
-
-;----------------------------------------------------------------
-;Uninstall Files
-
-!macro UNINST_DELETE Path Name
-
-  !verbose push
-  !verbose ${UNINST_VERBOSE}
-
-  !if "${Path}" == ""
-    StrCpy $OUTDIR "$INSTDIR"
-  !else
-    StrCpy $OUTDIR "${Path}"
-  !endif
-  !if "${Name}" == ""
-    !insertmacro UNINST_NAME "Uninstall"
-  !else
-    !insertmacro UNINST_NAME "${Name}"
-  !endif
-
-  !insertmacro UNINST_INIT
-
-  IfFileExists "$UNINST_DAT" +3
-    !ifdef UNINST_TERMINATE
-      MessageBox MB_OK|MB_ICONSTOP "${UNINST_DAT_NOT_FOUND}" /SD IDOK
-      Quit
-    !else
-      MessageBox MB_OK|MB_ICONEXCLAMATION "${UNINST_DAT_MISSING}" /SD IDOK
-      StrCpy $0 "error"
-    !endif
-
-  ${If} $0 != "error"
-
-    FileOpen $Log "$UNINST_DAT" r
-      Call un.Delete
-    FileClose $Log
-
-    Delete "$UNINST_DAT"
-
-    !ifdef UNINST_INTERACTIVE
-      ${Locate} "$OUTDIR" "/L=F" "${un.InterActive_Func_CallBack}"
-      ${Locate} "$OUTDIR" "/L=DE" "${un.InterActive_Func_CallBack}"
-    !else
-      Call un.InterActive
-    !endif
-
-  ${Else}
-    StrCpy $0 ""
-  ${EndIf}
-
-  Delete "$UNINST_EXE"
-  RMDir $OUTDIR
-  ClearErrors
-
-  !verbose pop
-
-!macroend
-
-!macro UNINST_FUNCTION_DELETE
-
-  Function un.Delete
-
-    LoopReadFile:
-      FileRead $Log $1 ${NSIS_MAX_STRLEN}
-      IfErrors DoneReadFile
-
-      ${TrimNewLines} $1 $R0
-
-      IfFileExists $R0\*.* +3
-      IfFileExists $R0 0 +2
-      Delete $R0
-
-    Goto LoopReadFile
-
-    DoneReadFile:
-      FileSeek $Log 0 SET
-
-    LoopReadDIR:
-      FileRead $Log $1 ${NSIS_MAX_STRLEN}
-      IfErrors DoneReadDIR
-
-      ${TrimNewLines} $1 $R0
-
-      IfFileExists $R0\*.* 0 +3
-      RMDir $R0
-      ClearErrors
-
-    Goto LoopReadDIR
-
-    DoneReadDIR:
-
-  FunctionEnd
-
-!macroend
-
-!insertmacro UNINST_FUNCTION_DELETE
-
-!macro UNINST_FUNCTION_INTERACTIVE
-
-  Function un.InterActive
-
-    StrCmp $R9 "" +8
-    IfFileExists $R9\*.* 0 +3
-      RMDir $R9
-      Goto +4
-    StrCmp $R9 $UNINST_EXE +3
-      MessageBox MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2 "$UNINST_DEL_FILE '$R9'?" /SD IDNO IDNO +2
-      Delete $R9
-    Push $0
-
-  FunctionEnd
-
-!macroend
-
-!ifndef un.InterActive_Func_CallBack
-  !insertmacro UNINST_FUNCTION_INTERACTIVE
-  !define un.InterActive_Func_CallBack "un.InterActive"
-!endif
-
-!verbose pop
-
-!endif
diff --git a/nsis/jellyfin.nsi b/nsis/jellyfin.nsi
index 50d2850..2cee055 100644
--- a/nsis/jellyfin.nsi
+++ b/nsis/jellyfin.nsi
@@ -1,5 +1,5 @@
 !verbose 3
-;SetCompressor /SOLID bzip2 TODO ENABLE FOR RELEASE
+;SetCompressor /SOLID bzip2 TODO Review if this is best option
 ShowInstDetails show
 ShowUninstDetails show
 Unicode True
@@ -162,17 +162,10 @@ Section "!Jellyfin Server (required)" InstallJellyfinServer
 
     SetOutPath "$INSTDIR"
 
-    ; ;Create an exclusion list
-    ; !insertmacro UNINSTALLER_DATA_BEGIN
 
     File "/oname=icon.ico" "${UXPATH}\branding\NSIS\modern-install.ico"
     File /r $%InstallLocation%\*
 
-    ; ;Change uninstall list name (optimal)
-    ; !insertmacro UNINST_NAME "unins000"
-
-    ; ;Store uninstaller data
-    ; !insertmacro UNINSTALLER_DATA_END
 
     ; Write the InstallFolder, DataFolder, Network Service info into the registry for later use
     WriteRegExpandStr HKLM "${REG_CONFIG_KEY}" "InstallFolder" "$INSTDIR"
@@ -318,11 +311,25 @@ Section "Uninstall"
     MessageBox MB_YESNO|MB_ICONINFORMATION "Do you want to keep the Jellyfin Server data folder? $\r$\nIf unsure choose YES." /SD IDYES IDYES PreserveData IDNO DeleteConfirmation
 
     DeleteConfirmation:
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "Are you sure? Everything in $\r$\n$_JELLYFINDATADIR_ $\r$\nwill be deleted. $\r$\nIf you are sure, press OK." IDCANCEL PreserveData
-
-    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_"
+    MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION "Are you sure? Everything in $\r$\n$_JELLYFINDATADIR_ $\r$\nwill be deleted. $\r$\nIf you are sure, press YES." IDYES DeleteData IDNO PreserveData IDCANCEL StopNow
+
+    DeleteData:
+    ; Try to delete only known data dir folders
+    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_\cache"
+    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_\config"
+    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_\data"
+    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_\log"
+    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_\metadata"
+    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_\plugins"
+    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_\root"
+    ; Delete final dir only if empty
+    RMDir /REBOOTOK "$_JELLYFINDATADIR_"
+
+    StopNow:
+    Abort
 
     PreserveData:
+    ; noop
 
     ExecWait "TaskKill /IM Jellyfin.Windows.Tray.exe /F"
     ExecWait '"$INSTDIR\nssm.exe" statuscode JellyfinServer' $0
@@ -370,20 +377,20 @@ Function .onInit
     SetShellVarContext current
     StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server"
 
+    ; This blocks another installer from running at the same time
     System::Call 'kernel32::CreateMutex(p 0, i 0, t "JellyfinServerMutex") p .r1 ?e'
     Pop $R0
-
     StrCmp $R0 0 +3
     !insertmacro ShowErrorFinal "The installer is already running."
 
 
+    ; This stops the installer from starting if jellyfin.exe is open
     StrCpy $1 "jellyfin.exe"
     nsProcess::_FindProcess "$1"
     Pop $R1
     ${If} $R1 = 0
        !insertmacro ShowErrorFinal "Jellyfin is running. Please close it first."
-      ;MessageBox MB_OK|MB_ICONEXCLAMATION "Jellyfin is running. Please close it first." /SD IDOK
-    Abort
+        Abort
     ${EndIf}
 
 ;Detect if Jellyfin is already installed.
@@ -592,5 +599,5 @@ Function .onSelChange
 FunctionEnd
 
 Function .onInstSuccess
-    #ExecShell "open" "http://localhost:8096" TODO MAKE THIS HAPPEN IF FIRST INSTALL
+    ; TODO - Eventually add an option to launch tray app or service instead, and remind/offer to start browser
 FunctionEnd