From e41fd95d9fedd2c3ed529993fafeb198341faea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Mathieu?= <mickael.mathieu@e-teach.ch>
Date: Mon, 18 Mar 2024 11:14:40 +0100
Subject: [PATCH] Doctor Web Cureit

---
 src/config/tools.xml                | 6 +++++-
 src/kpRm.au3                        | 4 ++--
 src/kp_includes/functions/utils.au3 | 2 ++
 src/kp_includes/variables.au3       | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/config/tools.xml b/src/config/tools.xml
index 708e64f..5193f20 100644
--- a/src/config/tools.xml
+++ b/src/config/tools.xml
@@ -216,9 +216,13 @@
         <download companyName="" pattern="(?i)^defogger.*\.(log|exe)$" type="file"/>
         <process companyName="" force="0" process="(?i)^defogger.*\.exe$"/>
     </tool>
+	<tool name="Dr.Web Cureit">
+        <homeDrive companyName="" pattern="(?i)^DrWeb Quarantine$" type="folder" quarantine="1"/>
+		<folder force="1" path="@UserProfileDir\Doctor Web" quarantine="1"/>
+	</tool>
     <tool name="Dr.Web LiveDisk">
         <desktop companyName="" pattern="(?i)^drweb\-livedisk.*\.(iso|exe)$" type="file"/>
-        <desktop companyName="" pattern="(?i)^drweb\-livedisk.*\.(iso|exe)$" type="file"/>
+        <download companyName="" pattern="(?i)^drweb\-livedisk.*\.(iso|exe)$" type="file"/>
         <homeDrive companyName="" pattern="(?i)^DrWeb Quarantine$" type="folder" quarantine="1"/>
     </tool>
     <tool name="Easy Restore Point">
diff --git a/src/kpRm.au3 b/src/kpRm.au3
index e902487..4e683ab 100644
--- a/src/kpRm.au3
+++ b/src/kpRm.au3
@@ -5,9 +5,9 @@
 #AutoIt3Wrapper_Outfile=KpRm.exe
 #AutoIt3Wrapper_Res_Comment=Delete all removal tools
 #AutoIt3Wrapper_Res_Description=KpRm By Kernel-Panik
-#AutoIt3Wrapper_Res_Fileversion=2.0.0.16
+#AutoIt3Wrapper_Res_Fileversion=2.0.0.17
 #AutoIt3Wrapper_Res_ProductName=KpRm
-#AutoIt3Wrapper_Res_ProductVersion=2.16.0
+#AutoIt3Wrapper_Res_ProductVersion=2.17.0
 #AutoIt3Wrapper_Res_CompanyName=kernel-panik
 #AutoIt3Wrapper_Res_LegalCopyright=kernel-panik
 #AutoIt3Wrapper_Res_LegalTradeMarks=kernel-panik
diff --git a/src/kp_includes/functions/utils.au3 b/src/kp_includes/functions/utils.au3
index 0f762af..a2a753c 100644
--- a/src/kp_includes/functions/utils.au3
+++ b/src/kp_includes/functions/utils.au3
@@ -19,6 +19,8 @@ Func FormatPathWithMacro($sPath)
 			$sPath = @HomeDrive & StringReplace($sPath, "@HomeDrive", "")
 		Case StringRegExp($sPath, "^@TempDir")
 			$sPath = @TempDir & StringReplace($sPath, "@TempDir", "")
+		Case StringRegExp($sPath, "^@UserProfileDir")
+			$sPath = @UserProfileDir & StringReplace($sPath, "@UserProfileDir", "")
 	EndSelect
 
 	Return $sPath
diff --git a/src/kp_includes/variables.au3 b/src/kp_includes/variables.au3
index 7fe2271..b98cb83 100644
--- a/src/kp_includes/variables.au3
+++ b/src/kp_includes/variables.au3
@@ -1,5 +1,5 @@
 Global $bKpRmDev = False
-Global $sKprmVersion = "2.16.0"
+Global $sKprmVersion = "2.17.0"
 Global $sTmpDir = @TempDir & "\KPRM"
 Global $sProgramName = "KpRm"
 Global $sCurrentTime = @YEAR & @MON & @MDAY & @HOUR & @MIN & @SEC