Showed the processes that are using Npcap when stopping the driver in…

… the uninstaller.
jmcabandara · Dec 3, 2016 · f40988d · f40988d
1 parent 3fabc29
commit f40988d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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