SerialPortStream: Completely remove WMI searches

A test on my T61p shows that inbuilt modems should also work with the CfgMgr, as it also exposes the port name. Issue: DOTNET-698, #136
jcurl · Jan 5, 2023 · c167e01 · c167e01
1 parent d9d8203
commit c167e01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 24 deletions.
diff --git a/code/Native/WinNativeSerial.cs b/code/Native/WinNativeSerial.cs
@@ -14,11 +14,7 @@ namespace RJCP.IO.Ports.Native
     using Trace;
     using Windows;
 
-#if !NETSTANDARD1_5
-    using System.Management;
-    using System.Xml.Linq;
-    using System.Linq;
-#else
+#if NETSTANDARD1_5
     using System.Reflection;
 #endif
 
@@ -135,18 +131,6 @@ public PortDescription[] GetPortDescriptions()
             // works since Windows XP.
             QueryDevices(list);
 
-#if !NETSTANDARD1_5
-            // Look for any modems that are attached to COM ports that aren't listed above
-            using (ManagementObjectSearcher q = new ManagementObjectSearcher("select * from Win32_POTSModem")) {
-                foreach (ManagementObject mObj in q.Get().Cast<ManagementObject>()) {
-                    string k = mObj["AttachedTo"].ToString();
-                    if (list.ContainsKey(k)) {
-                        list[k].Description = mObj["Name"].ToString();
-                    }
-                }
-            }
-#endif
-
             // Get the array and return it
             int i = 0;
             PortDescription[] ports = new PortDescription[list.Count];
@@ -183,7 +167,7 @@ private static string GetDeviceProperty(CfgMgr32.SafeDevInst devInst, CfgMgr32.C
         {
             CfgMgr32.CONFIGRET ret = CfgMgr32.CM_Get_DevNode_Registry_Property(
                 devInst, deviceProperty, out int _, out string buffer);
-            if (ret != CfgMgr32.CONFIGRET.CR_SUCCESS) 
+            if (ret != CfgMgr32.CONFIGRET.CR_SUCCESS)
                 return string.Empty;
 
             return buffer;
@@ -194,7 +178,7 @@ private static RegistryKey GetDeviceKey(CfgMgr32.SafeDevInst devInst)
             CfgMgr32.CONFIGRET ret = CfgMgr32.CM_Open_DevNode_Key(
                 devInst, Kernel32.REGSAM.KEY_READ, 0, CfgMgr32.RegDisposition.OpenExisting,
                 out SafeRegistryHandle key, 0);
-            if (ret != CfgMgr32.CONFIGRET.CR_SUCCESS) 
+            if (ret != CfgMgr32.CONFIGRET.CR_SUCCESS)
                 return null;
             if (key.IsInvalid || key.IsClosed)
                 return null;
@@ -1002,7 +986,7 @@ private void WinIOError()
             throw new IOException(string.Format("Unknown error 0x{0}: {1}", e.ToString("X"), PortName), e);
         }
 
-#region Event Handling
+        #region Event Handling
         private void RegisterEvents()
         {
             m_CommOverlappedIo.CommEvent += CommOverlappedIo_CommEvent;
@@ -1101,9 +1085,9 @@ protected virtual void OnPinChanged(object sender, SerialPinChangedEventArgs arg
                 handler(sender, args);
             }
         }
-#endregion
+        #endregion
 
-#region IDisposable Support
+        #region IDisposable Support
         private bool m_IsDisposed;
 
         /// <summary>
@@ -1133,6 +1117,6 @@ protected virtual void Dispose(bool disposing)
             // with an IntPtr however.
             m_IsDisposed = true;
         }
-#endregion
+        #endregion
     }
 }
diff --git a/code/Native/Windows/CfgMgr32.Types.cs b/code/Native/Windows/CfgMgr32.Types.cs
@@ -2,7 +2,6 @@
 {
     using System;
     using System.Runtime.InteropServices;
-    using Microsoft.Win32.SafeHandles;
 
     internal static partial class CfgMgr32
     {