Add names for running threads.

Skip / Exclude SD Card Readers.
Avoids long timeouts when calling IOCTL_SCSI_PASS_THROUGH for identification purposes.

Author: Blacktempel

DiskInfoToolkit/Storage.cs

@@ -73,7 +73,12 @@ internal Storage(string storageController, StorageDevice sdi)
 
             GetDiskGeometry(handle);
 
-            GetDiskInformation(handle);
+            IsValid = GetDiskInformation(handle);
+
+            if (!IsValid)
+            {
+                return;
+            }
 
             UpdatePartitions(handle);
 
@@ -520,7 +525,7 @@ void GetDiskGeometry(IntPtr handle)
             Marshal.FreeHGlobal(buffer);
         }
 
-        void GetDiskInformation(IntPtr handle)
+        bool GetDiskInformation(IntPtr handle)
         {
             var query = new STORAGE_PROPERTY_QUERY()
             {
@@ -542,10 +547,27 @@ void GetDiskInformation(IntPtr handle)
                 SerialNumber = Marshal.PtrToStringAnsi(outBuffer + descriptor.SerialNumberOffset   );
                 Firmware     = Marshal.PtrToStringAnsi(outBuffer + descriptor.ProductRevisionOffset);
                 BusType      = descriptor.BusType;
+
+                //Is removable media ?
+                if (BusType == StorageBusType.BusTypeUsb
+                 && descriptor.RemovableMedia == 1)
+                {
+                    //Is possibly a SD Card reader ?
+                    if (ModelContains(this, "SD Card"))
+                    {
+                        Marshal.FreeHGlobal(outBuffer);
+                        Marshal.FreeHGlobal(queryPtr);
+
+                        //Skip that
+                        return false;
+                    }
+                }
             }
 
             Marshal.FreeHGlobal(outBuffer);
             Marshal.FreeHGlobal(queryPtr);
+
+            return true;
         }
 
         #endregion

DiskInfoToolkit/StorageManager.cs

@@ -40,11 +40,13 @@ static StorageManager()
 
             //Start device changed listener
             _DevicesChangedThread = new Thread(DevicesChangedListener);
+            _DevicesChangedThread.Name = $"{nameof(StorageManager)}.{nameof(DevicesChangedListener)}";
             _DevicesChangedThread.IsBackground = true;
             _DevicesChangedThread.Start();
 
             //Start message loop
             _MessageLoopThread = new Thread(MessageLoop);
+            _MessageLoopThread.Name = $"{nameof(StorageManager)}.{nameof(MessageLoop)}";
             _MessageLoopThread.IsBackground = true;
             _MessageLoopThread.Start();
         }