diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-02-04 10:51:14 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-02-04 14:52:42 +0100 |
| commit | 714623975b1470b47ccdc2f552ba4004c16e5be7 (patch) | |
| tree | 3d2ddfae998d446a31f41d38e30b05507e63446d | |
| parent | 7dd5dee62bb4b461a839c5a3e38cfb08b4bb25c8 (diff) | |
| download | mullvadvpn-714623975b1470b47ccdc2f552ba4004c16e5be7.tar.xz mullvadvpn-714623975b1470b47ccdc2f552ba4004c16e5be7.zip | |
Replace usage of `tapinstall remove` with driverlogic function
| -rw-r--r-- | dist-assets/windows/installer.nsh | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index d25ec9c58c..3d093f0e3d 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -30,12 +30,6 @@ !define DL_DELETE_NO_ADAPTERS_REMAIN 2 !define DL_DELETE_SOME_ADAPTERS_REMAIN 3 -# Return codes from tapinstall -!define DEVCON_EXIT_OK 0 -!define DEVCON_EXIT_REBOOT 1 -!define DEVCON_EXIT_FAIL 2 -!define DEVCON_EXIT_USAGE 3 - # Log targets !define LOG_FILE 0 !define LOG_VOID 1 @@ -171,7 +165,7 @@ Push $0 Push $1 - nsExec::ExecToStack '"$TEMP\driver\tapinstall.exe" remove ${TAP_HARDWARE_ID}' + nsExec::ExecToStack '"$TEMP\driver\driverlogic.exe" remove ${TAP_HARDWARE_ID}' Pop $0 Pop $1 @@ -209,13 +203,12 @@ ${If} $0 == ${DL_DELETE_NO_ADAPTERS_REMAIN} log::Log "Removing vanilla TAP adapter driver since it is no longer in use" - nsExec::ExecToStack '"$TEMP\driver\tapinstall.exe" remove ${DEPRECATED_TAP_HARDWARE_ID}' + nsExec::ExecToStack '"$TEMP\driver\driverlogic.exe" remove ${DEPRECATED_TAP_HARDWARE_ID}' Pop $0 Pop $1 - ${If} $0 != ${DEVCON_EXIT_OK} - ${AndIf} $0 != ${DEVCON_EXIT_REBOOT} + ${If} $0 != ${DL_GENERAL_SUCCESS} StrCpy $R0 "Failed to remove driver: $1" log::Log $R0 @@ -280,8 +273,7 @@ Pop $0 Pop $1 - ${If} $0 != ${DEVCON_EXIT_OK} - ${AndIf} $0 != ${DEVCON_EXIT_REBOOT} + ${If} $0 != ${DL_GENERAL_SUCCESS} StrCpy $R0 "Failed to create virtual adapter: error $0" log::LogWithDetails $R0 $1 Goto InstallDriver_return |