diff options
| -rw-r--r-- | dist-assets/windows/installer.nsh | 3 | ||||
| -rw-r--r-- | windows/driverlogic/src/driverlogic.cpp | 16 | ||||
| -rw-r--r-- | windows/driverlogic/src/wireguard.h | 4 |
3 files changed, 7 insertions, 16 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 402802e1dc..8ce3b5ac91 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -13,7 +13,6 @@ # !define WINTUN_POOL "Mullvad" -!define WG_NT_POOL "Mullvad" # "sc" exit code !define SERVICE_STARTED 0 @@ -234,7 +233,7 @@ log::Log "RemoveWireGuardNt()" - nsExec::ExecToStack '"$TEMP\driverlogic.exe" wg-nt-cleanup ${WG_NT_POOL}' + nsExec::ExecToStack '"$TEMP\driverlogic.exe" wg-nt-cleanup' Pop $0 Pop $1 diff --git a/windows/driverlogic/src/driverlogic.cpp b/windows/driverlogic/src/driverlogic.cpp index 3cb1739e21..aba746d3e3 100644 --- a/windows/driverlogic/src/driverlogic.cpp +++ b/windows/driverlogic/src/driverlogic.cpp @@ -283,24 +283,16 @@ ReturnCode CommandWireGuardNtCleanup(const std::vector<std::wstring> &args) { ArgumentContext argsContext(args); - argsContext.ensureExactArgumentCount(1); - - const auto poolName = argsContext.next(); + argsContext.ensureExactArgumentCount(0); WireGuardNtDll wgNt; - BOOL rebootRequired; - - if (FALSE == wgNt.deletePoolDriver(poolName.c_str(), &rebootRequired)) + if (FALSE == wgNt.deleteDriver()) { - throw std::runtime_error("Failed to delete WireGuardNT pool"); + throw std::runtime_error("Failed to delete WireGuardNT driver"); } - std::wstringstream ss; - - ss << L"Successfully deleted WireGuardNT pool. Reboot required: " << rebootRequired; - - Log(ss.str()); + Log(L"Successfully deleted WireGuardNT driver"); return ReturnCode::GENERAL_SUCCESS; } diff --git a/windows/driverlogic/src/wireguard.h b/windows/driverlogic/src/wireguard.h index 5892b248f1..ae3f7ee3d1 100644 --- a/windows/driverlogic/src/wireguard.h +++ b/windows/driverlogic/src/wireguard.h @@ -20,7 +20,7 @@ public: try { - deletePoolDriver = getProcAddressOrThrow<WIREGUARD_DELETE_POOL_DRIVER_FUNC*>("WireGuardDeletePoolDriver"); + deleteDriver = getProcAddressOrThrow<WIREGUARD_DELETE_DRIVER_FUNC*>("WireGuardDeleteDriver"); } catch (...) { @@ -37,7 +37,7 @@ public: } } - WIREGUARD_DELETE_POOL_DRIVER_FUNC *deletePoolDriver; + WIREGUARD_DELETE_DRIVER_FUNC *deleteDriver; private: |