Fix: Filtering on Windows

timfish · timfish · commit f7d7ede897a1 · 2021-05-10T15:33:55.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 name = "usb_enumeration"
 readme = "README.md"
 repository = "https://github.com/meatysolutions/usb_enumeration"
-version = "0.1.1"
+version = "0.1.2"
 
 [lib]
 crate-type = ["lib"]
diff --git a/src/windows.rs b/src/windows.rs
@@ -28,6 +28,7 @@ pub fn enumerate_platform(vid: Option<u16>, pid: Option<u16>) -> Vec<UsbDevice>
 
     let mut i = 0;
     while unsafe { SetupDiEnumDeviceInfo(dev_info, i, &mut dev_info_data) } > 0 {
+        i += 1;
         let mut buf: Vec<u8> = vec![0; 1000];
 
         if unsafe {
@@ -94,8 +95,6 @@ pub fn enumerate_platform(vid: Option<u16>, pid: Option<u16>) -> Vec<UsbDevice>
                 }
             }
         }
-
-        i += 1;
     }
 
     unsafe { SetupDiDestroyDeviceInfoList(dev_info) };

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ pub fn enumerate_platform(vid: Option<u16>, pid: Option<u16>) -> Vec<UsbDevice>`
`28`	`28`
`29`	`29`	`let mut i = 0;`
`30`	`30`	`while unsafe { SetupDiEnumDeviceInfo(dev_info, i, &mut dev_info_data) } > 0 {`
	`31`	`+ i += 1;`
`31`	`32`	`let mut buf: Vec<u8> = vec![0; 1000];`
`32`	`33`
`33`	`34`	`if unsafe {`
`@@ -94,8 +95,6 @@ pub fn enumerate_platform(vid: Option<u16>, pid: Option<u16>) -> Vec<UsbDevice>`
`94`	`95`	`}`
`95`	`96`	`}`
`96`	`97`	`}`
`97`		`-`
`98`		`- i += 1;`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`unsafe { SetupDiDestroyDeviceInfoList(dev_info) };`