Add friendly_name field for usb device on windows

src/enumeration.rs

@@ -46,6 +46,9 @@ pub struct DeviceInfo {
     #[cfg(target_os = "windows")]
     pub(crate) driver: Option<String>,
 
+    #[cfg(target_os = "windows")]
+    pub(crate) friendly_name: Option<String>,
+
     #[cfg(target_os = "macos")]
     pub(crate) registry_id: u64,
 
@@ -143,6 +146,12 @@ impl DeviceInfo {
         self.port_number
     }
 
+    /// *(Windows-only)* Friendly name
+    #[cfg(target_os = "windows")]
+    pub fn friendly_name(&self) -> Option<&str> {
+        self.friendly_name.as_deref()
+    }
+
     /// Path of port numbers identifying the port where the device is connected.
     ///
     /// Together with the bus ID, it identifies a physical port. The path is
@@ -322,6 +331,7 @@ impl std::fmt::Debug for DeviceInfo {
 
         #[cfg(target_os = "windows")]
         {
+            s.field("friendly_name", &self.friendly_name);
             s.field("instance_id", &self.instance_id);
             s.field("parent_instance_id", &self.parent_instance_id);
             s.field("location_paths", &self.location_paths);

src/platform/windows_winusb/enumeration.rs

@@ -7,8 +7,9 @@ use log::debug;
 use windows_sys::Win32::Devices::{
     Properties::{
         DEVPKEY_Device_Address, DEVPKEY_Device_BusReportedDeviceDesc, DEVPKEY_Device_CompatibleIds,
-        DEVPKEY_Device_DeviceDesc, DEVPKEY_Device_HardwareIds, DEVPKEY_Device_InstanceId,
-        DEVPKEY_Device_LocationPaths, DEVPKEY_Device_Parent, DEVPKEY_Device_Service,
+        DEVPKEY_Device_DeviceDesc, DEVPKEY_Device_FriendlyName, DEVPKEY_Device_HardwareIds,
+        DEVPKEY_Device_InstanceId, DEVPKEY_Device_LocationPaths, DEVPKEY_Device_Parent,
+        DEVPKEY_Device_Service,
     },
     Usb::{GUID_DEVINTERFACE_USB_DEVICE, GUID_DEVINTERFACE_USB_HUB},
 };
@@ -68,6 +69,10 @@ pub fn probe_device(devinst: DevInst) -> Option<DeviceInfo> {
         .and_then(|s| s.into_string().ok());
     // DEVPKEY_Device_Manufacturer exists but is often wrong and appears not to be read from the string descriptor but the .inf file
 
+    let friendly_name = devinst
+        .get_property::<OsString>(DEVPKEY_Device_FriendlyName)
+        .and_then(|s| s.into_string().ok());
+
     let serial_number = if info.device_desc.iSerialNumber != 0 {
         // Experimentally confirmed, the string descriptor is cached and this does
         // not perform IO. However, the language ID list is not cached, so we
@@ -143,6 +148,7 @@ pub fn probe_device(devinst: DevInst) -> Option<DeviceInfo> {
         speed: info.speed,
         manufacturer_string: None,
         product_string,
+        friendly_name,
         serial_number,
         interfaces,
     })