Parcourir la source

支持遍历USB类型

wugren il y a 3 ans
Parent
commit
9359ab8b98
4 fichiers modifiés avec 1067 ajouts et 1046 suppressions
  1. 345 347
      hidapi/hidapi/hidapi.h
  2. 683 659
      hidapi/windows/hid.c
  3. 26 18
      package.json
  4. 13 22
      src/HID.cc

+ 345 - 347
hidapi/hidapi/hidapi.h

@@ -17,7 +17,7 @@
  files located at the root of the source distribution.
  These files may also be found in the public source
  code repository located at:
-		http://github.com/signal11/hidapi .
+        http://github.com/signal11/hidapi .
 ********************************************************/
 
 /** @file
@@ -30,11 +30,11 @@
 #include <wchar.h>
 
 #ifdef _WIN32
-#define HID_API_EXPORT __declspec(dllexport)
-#define HID_API_CALL
+      #define HID_API_EXPORT __declspec(dllexport)
+      #define HID_API_CALL
 #else
-#define HID_API_EXPORT /**< API export macro */
-#define HID_API_CALL /**< API call macro */
+      #define HID_API_EXPORT /**< API export macro */
+      #define HID_API_CALL /**< API call macro */
 #endif
 
 #define HID_API_EXPORT_CALL HID_API_EXPORT HID_API_CALL /**< API export and call macro*/
@@ -42,348 +42,346 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	struct hid_device_;
-	typedef struct hid_device_ hid_device; /**< opaque hidapi structure */
-
-	/** hidapi info structure */
-	struct hid_device_info {
-		/** Platform-specific device path */
-		char* path;
-		/** Device Vendor ID */
-		unsigned short vendor_id;
-		/** Device Product ID */
-		unsigned short product_id;
-		/** Serial Number */
-		wchar_t* serial_number;
-		/** Device Release Number in binary-coded decimal,
-			also known as Device Version Number */
-		unsigned short release_number;
-		/** Manufacturer String */
-		wchar_t* manufacturer_string;
-		/** Product string */
-		wchar_t* product_string;
-		/** Usage Page for this Device/Interface
-			(Windows/Mac only). */
-		unsigned short usage_page;
-		/** Usage for this Device/Interface
-			(Windows/Mac only).*/
-		unsigned short usage;
-		/** The USB interface which this logical device
-			represents. Valid on both Linux implementations
-			in all cases, and valid on the Windows implementation
-			only if the device contains more than one interface. */
-		int interface_number;
-
-		char* hardware_id;
-
-		/** Pointer to the next device */
-		struct hid_device_info* next;
-	};
-
-
-	/** @brief Initialize the HIDAPI library.
-
-		This function initializes the HIDAPI library. Calling it is not
-		strictly necessary, as it will be called automatically by
-		hid_enumerate() and any of the hid_open_*() functions if it is
-		needed.  This function should be called at the beginning of
-		execution however, if there is a chance of HIDAPI handles
-		being opened by different threads simultaneously.
-
-		@ingroup API
-
-		@returns
-			This function returns 0 on success and -1 on error.
-	*/
-	int HID_API_EXPORT HID_API_CALL hid_init(void);
-
-	/** @brief Finalize the HIDAPI library.
-
-		This function frees all of the static data associated with
-		HIDAPI. It should be called at the end of execution to avoid
-		memory leaks.
-
-		@ingroup API
-
-		@returns
-			This function returns 0 on success and -1 on error.
-	*/
-	int HID_API_EXPORT HID_API_CALL hid_exit(void);
-
-	/** @brief Enumerate the HID Devices.
-
-		This function returns a linked list of all the HID devices
-		attached to the system which match vendor_id and product_id.
-		If @p vendor_id is set to 0 then any vendor matches.
-		If @p product_id is set to 0 then any product matches.
-		If @p vendor_id and @p product_id are both set to 0, then
-		all HID devices will be returned.
-
-		@ingroup API
-		@param vendor_id The Vendor ID (VID) of the types of device
-			to open.
-		@param product_id The Product ID (PID) of the types of
-			device to open.
-
-		@returns
-			This function returns a pointer to a linked list of type
-			struct #hid_device, containing information about the HID devices
-			attached to the system, or NULL in the case of failure. Free
-			this linked list by calling hid_free_enumeration().
-	*/
-	struct hid_device_info HID_API_EXPORT* HID_API_CALL hid_enumerate(unsigned short vendor_id, unsigned short product_id);
-
-	/** @brief Free an enumeration Linked List
-
-		This function frees a linked list created by hid_enumerate().
-
-		@ingroup API
-		@param devs Pointer to a list of struct_device returned from
-				  hid_enumerate().
-	*/
-	void  HID_API_EXPORT HID_API_CALL hid_free_enumeration(struct hid_device_info* devs);
-
-	/** @brief Open a HID device using a Vendor ID (VID), Product ID
-		(PID) and optionally a serial number.
-
-		If @p serial_number is NULL, the first device with the
-		specified VID and PID is opened.
-
-		@ingroup API
-		@param vendor_id The Vendor ID (VID) of the device to open.
-		@param product_id The Product ID (PID) of the device to open.
-		@param serial_number The Serial Number of the device to open
-						   (Optionally NULL).
-
-		@returns
-			This function returns a pointer to a #hid_device object on
-			success or NULL on failure.
-	*/
-	HID_API_EXPORT hid_device* HID_API_CALL hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t* serial_number);
-
-	/** @brief Open a HID device by its path name.
-
-		The path name be determined by calling hid_enumerate(), or a
-		platform-specific path name can be used (eg: /dev/hidraw0 on
-		Linux).
-
-		@ingroup API
-		@param path The path name of the device to open
-
-		@returns
-			This function returns a pointer to a #hid_device object on
-			success or NULL on failure.
-	*/
-	HID_API_EXPORT hid_device* HID_API_CALL hid_open_path(const char* path);
-
-	/** @brief Write an Output report to a HID device.
-
-		The first byte of @p data[] must contain the Report ID. For
-		devices which only support a single report, this must be set
-		to 0x0. The remaining bytes contain the report data. Since
-		the Report ID is mandatory, calls to hid_write() will always
-		contain one more byte than the report contains. For example,
-		if a hid report is 16 bytes long, 17 bytes must be passed to
-		hid_write(), the Report ID (or 0x0, for devices with a
-		single report), followed by the report data (16 bytes). In
-		this example, the length passed in would be 17.
-
-		hid_write() will send the data on the first OUT endpoint, if
-		one exists. If it does not, it will send the data through
-		the Control Endpoint (Endpoint 0).
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param data The data to send, including the report number as
-			the first byte.
-		@param length The length in bytes of the data to send.
-
-		@returns
-			This function returns the actual number of bytes written and
-			-1 on error.
-	*/
-	int  HID_API_EXPORT HID_API_CALL hid_write(hid_device* device, const unsigned char* data, size_t length);
-
-	/** @brief Read an Input report from a HID device with timeout.
-
-		Input reports are returned
-		to the host through the INTERRUPT IN endpoint. The first byte will
-		contain the Report number if the device uses numbered reports.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param data A buffer to put the read data into.
-		@param length The number of bytes to read. For devices with
-			multiple reports, make sure to read an extra byte for
-			the report number.
-		@param milliseconds timeout in milliseconds or -1 for blocking wait.
-
-		@returns
-			This function returns the actual number of bytes read and
-			-1 on error. If no packet was available to be read within
-			the timeout period, this function returns 0.
-	*/
-	int HID_API_EXPORT HID_API_CALL hid_read_timeout(hid_device* dev, unsigned char* data, size_t length, int milliseconds);
-
-	/** @brief Read an Input report from a HID device.
-
-		Input reports are returned
-		to the host through the INTERRUPT IN endpoint. The first byte will
-		contain the Report number if the device uses numbered reports.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param data A buffer to put the read data into.
-		@param length The number of bytes to read. For devices with
-			multiple reports, make sure to read an extra byte for
-			the report number.
-
-		@returns
-			This function returns the actual number of bytes read and
-			-1 on error. If no packet was available to be read and
-			the handle is in non-blocking mode, this function returns 0.
-	*/
-	int  HID_API_EXPORT HID_API_CALL hid_read(hid_device* device, unsigned char* data, size_t length);
-
-	/** @brief Set the device handle to be non-blocking.
-
-		In non-blocking mode calls to hid_read() will return
-		immediately with a value of 0 if there is no data to be
-		read. In blocking mode, hid_read() will wait (block) until
-		there is data to read before returning.
-
-		Nonblocking can be turned on and off at any time.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param nonblock enable or not the nonblocking reads
-		 - 1 to enable nonblocking
-		 - 0 to disable nonblocking.
-
-		@returns
-			This function returns 0 on success and -1 on error.
-	*/
-	int  HID_API_EXPORT HID_API_CALL hid_set_nonblocking(hid_device* device, int nonblock);
-
-	/** @brief Send a Feature report to the device.
-
-		Feature reports are sent over the Control endpoint as a
-		Set_Report transfer.  The first byte of @p data[] must
-		contain the Report ID. For devices which only support a
-		single report, this must be set to 0x0. The remaining bytes
-		contain the report data. Since the Report ID is mandatory,
-		calls to hid_send_feature_report() will always contain one
-		more byte than the report contains. For example, if a hid
-		report is 16 bytes long, 17 bytes must be passed to
-		hid_send_feature_report(): the Report ID (or 0x0, for
-		devices which do not use numbered reports), followed by the
-		report data (16 bytes). In this example, the length passed
-		in would be 17.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param data The data to send, including the report number as
-			the first byte.
-		@param length The length in bytes of the data to send, including
-			the report number.
-
-		@returns
-			This function returns the actual number of bytes written and
-			-1 on error.
-	*/
-	int HID_API_EXPORT HID_API_CALL hid_send_feature_report(hid_device* device, const unsigned char* data, size_t length);
-
-	/** @brief Get a feature report from a HID device.
-
-		Set the first byte of @p data[] to the Report ID of the
-		report to be read.  Make sure to allow space for this
-		extra byte in @p data[]. Upon return, the first byte will
-		still contain the Report ID, and the report data will
-		start in data[1].
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param data A buffer to put the read data into, including
-			the Report ID. Set the first byte of @p data[] to the
-			Report ID of the report to be read, or set it to zero
-			if your device does not use numbered reports.
-		@param length The number of bytes to read, including an
-			extra byte for the report ID. The buffer can be longer
-			than the actual report.
-
-		@returns
-			This function returns the number of bytes read plus
-			one for the report ID (which is still in the first
-			byte), or -1 on error.
-	*/
-	int HID_API_EXPORT HID_API_CALL hid_get_feature_report(hid_device* device, unsigned char* data, size_t length);
-
-	/** @brief Close a HID device.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-	*/
-	void HID_API_EXPORT HID_API_CALL hid_close(hid_device* device);
-
-	/** @brief Get The Manufacturer String from a HID device.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param string A wide string buffer to put the data into.
-		@param maxlen The length of the buffer in multiples of wchar_t.
-
-		@returns
-			This function returns 0 on success and -1 on error.
-	*/
-	int HID_API_EXPORT_CALL hid_get_manufacturer_string(hid_device* device, wchar_t* string, size_t maxlen);
-
-	/** @brief Get The Product String from a HID device.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param string A wide string buffer to put the data into.
-		@param maxlen The length of the buffer in multiples of wchar_t.
-
-		@returns
-			This function returns 0 on success and -1 on error.
-	*/
-	int HID_API_EXPORT_CALL hid_get_product_string(hid_device* device, wchar_t* string, size_t maxlen);
-
-	/** @brief Get The Serial Number String from a HID device.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param string A wide string buffer to put the data into.
-		@param maxlen The length of the buffer in multiples of wchar_t.
-
-		@returns
-			This function returns 0 on success and -1 on error.
-	*/
-	int HID_API_EXPORT_CALL hid_get_serial_number_string(hid_device* device, wchar_t* string, size_t maxlen);
-
-	/** @brief Get a string from a HID device, based on its string index.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-		@param string_index The index of the string to get.
-		@param string A wide string buffer to put the data into.
-		@param maxlen The length of the buffer in multiples of wchar_t.
-
-		@returns
-			This function returns 0 on success and -1 on error.
-	*/
-	int HID_API_EXPORT_CALL hid_get_indexed_string(hid_device* device, int string_index, wchar_t* string, size_t maxlen);
-
-	/** @brief Get a string describing the last error which occurred.
-
-		@ingroup API
-		@param device A device handle returned from hid_open().
-
-		@returns
-			This function returns a string containing the last error
-			which occurred or NULL if none has occurred.
-	*/
-	HID_API_EXPORT const wchar_t* HID_API_CALL hid_error(hid_device* device);
+		struct hid_device_;
+		typedef struct hid_device_ hid_device; /**< opaque hidapi structure */
+
+		/** hidapi info structure */
+		struct hid_device_info {
+			/** Platform-specific device path */
+			char *path;
+			/** Device Vendor ID */
+			unsigned short vendor_id;
+			/** Device Product ID */
+			unsigned short product_id;
+			/** Serial Number */
+			wchar_t *serial_number;
+			/** Device Release Number in binary-coded decimal,
+			    also known as Device Version Number */
+			unsigned short release_number;
+			/** Manufacturer String */
+			wchar_t *manufacturer_string;
+			/** Product string */
+			wchar_t *product_string;
+			/** Usage Page for this Device/Interface
+			    (Windows/Mac only). */
+			unsigned short usage_page;
+			/** Usage for this Device/Interface
+			    (Windows/Mac only).*/
+			unsigned short usage;
+			/** The USB interface which this logical device
+			    represents. Valid on both Linux implementations
+			    in all cases, and valid on the Windows implementation
+			    only if the device contains more than one interface. */
+			int interface_number;
+
+			/** Pointer to the next device */
+			struct hid_device_info *next;
+		};
+
+
+		/** @brief Initialize the HIDAPI library.
+
+			This function initializes the HIDAPI library. Calling it is not
+			strictly necessary, as it will be called automatically by
+			hid_enumerate() and any of the hid_open_*() functions if it is
+			needed.  This function should be called at the beginning of
+			execution however, if there is a chance of HIDAPI handles
+			being opened by different threads simultaneously.
+			
+			@ingroup API
+
+			@returns
+				This function returns 0 on success and -1 on error.
+		*/
+		int HID_API_EXPORT HID_API_CALL hid_init(void);
+
+		/** @brief Finalize the HIDAPI library.
+
+			This function frees all of the static data associated with
+			HIDAPI. It should be called at the end of execution to avoid
+			memory leaks.
+
+			@ingroup API
+
+		    @returns
+				This function returns 0 on success and -1 on error.
+		*/
+		int HID_API_EXPORT HID_API_CALL hid_exit(void);
+
+		/** @brief Enumerate the HID Devices.
+
+			This function returns a linked list of all the HID devices
+			attached to the system which match vendor_id and product_id.
+			If @p vendor_id is set to 0 then any vendor matches.
+			If @p product_id is set to 0 then any product matches.
+			If @p vendor_id and @p product_id are both set to 0, then
+			all HID devices will be returned.
+
+			@ingroup API
+			@param vendor_id The Vendor ID (VID) of the types of device
+				to open.
+			@param product_id The Product ID (PID) of the types of
+				device to open.
+
+		    @returns
+		    	This function returns a pointer to a linked list of type
+		    	struct #hid_device, containing information about the HID devices
+		    	attached to the system, or NULL in the case of failure. Free
+		    	this linked list by calling hid_free_enumeration().
+		*/
+		struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned short vendor_id, unsigned short product_id);
+
+		/** @brief Free an enumeration Linked List
+
+		    This function frees a linked list created by hid_enumerate().
+
+			@ingroup API
+		    @param devs Pointer to a list of struct_device returned from
+		    	      hid_enumerate().
+		*/
+		void  HID_API_EXPORT HID_API_CALL hid_free_enumeration(struct hid_device_info *devs);
+
+		/** @brief Open a HID device using a Vendor ID (VID), Product ID
+			(PID) and optionally a serial number.
+
+			If @p serial_number is NULL, the first device with the
+			specified VID and PID is opened.
+
+			@ingroup API
+			@param vendor_id The Vendor ID (VID) of the device to open.
+			@param product_id The Product ID (PID) of the device to open.
+			@param serial_number The Serial Number of the device to open
+				               (Optionally NULL).
+
+			@returns
+				This function returns a pointer to a #hid_device object on
+				success or NULL on failure.
+		*/
+		HID_API_EXPORT hid_device * HID_API_CALL hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t *serial_number);
+
+		/** @brief Open a HID device by its path name.
+
+			The path name be determined by calling hid_enumerate(), or a
+			platform-specific path name can be used (eg: /dev/hidraw0 on
+			Linux).
+
+			@ingroup API
+		    @param path The path name of the device to open
+
+			@returns
+				This function returns a pointer to a #hid_device object on
+				success or NULL on failure.
+		*/
+		HID_API_EXPORT hid_device * HID_API_CALL hid_open_path(const char *path);
+
+		/** @brief Write an Output report to a HID device.
+
+			The first byte of @p data[] must contain the Report ID. For
+			devices which only support a single report, this must be set
+			to 0x0. The remaining bytes contain the report data. Since
+			the Report ID is mandatory, calls to hid_write() will always
+			contain one more byte than the report contains. For example,
+			if a hid report is 16 bytes long, 17 bytes must be passed to
+			hid_write(), the Report ID (or 0x0, for devices with a
+			single report), followed by the report data (16 bytes). In
+			this example, the length passed in would be 17.
+
+			hid_write() will send the data on the first OUT endpoint, if
+			one exists. If it does not, it will send the data through
+			the Control Endpoint (Endpoint 0).
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param data The data to send, including the report number as
+				the first byte.
+			@param length The length in bytes of the data to send.
+
+			@returns
+				This function returns the actual number of bytes written and
+				-1 on error.
+		*/
+		int  HID_API_EXPORT HID_API_CALL hid_write(hid_device *device, const unsigned char *data, size_t length);
+
+		/** @brief Read an Input report from a HID device with timeout.
+
+			Input reports are returned
+			to the host through the INTERRUPT IN endpoint. The first byte will
+			contain the Report number if the device uses numbered reports.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param data A buffer to put the read data into.
+			@param length The number of bytes to read. For devices with
+				multiple reports, make sure to read an extra byte for
+				the report number.
+			@param milliseconds timeout in milliseconds or -1 for blocking wait.
+
+			@returns
+				This function returns the actual number of bytes read and
+				-1 on error. If no packet was available to be read within
+				the timeout period, this function returns 0.
+		*/
+		int HID_API_EXPORT HID_API_CALL hid_read_timeout(hid_device *dev, unsigned char *data, size_t length, int milliseconds);
+
+		/** @brief Read an Input report from a HID device.
+
+			Input reports are returned
+		    to the host through the INTERRUPT IN endpoint. The first byte will
+			contain the Report number if the device uses numbered reports.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param data A buffer to put the read data into.
+			@param length The number of bytes to read. For devices with
+				multiple reports, make sure to read an extra byte for
+				the report number.
+
+			@returns
+				This function returns the actual number of bytes read and
+				-1 on error. If no packet was available to be read and
+				the handle is in non-blocking mode, this function returns 0.
+		*/
+		int  HID_API_EXPORT HID_API_CALL hid_read(hid_device *device, unsigned char *data, size_t length);
+
+		/** @brief Set the device handle to be non-blocking.
+
+			In non-blocking mode calls to hid_read() will return
+			immediately with a value of 0 if there is no data to be
+			read. In blocking mode, hid_read() will wait (block) until
+			there is data to read before returning.
+
+			Nonblocking can be turned on and off at any time.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param nonblock enable or not the nonblocking reads
+			 - 1 to enable nonblocking
+			 - 0 to disable nonblocking.
+
+			@returns
+				This function returns 0 on success and -1 on error.
+		*/
+		int  HID_API_EXPORT HID_API_CALL hid_set_nonblocking(hid_device *device, int nonblock);
+
+		/** @brief Send a Feature report to the device.
+
+			Feature reports are sent over the Control endpoint as a
+			Set_Report transfer.  The first byte of @p data[] must
+			contain the Report ID. For devices which only support a
+			single report, this must be set to 0x0. The remaining bytes
+			contain the report data. Since the Report ID is mandatory,
+			calls to hid_send_feature_report() will always contain one
+			more byte than the report contains. For example, if a hid
+			report is 16 bytes long, 17 bytes must be passed to
+			hid_send_feature_report(): the Report ID (or 0x0, for
+			devices which do not use numbered reports), followed by the
+			report data (16 bytes). In this example, the length passed
+			in would be 17.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param data The data to send, including the report number as
+				the first byte.
+			@param length The length in bytes of the data to send, including
+				the report number.
+
+			@returns
+				This function returns the actual number of bytes written and
+				-1 on error.
+		*/
+		int HID_API_EXPORT HID_API_CALL hid_send_feature_report(hid_device *device, const unsigned char *data, size_t length);
+
+		/** @brief Get a feature report from a HID device.
+
+			Set the first byte of @p data[] to the Report ID of the
+			report to be read.  Make sure to allow space for this
+			extra byte in @p data[]. Upon return, the first byte will
+			still contain the Report ID, and the report data will
+			start in data[1].
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param data A buffer to put the read data into, including
+				the Report ID. Set the first byte of @p data[] to the
+				Report ID of the report to be read, or set it to zero
+				if your device does not use numbered reports.
+			@param length The number of bytes to read, including an
+				extra byte for the report ID. The buffer can be longer
+				than the actual report.
+
+			@returns
+				This function returns the number of bytes read plus
+				one for the report ID (which is still in the first
+				byte), or -1 on error.
+		*/
+		int HID_API_EXPORT HID_API_CALL hid_get_feature_report(hid_device *device, unsigned char *data, size_t length);
+
+		/** @brief Close a HID device.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+		*/
+		void HID_API_EXPORT HID_API_CALL hid_close(hid_device *device);
+
+		/** @brief Get The Manufacturer String from a HID device.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param string A wide string buffer to put the data into.
+			@param maxlen The length of the buffer in multiples of wchar_t.
+
+			@returns
+				This function returns 0 on success and -1 on error.
+		*/
+		int HID_API_EXPORT_CALL hid_get_manufacturer_string(hid_device *device, wchar_t *string, size_t maxlen);
+
+		/** @brief Get The Product String from a HID device.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param string A wide string buffer to put the data into.
+			@param maxlen The length of the buffer in multiples of wchar_t.
+
+			@returns
+				This function returns 0 on success and -1 on error.
+		*/
+		int HID_API_EXPORT_CALL hid_get_product_string(hid_device *device, wchar_t *string, size_t maxlen);
+
+		/** @brief Get The Serial Number String from a HID device.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param string A wide string buffer to put the data into.
+			@param maxlen The length of the buffer in multiples of wchar_t.
+
+			@returns
+				This function returns 0 on success and -1 on error.
+		*/
+		int HID_API_EXPORT_CALL hid_get_serial_number_string(hid_device *device, wchar_t *string, size_t maxlen);
+
+		/** @brief Get a string from a HID device, based on its string index.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+			@param string_index The index of the string to get.
+			@param string A wide string buffer to put the data into.
+			@param maxlen The length of the buffer in multiples of wchar_t.
+
+			@returns
+				This function returns 0 on success and -1 on error.
+		*/
+		int HID_API_EXPORT_CALL hid_get_indexed_string(hid_device *device, int string_index, wchar_t *string, size_t maxlen);
+
+		/** @brief Get a string describing the last error which occurred.
+
+			@ingroup API
+			@param device A device handle returned from hid_open().
+
+			@returns
+				This function returns a string containing the last error
+				which occurred or NULL if none has occurred.
+		*/
+		HID_API_EXPORT const wchar_t* HID_API_CALL hid_error(hid_device *device);
 
 #ifdef __cplusplus
 }

Fichier diff supprimé car celui-ci est trop grand
+ 683 - 659
hidapi/windows/hid.c


+ 26 - 18
package.json

@@ -1,58 +1,67 @@
 {
-  "_from": "node-hid",
+  "_args": [
+    [
+      "node-hid@0.7.9",
+      "F:\\work\\gzwx"
+    ]
+  ],
+  "_development": true,
+  "_from": "node-hid@0.7.9",
   "_id": "node-hid@0.7.9",
   "_inBundle": false,
   "_integrity": "sha512-vJnonTqmq3frCyTumJqG4g2IZcny3ynkfmbfDfQ90P3ZhRzcWYS/Um1ux6HFmAxmkaQnrZqIYHcGpL7kdqY8jA==",
   "_location": "/node-hid",
   "_phantomChildren": {
+    "base64-js": "1.3.1",
+    "chownr": "1.1.2",
     "detect-libc": "1.0.3",
     "end-of-stream": "1.4.1",
     "file-uri-to-path": "1.0.0",
+    "fs-constants": "1.0.0",
     "github-from-package": "0.0.0",
-    "minimist": "1.2.0",
-    "mkdirp": "0.5.1",
+    "ieee754": "1.1.13",
+    "inherits": "2.0.4",
+    "mkdirp-classic": "0.5.3",
     "napi-build-utils": "1.0.1",
     "node-abi": "2.11.0",
     "noop-logger": "0.1.1",
     "npmlog": "4.1.2",
     "once": "1.4.0",
-    "os-homedir": "1.0.2",
+    "pump": "3.0.0",
     "rc": "1.2.8",
-    "simple-get": "2.8.1",
-    "tar-fs": "1.16.3",
+    "simple-concat": "1.0.0",
+    "string_decoder": "1.1.1",
     "tunnel-agent": "0.6.0",
+    "util-deprecate": "1.0.2",
     "which-pm-runs": "1.0.0"
   },
   "_requested": {
-    "type": "tag",
+    "type": "version",
     "registry": true,
-    "raw": "node-hid",
+    "raw": "node-hid@0.7.9",
     "name": "node-hid",
     "escapedName": "node-hid",
-    "rawSpec": "",
+    "rawSpec": "0.7.9",
     "saveSpec": null,
-    "fetchSpec": "latest"
+    "fetchSpec": "0.7.9"
   },
   "_requiredBy": [
-    "#DEV:/",
-    "#USER"
+    "#DEV:/"
   ],
   "_resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.9.tgz",
-  "_shasum": "cc0cdf1418a286a7667f0b63642b5eeb544ccd05",
-  "_spec": "node-hid",
-  "_where": "D:\\work\\gzwx",
+  "_spec": "0.7.9",
+  "_where": "F:\\work\\gzwx",
   "author": {
     "name": "Hans Hübner",
     "email": "hans.huebner@gmail.com",
     "url": "https://github.com/hanshuebner"
   },
   "bin": {
-    "hid-showdevices": "./src/show-devices.js"
+    "hid-showdevices": "src/show-devices.js"
   },
   "bugs": {
     "url": "https://github.com/node-hid/node-hid/issues"
   },
-  "bundleDependencies": false,
   "contributors": [
     {
       "name": "Blake Miner",
@@ -69,7 +78,6 @@
     "nan": "^2.13.2",
     "prebuild-install": "^5.3.0"
   },
-  "deprecated": false,
   "description": "USB HID device access library",
   "devDependencies": {
     "node-abi": "^2.8.0",

+ 13 - 22
src/HID.cc

@@ -58,17 +58,6 @@ protected:
   string _message;
 };
 
-static string
-narrow(wchar_t* wide)
-{
-  wstring ws(wide);
-  ostringstream os;
-  for (size_t i = 0; i < ws.size(); i++) {
-    os << os.narrow(ws[i], '?');
-  }
-  return os.str();
-}
-
 class HID
   : public Nan::ObjectWrap
 {
@@ -178,10 +167,7 @@ HID::write(const databuf_t& message)
   throw(JSException)
 {
   if(!_hidHandle) {
-	char buf[1024];
-	memset(buf, 0, sizeof(buf));
-	sprintf(buf, "Cannot write to closed device. size:%d", message.size());
-    throw JSException(buf);
+    throw JSException("Cannot write to closed device");
   }
   //unsigned char buf[message.size()];
   unsigned char* buf = new unsigned char[message.size()];
@@ -193,10 +179,7 @@ HID::write(const databuf_t& message)
   res = hid_write(_hidHandle, buf, message.size());
   delete[] buf;
   if (res < 0) {
-	char buf[1024];
-	memset(buf, 0, sizeof(buf));
-	sprintf(buf, "Cannot write to HID device.error:%d", GetLastError());
-    throw JSException(buf);
+    throw JSException("Cannot write to HID device");
   }
   return res;  // return actual number of bytes written
 }
@@ -507,6 +490,17 @@ NAN_METHOD(HID::write)
   }
 }
 
+static string
+narrow(wchar_t* wide)
+{
+  wstring ws(wide);
+  ostringstream os;
+  for (size_t i = 0; i < ws.size(); i++) {
+    os << os.narrow(ws[i], '?');
+  }
+  return os.str();
+}
+
 NAN_METHOD(HID::getDeviceInfo)
 {
   Nan::HandleScope scope;
@@ -567,9 +561,6 @@ NAN_METHOD(HID::devices)
     Local<Object> deviceInfo = Nan::New<Object>();
     Nan::Set(deviceInfo, Nan::New<String>("vendorId").ToLocalChecked(), Nan::New<Integer>(dev->vendor_id));
     Nan::Set(deviceInfo, Nan::New<String>("productId").ToLocalChecked(), Nan::New<Integer>(dev->product_id));
-	if (dev->hardware_id) {
-		Nan::Set(deviceInfo, Nan::New<String>("hardwareId").ToLocalChecked(), Nan::New<String>(dev->hardware_id).ToLocalChecked());
-	}
     if (dev->path) {
       Nan::Set(deviceInfo, Nan::New<String>("path").ToLocalChecked(), Nan::New<String>(dev->path).ToLocalChecked());
     }