From 9ecbf1d7fc75659f4ca66d6f5a60f9a4ff5b1503 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Wed, 18 Nov 2015 21:37:47 +0100
Subject: [PATCH] close brwoser windows

---
 CLIENT_DATA/browserkill.vbs | 33 +++++++++++++++++++++++++++++++++
 CLIENT_DATA/delsub32.ins    | 14 +++-----------
 2 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 CLIENT_DATA/browserkill.vbs

diff --git a/CLIENT_DATA/browserkill.vbs b/CLIENT_DATA/browserkill.vbs
new file mode 100644
index 0000000..d7a69ea
--- /dev/null
+++ b/CLIENT_DATA/browserkill.vbs
@@ -0,0 +1,33 @@
+Option Explicit
+KillBrowsers()
+
+Sub KillBrowsers()
+'Declare variables
+    Dim i
+    Dim wmiSvc,WQL,Processes,Process
+    Dim arrBrowserProcesses(7)
+
+'Initialize variables
+    arrBrowserProcesses(0)="iexplore.exe"
+    arrBrowserProcesses(1)="chrome.exe"
+    arrBrowserProcesses(2)="firefox.exe"
+    arrBrowserProcesses(3)="safari.exe"
+    arrBrowserProcesses(4)="opera.exe"
+    arrBrowserProcesses(5)="iron.exe"
+    arrBrowserProcesses(6)="MicrosoftEdge.exe"
+
+    Set wmiSvc = GetObject("winmgmts:\\.\root\cimv2")
+    For i = 0 To UBound(arrBrowserProcesses)
+	wql = "SELECT * FROM Win32_Process WHERE Name='" & arrBrowserProcesses(i) & "'"
+	Set processes = wmiSvc.ExecQuery(wql)
+	Do While processes.Count > 0
+	    For Each process In processes
+		process.Terminate
+	    Next
+	    WScript.Sleep 200
+	    Set processes = wmiSvc.ExecQuery(wql)
+	Loop
+    Next
+
+End Sub
+
diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 96849c9..5e83fa4 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -34,21 +34,13 @@ comment "Cleanup registry"
 Registry_uninstall /32Bit
 
 comment "Close the UnInstall Browser Window"
-DosInAnIcon_taskkill
+Winbatch_taskkill
 
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
-[DosInAnIcon_taskkill]
-taskkill /F /IM openwith.exe
-taskkill /F /IM iexplore.exe
-taskkill /F /IM iron.exe
-taskkill /F /IM firefox.exe
-taskkill /F /IM waterfox.exe
-taskkill /F /IM chrome.exe
-taskkill /F /IM opera.exe
-
-
+[Winbatch_taskkill]
+cscript //b //nologo %ScriptPath%\browserkill.vbs
 
 [Winbatch_uninstall_msi_old]
 msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress