From f40988df86db9276b243314b7c0e6d5e7cef7ae2 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Sat, 3 Dec 2016 22:32:14 +0800 Subject: [PATCH] Showed the processes that are using Npcap when stopping the driver in the uninstaller. --- installer/Npcap-for-nmap.nsi | 9 +++++++-- version.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/installer/Npcap-for-nmap.nsi b/installer/Npcap-for-nmap.nsi index ee9082f5..4e1484e9 100644 --- a/installer/Npcap-for-nmap.nsi +++ b/installer/Npcap-for-nmap.nsi @@ -1690,8 +1690,13 @@ Section "Uninstall" ${If} $ndis6_driver == "yes" ExecWait '"$INSTDIR\NPFInstall.exe" -n -d' $0 ${If} $0 == "0" - MessageBox MB_OK "Failed to stop the driver. Uninstall aborted. Please close any programs that may be using Npcap and try again." - DetailPrint "Failed to stop the driver. Uninstall aborted. Please close any programs that may be using Npcap and try again." + ; get the processes that are using Npcap + nsExec::ExecToStack '"$INSTDIR\NPFInstall.exe" -check_dll' + Pop $0 + Pop $1 + StrCpy $1 $1 -2 + MessageBox MB_OK "Failed to stop the driver. Uninstall aborted. Please close programs: $1 which may be using Npcap and try again." + DetailPrint "Failed to stop the driver. Uninstall aborted. Please close programs: $1 which may be using Npcap and try again." Goto uninstall_fail ${EndIf} ${EndIf} diff --git a/version.h b/version.h index da2f19ff..073aff03 100644 --- a/version.h +++ b/version.h @@ -43,7 +43,7 @@ #define /* !define /**/ WINPCAP_BUILD 1123 #define /* - !define /**/ WINPCAP_VER_STRING "0.78" + !define /**/ WINPCAP_VER_STRING "0.78 r2" #define WINPCAP_PACKET9x_STRING_VERSION WINPCAP_VER_STRING #define WINPCAP_WPCAP_STRING_VERSION WINPCAP_VER_STRING