Ran code formatting on full project

nefarius · nefarius · commit 394fe76194fa · 2025-10-14T19:03:03.000+02:00
diff --git a/src/Drivers/DriverStore.cs b/src/Drivers/DriverStore.cs
@@ -29,10 +29,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading;
 
-using Windows.Win32;
-using Windows.Win32.Devices.Properties;
 using Windows.Win32.Foundation;
 
 using Nefarius.Utilities.DeviceManagement.Util;
diff --git a/src/Exceptions/PnPDeviceNotFoundException.cs b/src/Exceptions/PnPDeviceNotFoundException.cs
@@ -1,5 +1,4 @@
-﻿#nullable enable
-using System;
+﻿using System;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Nefarius.Utilities.DeviceManagement.Exceptions;
@@ -14,7 +13,7 @@ public class PnPDeviceNotFoundException : Exception
     internal PnPDeviceNotFoundException() : base("The desired device instance was not found on the system.")
     {
     }
-    
+
     internal PnPDeviceNotFoundException(string instanceId) : this()
     {
         InstanceId = instanceId;
diff --git a/src/Exceptions/Win32Exception.cs b/src/Exceptions/Win32Exception.cs
@@ -1,6 +1,4 @@
-﻿#nullable enable
-
-using System;
+﻿using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
diff --git a/src/Nefarius.Utilities.DeviceManagement.csproj b/src/Nefarius.Utilities.DeviceManagement.csproj
@@ -9,19 +9,20 @@
         <PackageProjectUrl>https://github.com/nefarius/Nefarius.Utilities.DeviceManagement</PackageProjectUrl>
         <Description>Managed wrappers around SetupAPI, Cfgmgr32, NewDev and DrvStore native APIs on Windows.</Description>
         <NoWarn>CA1416</NoWarn>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <PropertyGroup>
         <MinVerTagPrefix>v</MinVerTagPrefix>
     </PropertyGroup>
-    
+
     <ItemGroup>
-        <Compile Remove="Generator\**" />
-        <Compile Remove="Tests\**" />
-        <EmbeddedResource Remove="Generator\**" />
-        <EmbeddedResource Remove="Tests\**" />
-        <None Remove="Generator\**" />
-        <None Remove="Tests\**" />
+        <Compile Remove="Generator\**"/>
+        <Compile Remove="Tests\**"/>
+        <EmbeddedResource Remove="Generator\**"/>
+        <EmbeddedResource Remove="Tests\**"/>
+        <None Remove="Generator\**"/>
+        <None Remove="Tests\**"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -35,22 +36,22 @@
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="MinVer" Version="6.0.0">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="System.Memory" Version="4.6.3" />
+        <PackageReference Include="System.Memory" Version="4.6.3"/>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
-        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="Generator\DeviceManagementPropertiesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="Generator\DeviceManagementPropertiesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/PnP/Devcon.cs b/src/PnP/Devcon.cs
@@ -395,7 +395,8 @@ public static unsafe bool Remove(Guid classGuid, string instanceId, out bool reb
                 ref classGuid,
                 IntPtr.Zero,
                 HWND.Null,
-                (int)SETUP_DI_GET_CLASS_DEVS_FLAGS.DIGCF_PRESENT | (int)SETUP_DI_GET_CLASS_DEVS_FLAGS.DIGCF_DEVICEINTERFACE
+                (int)SETUP_DI_GET_CLASS_DEVS_FLAGS.DIGCF_PRESENT |
+                (int)SETUP_DI_GET_CLASS_DEVS_FLAGS.DIGCF_DEVICEINTERFACE
             );
 
             if (SetupApi.SetupDiOpenDeviceInfo(
@@ -526,7 +527,8 @@ public static unsafe bool Update(string hardwareId, string fullInfPath,
             HWND.Null,
             hardwareId,
             fullInfPath,
-            UPDATEDRIVERFORPLUGANDPLAYDEVICES_FLAGS.INSTALLFLAG_FORCE | UPDATEDRIVERFORPLUGANDPLAYDEVICES_FLAGS.INSTALLFLAG_NONINTERACTIVE,
+            UPDATEDRIVERFORPLUGANDPLAYDEVICES_FLAGS.INSTALLFLAG_FORCE |
+            UPDATEDRIVERFORPLUGANDPLAYDEVICES_FLAGS.INSTALLFLAG_NONINTERACTIVE,
             &reboot
         );
 
diff --git a/src/PnP/DeviceClassFilters.cs b/src/PnP/DeviceClassFilters.cs
@@ -1,16 +1,13 @@
-﻿#nullable enable
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
 
 using Windows.Win32;
 using Windows.Win32.Foundation;
-using Windows.Win32.Security;
 using Windows.Win32.Storage.FileSystem;
 using Windows.Win32.System.Registry;
-using Windows.Win32.System.Services;
 
 using Microsoft.Win32.SafeHandles;
 
@@ -140,7 +137,8 @@ private static unsafe void AddFiltersEntry(Guid classGuid, string filter, string
         const uint serviceFlags = (uint)FILE_ACCESS_RIGHTS.STANDARD_RIGHTS_REQUIRED | PInvoke.SC_MANAGER_CONNECT |
                                   PInvoke.SC_MANAGER_ENUMERATE_SERVICE;
 
-        using CloseServiceHandleSafeHandle? serviceManager = PInvoke.OpenSCManager(null, "ServicesActive", serviceFlags);
+        using CloseServiceHandleSafeHandle?
+            serviceManager = PInvoke.OpenSCManager(null, "ServicesActive", serviceFlags);
 
         if (serviceManager.IsInvalid)
         {
diff --git a/src/PnP/DeviceNotificationListener.cs b/src/PnP/DeviceNotificationListener.cs
@@ -269,7 +269,7 @@ private unsafe void Start(object parameter)
         ListenerItem listenerItem = (ListenerItem)parameter;
         string className = GenerateRandomString(); // random string to avoid conflicts
         string windowName = GenerateRandomString();
-        using FreeLibrarySafeHandle hInst = PInvoke.GetModuleHandle((string)null);
+        using FreeLibrarySafeHandle hInst = PInvoke.GetModuleHandle(null);
 
         WNDCLASSEXW windowClass = new()
         {
diff --git a/src/PnP/DevicePropertyKey.cs b/src/PnP/DevicePropertyKey.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Diagnostics.CodeAnalysis;
 
-using Windows.Win32.Devices.Properties;
 using Windows.Win32.Foundation;
 
 namespace Nefarius.Utilities.DeviceManagement.PnP;
diff --git a/src/PnP/IPnPDevice.cs b/src/PnP/IPnPDevice.cs
@@ -1,5 +1,4 @@
-﻿#nullable enable
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
@@ -124,7 +123,7 @@ public interface IPnPDevice
     ///     Gets whether a reboot is required for the changes to take effect or not.
     /// </param>
     void InstallCustomDriver(string infName, out bool rebootRequired);
-    
+
     /// <summary>
     ///     Uninstalls this device instance. Unlike <see cref="Remove" /> this call will unload and revert the device function
     ///     driver to the best available compatible candidate on next device boot.
@@ -137,7 +136,7 @@ public interface IPnPDevice
     /// <exception cref="Win32Exception"></exception>
     /// <exception cref="ArgumentOutOfRangeException"></exception>
     void Uninstall();
-    
+
     /// <summary>
     ///     Uninstalls this device instance. Unlike <see cref="Remove" /> this call will unload and revert the device function
     ///     driver to the best available compatible candidate on next device boot.
diff --git a/src/PnP/PnPDevice.Common.cs b/src/PnP/PnPDevice.Common.cs
@@ -1,5 +1,4 @@
-﻿#nullable enable
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
 
 namespace Nefarius.Utilities.DeviceManagement.PnP;
diff --git a/src/PnP/PnPDevice.Properties.cs b/src/PnP/PnPDevice.Properties.cs
@@ -1,5 +1,4 @@
-﻿#nullable enable
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -166,7 +165,7 @@ out uint size
             {
                 return (T)(object)Marshal.PtrToStructure<Guid>(buffer);
             }
-            
+
             // BOOLEAN
             if (managedType == typeof(bool))
             {
@@ -274,7 +273,7 @@ public unsafe void SetProperty<T>(DevicePropertyKey propertyKey, T propertyValue
             Marshal.StructureToPtr(value, buffer, false);
             propBufSize = (uint)Marshal.SizeOf(managedType);
         }
-        
+
         // bool
         if (managedType == typeof(bool))
         {
diff --git a/src/PnP/PnPDevice.Static.cs b/src/PnP/PnPDevice.Static.cs
@@ -1,10 +1,8 @@
-﻿#nullable enable
-using System;
+﻿using System;
 using System.Diagnostics.CodeAnalysis;
 
 using Windows.Win32;
 using Windows.Win32.Devices.DeviceAndDriverInstallation;
-using Windows.Win32.Devices.Properties;
 using Windows.Win32.Foundation;
 
 using Nefarius.Utilities.DeviceManagement.Exceptions;
@@ -24,7 +22,7 @@ public partial class PnPDevice
     /// <returns>A <see cref="PnPDevice" />.</returns>
     /// <exception cref="PnPDeviceNotFoundException">The desired device instance was not found on the system.</exception>
     /// <exception cref="ConfigManagerException">Device information lookup failed.</exception>
-    /// <exception cref="ArgumentOutOfRangeException">The supplied <paramref name="flags"/> value was invalid.</exception>
+    /// <exception cref="ArgumentOutOfRangeException">The supplied <paramref name="flags" /> value was invalid.</exception>
     public static PnPDevice GetDeviceByInstanceId(string instanceId,
         DeviceLocationFlags flags = DeviceLocationFlags.Normal)
     {
diff --git a/src/PnP/PnPDevice.cs b/src/PnP/PnPDevice.cs
@@ -1,14 +1,11 @@
-﻿#nullable enable
-
-using System;
+﻿using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 
 using Windows.Win32;
 using Windows.Win32.Devices.DeviceAndDriverInstallation;
-using Windows.Win32.Devices.Properties;
 using Windows.Win32.Foundation;
 
 using Nefarius.Utilities.DeviceManagement.Exceptions;
@@ -38,7 +35,7 @@ public partial class PnPDevice : IPnPDevice, IEquatable<PnPDevice>
     /// <param name="flags">The <see cref="DeviceLocationFlags" /> influencing search behavior.</param>
     /// <exception cref="PnPDeviceNotFoundException">The desired device instance was not found on the system.</exception>
     /// <exception cref="ConfigManagerException">Device information lookup failed.</exception>
-    /// <exception cref="ArgumentOutOfRangeException">The supplied <paramref name="flags"/> value was invalid.</exception>
+    /// <exception cref="ArgumentOutOfRangeException">The supplied <paramref name="flags" /> value was invalid.</exception>
     protected unsafe PnPDevice(string instanceId, DeviceLocationFlags flags)
     {
         InstanceId = instanceId;
@@ -175,22 +172,21 @@ public unsafe void Remove()
     /// <param name="excludeIfMatches">Returns false if the given predicate is true.</param>
     /// <returns>True if this device originates from an emulator, false otherwise.</returns>
     /// <example>
-    /// bool isVirtualDevice = pnpDevice.IsVirtual(pDevice =&gt;
-    /// {
-    ///     List&lt;string&gt;? hardwareIds = pDevice.GetProperty&lt;string[]&gt;(DevicePropertyKey.Device_HardwareIds).ToList();
-    /// 
+    ///     bool isVirtualDevice = pnpDevice.IsVirtual(pDevice =&gt;
+    ///     {
+    ///     List&lt;string&gt;? hardwareIds = pDevice.GetProperty&lt;string[]&gt;
+    ///     (DevicePropertyKey.Device_HardwareIds).ToList();
     ///     // hardware IDs of root hubs/controllers that emit supported virtual devices as sources
     ///     string[] excludedIds =
     ///     {
-    /// 		@"ROOT\HIDGAMEMAP", // reWASD
-    /// 		@"ROOT\VHUSB3HC", // VirtualHere
-    /// 		@"Nefarius\ViGEmBus\Gen1", // ViGemBus v1 
-    /// 		@"Nefarius\ViGEmBus\Gen2", // ViGemBus v2 
-    /// 		@"Nefarius\VirtualPad" // VirtualPad
-    /// 	};
-    /// 
+    ///     @"ROOT\HIDGAMEMAP", // reWASD
+    ///     @"ROOT\VHUSB3HC", // VirtualHere
+    ///     @"Nefarius\ViGEmBus\Gen1", // ViGemBus v1
+    ///     @"Nefarius\ViGEmBus\Gen2", // ViGemBus v2
+    ///     @"Nefarius\VirtualPad" // VirtualPad
+    ///     };
     ///     return hardwareIds.Any(id =&gt; excludedIds.Contains(id.ToUpperInvariant()));
-    /// });
+    ///     });
     /// </example>
     public bool IsVirtual(Func<IPnPDevice, bool>? excludeIfMatches = default)
     {
@@ -263,7 +259,7 @@ public unsafe void InstallNullDriver(out bool rebootRequired)
 
         try
         {
-            for (UInt32 devIndex = 0; SetupApi.SetupDiEnumDeviceInfo(hDevInfo, devIndex, &spDevinfoData); devIndex++)
+            for (uint devIndex = 0; SetupApi.SetupDiEnumDeviceInfo(hDevInfo, devIndex, &spDevinfoData); devIndex++)
             {
                 DEVPROPKEY instanceProp = DevicePropertyKey.Device_InstanceId.ToCsWin32Type();
 
@@ -580,7 +576,7 @@ public unsafe void Uninstall(out bool rebootRequired)
             throw new Win32Exception("Failed to get devices for all classes");
         }
 
-        for (UInt32 devIndex = 0; SetupApi.SetupDiEnumDeviceInfo(hDevInfo, devIndex, &spDevinfoData); devIndex++)
+        for (uint devIndex = 0; SetupApi.SetupDiEnumDeviceInfo(hDevInfo, devIndex, &spDevinfoData); devIndex++)
         {
             DEVPROPKEY instanceProp = DevicePropertyKey.Device_InstanceId.ToCsWin32Type();
 
diff --git a/src/PnP/SetupApi.cs b/src/PnP/SetupApi.cs
diff --git a/src/PnP/UsbPnPDevice.cs b/src/PnP/UsbPnPDevice.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-#nullable enable`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using System.Diagnostics.CodeAnalysis;`
`4`	`3`
`5`	`4`	`namespace Nefarius.Utilities.DeviceManagement.Exceptions;`
`@@ -14,7 +13,7 @@ public class PnPDeviceNotFoundException : Exception`
`14`	`13`	`internal PnPDeviceNotFoundException() : base("The desired device instance was not found on the system.")`
`15`	`14`	`{`
`16`	`15`	`}`
`17`		`-`
	`16`	`+`
`18`	`17`	`internal PnPDeviceNotFoundException(string instanceId) : this()`
`19`	`18`	`{`
`20`	`19`	`InstanceId = instanceId;`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ private unsafe void Start(object parameter)`
`269`	`269`	`ListenerItem listenerItem = (ListenerItem)parameter;`
`270`	`270`	`string className = GenerateRandomString(); // random string to avoid conflicts`
`271`	`271`	`string windowName = GenerateRandomString();`
`272`		`- using FreeLibrarySafeHandle hInst = PInvoke.GetModuleHandle((string)null);`
	`272`	`+ using FreeLibrarySafeHandle hInst = PInvoke.GetModuleHandle(null);`
`273`	`273`
`274`	`274`	`WNDCLASSEXW windowClass = new()`
`275`	`275`	`{`