windows: Return the correct length from hid_get_feature_report()

signal11 · signal11 · commit 54eb31dc16dc · 2014-08-18T11:17:13.000-04:00
The Windows DeviceIoControl() doesn't account for the report ID byte.

Reported-by: Petr Stehlík &lt;pstehlik@sophics.cz&gt;
diff --git a/windows/hid.c b/windows/hid.c
@@ -791,6 +791,12 @@ int HID_API_EXPORT HID_API_CALL hid_get_feature_report(hid_device *dev, unsigned
 		register_error(dev, "Send Feature Report GetOverLappedResult");
 		return -1;
 	}
+
+	/* bytes_returned does not include the first byte which contains the
+	   report ID. The data buffer actually contains one more byte than
+	   bytes_returned. */
+	bytes_returned++;
+
 	return bytes_returned;
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -791,6 +791,12 @@ int HID_API_EXPORT HID_API_CALL hid_get_feature_report(hid_device *dev, unsigned`
`791`	`791`	`register_error(dev, "Send Feature Report GetOverLappedResult");`
`792`	`792`	`return -1;`
`793`	`793`	`}`
	`794`	`+`
	`795`	`+ /* bytes_returned does not include the first byte which contains the`
	`796`	`+ report ID. The data buffer actually contains one more byte than`
	`797`	`+ bytes_returned. */`
	`798`	`+ bytes_returned++;`
	`799`	`+`
`794`	`800`	`return bytes_returned;`
`795`	`801`	`#endif`
`796`	`802`	`}`