Update RegistryFixer.cs

WOA-Project · Aug 4, 2024 · f277d5c · f277d5c
1 parent 0e6d268
commit f277d5c
Showing 1 changed file with 34 additions and 6 deletions.
diff --git a/DriverUpdater/RegistryFixer.cs b/DriverUpdater/RegistryFixer.cs
@@ -19,11 +19,21 @@ public static void FixLeftOvers(string DrivePath)
 
         private static bool IsMatching(string value)
         {
+            if (value == null)
+            {
+                return false;
+            }
+
             return regex.IsMatch(value) && !IsAntiMatching(value);
         }
 
         private static bool IsAntiMatching(string value)
         {
+            if (value == null)
+            {
+                return false;
+            }
+
             return antiRegex.IsMatch(value);
         }
 
@@ -171,7 +181,7 @@ private static void CrawlInRegistryKeyForLeftOvers(RegistryKey registryKey)
 
         internal static bool ModifyRegistryForLeftOvers(string systemHivePath, string softwareHivePath)
         {
-            try
+            //try
             {
                 using (RegistryHive hive = new(
                     File.Open(
@@ -181,6 +191,24 @@ internal static bool ModifyRegistryForLeftOvers(string systemHivePath, string so
                     ), DiscUtils.Streams.Ownership.Dispose))
                 {
                     Logging.Log("Processing SYSTEM hive");
+
+                    RegistryKey EnumKey = hive.Root.OpenSubKey("ControlSet001\\Enum");
+                    foreach (string subKey in EnumKey.GetSubKeyNames())
+                    {
+                        if (subKey.Equals("ROOT", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            continue;
+                        }
+
+                        Logging.Log($"Deleting Sub Key Tree {EnumKey.Name}\\{subKey}");
+                        EnumKey.DeleteSubKeyTree(subKey);
+                    }
+
+                    if (hive.Root.OpenSubKey("HardwareConfig") != null)
+                    {
+                        EnumKey.DeleteSubKeyTree("HardwareConfig");
+                    }
+
                     CrawlInRegistryKeyForLeftOvers(hive.Root);
                 }
 
@@ -195,14 +223,14 @@ internal static bool ModifyRegistryForLeftOvers(string systemHivePath, string so
                     CrawlInRegistryKeyForLeftOvers(hive.Root);
                 }
             }
-            catch
-            {
-                return false;
-            }
+            //catch
+            //{
+            //    return false;
+            //}
             return true;
         }
 
-        [GeneratedRegex("""(.*oem[0-9]+\.inf.*)|(.*(QCOM|MSHW|VEN_QCOM&DEV_|VEN_MSHW&DEV_|qcom|mshw|ven_qcom&dev_|ven_mshw&dev_)[0-9A-Fa-f]{4}.*)|(.*surface.*duo.*inf)|(.*\\qc.*)|(.*\\surface.*)""")]
+        [GeneratedRegex("""(.*oem[0-9]+\.inf.*)|(.*(QCOM|MSHW|VEN_QCOM&DEV_|VEN_MSHW&DEV_|qcom|mshw|ven_qcom&dev_|ven_mshw&dev_)[0-9A-Fa-f]{4}.*)|(.*VID_045E&PID_0C01.*)|(.*VID_045E&PID_0C1D.*)|(.*surface.*duo.*inf)|(.*\\qc.*)|(.*\\surface.*)|(.*vid_045e&pid_0c01.*)|(.*vid_045e&pid_0c1d.*)""")]
         private static partial Regex DeviceRegex();
 
         [GeneratedRegex("""(.*(QCOM|qcom)((24[0-9A-Fa-f][0-9A-Fa-f])|(7002)|((FFE|ffe)[0-9A-Fa-f])).*)|(.*qcap.*)|(.*qcursext.*)|(.*hidspi.*)|(.*sdstor.*)|(.*sdbus.*)|(.*storufs.*)|(.*u..chipidea.*)|(.*u..synopsys.*)|(.*qc.*_i\.inf.*)""")]