diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-11-30 18:35:04 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-12-03 11:31:35 +0100 |
| commit | 4569e49315bb2d602a855b95ac0a904ba8cd352d (patch) | |
| tree | b6ed674e595f376f793c48be325abbf390c0882f | |
| parent | 2eb34ac744881a30bf867198b1426895697f4665 (diff) | |
| download | mullvadvpn-4569e49315bb2d602a855b95ac0a904ba8cd352d.tar.xz mullvadvpn-4569e49315bb2d602a855b95ac0a904ba8cd352d.zip | |
Update installer
| -rw-r--r-- | dist-assets/windows/installer.nsh | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 47b3536244..390c734046 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -13,7 +13,6 @@ # !define WINTUN_POOL "Mullvad" -!define WINTUN_ADAPTER "Mullvad" # "sc" exit code !define SERVICE_STARTED 0 @@ -115,66 +114,6 @@ !define RemoveWintun '!insertmacro "RemoveWintun"' # -# InstallWintun -# -# Create Wintun Mullvad adapter -# -# Returns: 0 in $R0 on success, otherwise an error message in $R0 -# -!macro InstallWintun - - log::Log "InstallWintun()" - - Push $0 - Push $1 - - nsExec::ExecToStack '"$TEMP\driverlogic.exe" wintun adapter-exists ${WINTUN_POOL} ${WINTUN_ADAPTER}' - - Pop $0 - Pop $1 - - ${If} $0 == ${DL_GENERAL_ERROR} - IntFmt $0 "0x%X" $0 - StrCpy $R0 "Failed to identify virtual adapter: error $0" - log::LogWithDetails $R0 $1 - Goto InstallWintun_return - ${EndIf} - - ${If} $0 != ${DL_ADAPTER_NOT_FOUND} - log::Log "Found existing virtual adapter" - Goto InstallWintun_return_success - ${EndIf} - - log::Log "Creating new virtual adapter" - nsExec::ExecToStack '"$TEMP\driverlogic.exe" wintun create-adapter ${WINTUN_POOL} ${WINTUN_ADAPTER}' - - Pop $0 - Pop $1 - - ${If} $0 != ${DL_GENERAL_SUCCESS} - IntFmt $0 "0x%X" $0 - StrCpy $R0 "Failed to create virtual adapter: error $0" - log::LogWithDetails $R0 $1 - Goto InstallWintun_return - ${EndIf} - - InstallWintun_return_success: - - log::Log "InstallWintun() completed successfully" - - Push 0 - Pop $R0 - - InstallWintun_return: - - Pop $1 - Pop $0 - -!macroend - -!define InstallWintun '!insertmacro "InstallWintun"' - -# # InstallService # # Register the service with Windows and start it @@ -625,14 +564,6 @@ ${RemoveRelayCache} ${RemoveApiAddressCache} - ${ExtractWintun} - ${InstallWintun} - - ${If} $R0 != 0 - MessageBox MB_OK "$R0" - Goto customInstall_abort_installation - ${EndIf} - ${InstallService} ${If} $R0 != 0 @@ -765,7 +696,6 @@ ${ClearFirewallRules} ${ClearAccountHistory} - # Remove Wintun ${ExtractWintun} ${RemoveWintun} |