From ae024689305f04446b2c36ae34bb033f3b973f52 Mon Sep 17 00:00:00 2001
From: Gustave Monce <gustave.monce@outlook.com>
Date: Tue, 2 Apr 2024 23:04:03 +0200
Subject: [PATCH] Enable more verbose logging when cleaning the registry

---
 DriverUpdater/RegistryFixer.cs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/DriverUpdater/RegistryFixer.cs b/DriverUpdater/RegistryFixer.cs
index bf4e44d..de4f020 100644
--- a/DriverUpdater/RegistryFixer.cs
+++ b/DriverUpdater/RegistryFixer.cs
@@ -9,6 +9,9 @@ namespace DriverUpdater
 {
     public class RegistryFixer
     {
+        private static Regex regex = new("""(.*oem[0-9]+\.inf.*)|(.*(QCOM|MSHW|VEN_QCOM&DEV_|VEN_MSHW&DEV_)[0-9A-F]{4}.*)|(.*surface.*duo.*inf)|(.*\\qc.*)|(.*\\surface.*)""");
+        private static Regex antiRegex = new("""(.*QCOM((24[0-9A-F][0-9A-F])|(7002)|(FFE[0-9A-F])).*)|(.*qcap.*)|(.*qcursext.*)|(.*hidspi.*)|(.*ufsstor.*)|(.*sdstor.*)|(.*sdbus.*)|(.*storufs.*)|(.*u..chipidea.*)|(.*u..synopsys.*)|(.*qc.*_i\.inf.*)""");
+
         public static void FixLeftOvers(string DrivePath)
         {
             _ = ModifyRegistryForLeftOvers(Path.Combine(DrivePath, "Windows\\System32\\config\\SYSTEM"), Path.Combine(DrivePath, "Windows\\System32\\config\\SOFTWARE"));
@@ -16,9 +19,6 @@ public static void FixLeftOvers(string DrivePath)
 
         private static void FixDriverStorePathsInRegistryValueForLeftOvers(RegistryKey registryKey, string registryValue)
         {
-            Regex regex = new("(.*oem[0-9]+\\.inf.*)|(.*(QCOM|MSHW|VEN_QCOM&DEV_|VEN_MSHW&DEV_)[0-9A-F]{4}.*)|(.*surface.*duo.*inf)|(.*\\\\qc.*)|(.*\\\\surface.*)");
-            Regex antiRegex = new("(.*QCOM((24[0-9][0-9])|(7002)|(FFE[0-9])).*)|(.*qcap.*)|(.*qcursext.*)|(.*hidspi.*)|(.*ufsstor.*)|(.*sdstor.*)|(.*qc.*_i\\.inf.*)");
-
             // TODO:
             // Key: Microsoft\Windows\CurrentVersion\Setup\PnpResources\Registry\HKLM\ ... \
             // Val: Owners
@@ -35,7 +35,7 @@ private static void FixDriverStorePathsInRegistryValueForLeftOvers(RegistryKey r
                             {
                                 string currentValue = regex.Match(og).Value;
 
-                                Logging.Log($"Deleting {currentValue} in {registryKey.Name}\\{registryValue}");
+                                Logging.Log($"Deleting Value (String) {currentValue} in {registryKey.Name}\\{registryValue}");
 
                                 if (registryValue == "")
                                 {
@@ -55,7 +55,7 @@ private static void FixDriverStorePathsInRegistryValueForLeftOvers(RegistryKey r
                             {
                                 string currentValue = regex.Match(og).Value;
 
-                                Logging.Log($"Deleting {currentValue} in {registryKey.Name}\\{registryValue}");
+                                Logging.Log($"Deleting Value (Expand String) {currentValue} in {registryKey.Name}\\{registryValue}");
 
                                 if (registryValue == "")
                                 {
@@ -80,7 +80,7 @@ private static void FixDriverStorePathsInRegistryValueForLeftOvers(RegistryKey r
                                 {
                                     string currentValue = regex.Match(og).Value;
 
-                                    Logging.Log($"Deleting {currentValue} in {registryKey.Name}\\{registryValue}");
+                                    Logging.Log($"Deleting Value (Multi String) {currentValue} in {registryKey.Name}\\{registryValue}");
                                     updated = true;
                                 }
                                 else
@@ -116,14 +116,12 @@ private static void CrawlInRegistryKeyForLeftOvers(RegistryKey registryKey)
         {
             if (registryKey != null)
             {
-                Regex regex = new("(.*oem[0-9]+\\.inf.*)|(.*(QCOM|MSHW|VEN_QCOM&DEV_|VEN_MSHW&DEV_)[0-9A-F]{4}.*)|(.*surface.*duo.*inf)|(.*\\\\qc.*)|(.*\\\\surface.*)");
-                Regex antiRegex = new("(.*QCOM((24[0-9][0-9])|(7002)|(FFE[0-9])).*)|(.*qcap.*)|(.*qcursext.*)|(.*hidspi.*)|(.*ufsstor.*)|(.*sdstor.*)|(.*qc.*_i\\.inf.*)");
 
                 foreach (string subRegistryValue in registryKey.GetValueNames())
                 {
                     if (regex.IsMatch(subRegistryValue) && !antiRegex.IsMatch(subRegistryValue))
                     {
-                        Logging.Log($"Deleting {registryKey.Name}\\{subRegistryValue}");
+                        Logging.Log($"Deleting Value {registryKey.Name}\\{subRegistryValue}");
                         registryKey.DeleteValue(subRegistryValue);
 
                         continue;
@@ -136,7 +134,7 @@ private static void CrawlInRegistryKeyForLeftOvers(RegistryKey registryKey)
                 {
                     if (regex.IsMatch(subRegistryKey) && !antiRegex.IsMatch(subRegistryKey))
                     {
-                        Logging.Log($"Deleting {registryKey.Name}\\{subRegistryKey}");
+                        Logging.Log($"Deleting Sub Key Tree {registryKey.Name}\\{subRegistryKey}");
                         registryKey.DeleteSubKeyTree(subRegistryKey);
 
                         continue;