X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=windows.c;h=644a701e46ecc80e4a7a40a8edea39522c32a0a5;hb=df3b70a88849a50aad823a7c0a96ae83eb474a32;hp=730870a4c1671200e0dbb4b88062b57375eb34ca;hpb=8eb18f7b5a459cde640f307ce46248851fdaec42;p=libserialport.git
diff --git a/windows.c b/windows.c
index 730870a..644a701 100644
--- a/windows.c
+++ b/windows.c
@@ -18,79 +18,35 @@
* along with this program. If not, see .
*/
+#include
#include "libserialport.h"
#include "libserialport_internal.h"
-/* USB path is a string of at most 8 decimal numbers < 128 separated by dots */
-#define MAX_USB_PATH (8*3 + 7*1 + 1)
-
-/* The stuff below is not yet available in MinGW apparently. Define it here. */
-
-#ifndef USB_NODE_CONNECTION_INFORMATION_EX
-typedef struct _USB_NODE_CONNECTION_INFORMATION_EX {
- ULONG ConnectionIndex;
- USB_DEVICE_DESCRIPTOR DeviceDescriptor;
- UCHAR CurrentConfigurationValue;
- UCHAR Speed;
- BOOLEAN DeviceIsHub;
- USHORT DeviceAddress;
- ULONG NumberOfOpenPipes;
- USB_CONNECTION_STATUS ConnectionStatus;
- USB_PIPE_INFO PipeList[];
-} USB_NODE_CONNECTION_INFORMATION_EX, *PUSB_NODE_CONNECTION_INFORMATION_EX;
-#endif
-
-#ifndef USB_GET_NODE_CONNECTION_INFORMATION_EX
-#define USB_GET_NODE_CONNECTION_INFORMATION_EX 274
-#endif
-
-#ifndef IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX
-#define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX \
- CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION_EX, \
- METHOD_BUFFERED, FILE_ANY_ACCESS)
-#endif
-
-#ifndef CM_DRP_COMPATIBLEIDS
-#define CM_DRP_COMPATIBLEIDS 0x03
-#endif
-#ifndef CM_DRP_CLASS
-#define CM_DRP_CLASS 0x08
-#endif
-#ifndef CM_DRP_FRIENDLYNAME
-#define CM_DRP_FRIENDLYNAME 0x0d
-#endif
-#ifndef CM_DRP_ADDRESS
-#define CM_DRP_ADDRESS 0x1d
-#endif
-
-#ifndef CM_Get_DevNode_Registry_PropertyA
-CMAPI CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyA(DEVINST dnDevInst, \
- ULONG ulProperty, PULONG pulRegDataType, PVOID Buffer, \
- PULONG pulLength, ULONG ulFlags);
-#endif
+/* USB path is a string of at most 8 decimal numbers < 128 separated by dots. */
+#define MAX_USB_PATH ((8 * 3) + (7 * 1) + 1)
-static void enumerate_hub(struct sp_port *port, char *hub_name,
- char *parent_path);
+static void enumerate_hub(struct sp_port *port, const char *hub_name,
+ const char *parent_path, DEVINST dev_inst);
static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size)
{
- WCHAR wc_str[size/sizeof(WCHAR)+1];
+ WCHAR wc_str[(size / sizeof(WCHAR)) + 1];
char *utf8_str;
- /* zero terminate the wide char string */
+ /* Zero-terminate the wide char string. */
memcpy(wc_str, wc_buffer, size);
- wc_str[sizeof(wc_str)-1] = 0;
+ wc_str[sizeof(wc_str) - 1] = 0;
- /* compute the size of the utf8 converted string */
+ /* Compute the size of the UTF-8 converted string. */
if (!(size = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
NULL, 0, NULL, NULL)))
return NULL;
- /* allocate utf8 output buffer */
+ /* Allocate UTF-8 output buffer. */
if (!(utf8_str = malloc(size)))
return NULL;
- /* actually converted to utf8 */
+ /* Actually converted to UTF-8. */
if (!WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
utf8_str, size, NULL, NULL)) {
free(utf8_str);
@@ -102,29 +58,29 @@ static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size)
static char *get_root_hub_name(HANDLE host_controller)
{
- USB_ROOT_HUB_NAME root_hub_name;
+ USB_ROOT_HUB_NAME root_hub_name;
PUSB_ROOT_HUB_NAME root_hub_name_wc;
char *root_hub_name_utf8;
ULONG size = 0;
- /* compute the size of the root hub name string */
+ /* Compute the size of the root hub name string. */
if (!DeviceIoControl(host_controller, IOCTL_USB_GET_ROOT_HUB_NAME, 0, 0,
&root_hub_name, sizeof(root_hub_name), &size, NULL))
return NULL;
- /* allocate wide char root hub name string */
+ /* Allocate wide char root hub name string. */
size = root_hub_name.ActualLength;
if (!(root_hub_name_wc = malloc(size)))
return NULL;
- /* actually get the root hub name string */
+ /* Actually get the root hub name string. */
if (!DeviceIoControl(host_controller, IOCTL_USB_GET_ROOT_HUB_NAME,
NULL, 0, root_hub_name_wc, size, &size, NULL)) {
free(root_hub_name_wc);
return NULL;
}
- /* convert the root hub name string to utf8 */
+ /* Convert the root hub name string to UTF-8. */
root_hub_name_utf8 = wc_to_utf8(root_hub_name_wc->RootHubName, size);
free(root_hub_name_wc);
return root_hub_name_utf8;
@@ -132,25 +88,25 @@ static char *get_root_hub_name(HANDLE host_controller)
static char *get_external_hub_name(HANDLE hub, ULONG connection_index)
{
- USB_NODE_CONNECTION_NAME ext_hub_name;
+ USB_NODE_CONNECTION_NAME ext_hub_name;
PUSB_NODE_CONNECTION_NAME ext_hub_name_wc;
char *ext_hub_name_utf8;
ULONG size;
- /* compute the size of the external hub name string */
+ /* Compute the size of the external hub name string. */
ext_hub_name.ConnectionIndex = connection_index;
if (!DeviceIoControl(hub, IOCTL_USB_GET_NODE_CONNECTION_NAME,
&ext_hub_name, sizeof(ext_hub_name),
&ext_hub_name, sizeof(ext_hub_name), &size, NULL))
return NULL;
- /* allocate wide char external hub name string */
+ /* Allocate wide char external hub name string. */
size = ext_hub_name.ActualLength;
if (size <= sizeof(ext_hub_name)
|| !(ext_hub_name_wc = malloc(size)))
return NULL;
- /* get the name of the external hub attached to the specified port */
+ /* Get the name of the external hub attached to the specified port. */
ext_hub_name_wc->ConnectionIndex = connection_index;
if (!DeviceIoControl(hub, IOCTL_USB_GET_NODE_CONNECTION_NAME,
ext_hub_name_wc, size,
@@ -159,7 +115,7 @@ static char *get_external_hub_name(HANDLE hub, ULONG connection_index)
return NULL;
}
- /* convert the external hub name string to utf8 */
+ /* Convert the external hub name string to UTF-8. */
ext_hub_name_utf8 = wc_to_utf8(ext_hub_name_wc->NodeName, size);
free(ext_hub_name_wc);
return ext_hub_name_utf8;
@@ -170,14 +126,14 @@ static char *get_string_descriptor(HANDLE hub_device, ULONG connection_index,
{
char desc_req_buf[sizeof(USB_DESCRIPTOR_REQUEST) +
MAXIMUM_USB_STRING_LENGTH] = { 0 };
- PUSB_DESCRIPTOR_REQUEST desc_req = (void *) desc_req_buf;
- PUSB_STRING_DESCRIPTOR desc = (void *) (desc_req + 1);
+ PUSB_DESCRIPTOR_REQUEST desc_req = (void *)desc_req_buf;
+ PUSB_STRING_DESCRIPTOR desc = (void *)(desc_req + 1);
ULONG size = sizeof(desc_req_buf);
- desc_req->ConnectionIndex = connection_index;
- desc_req->SetupPacket.wValue = (USB_STRING_DESCRIPTOR_TYPE << 8)
- | descriptor_index;
- desc_req->SetupPacket.wIndex = 0;
+ desc_req->ConnectionIndex = connection_index;
+ desc_req->SetupPacket.wValue = (USB_STRING_DESCRIPTOR_TYPE << 8)
+ | descriptor_index;
+ desc_req->SetupPacket.wIndex = 0;
desc_req->SetupPacket.wLength = size - sizeof(*desc_req);
if (!DeviceIoControl(hub_device,
@@ -193,14 +149,14 @@ static char *get_string_descriptor(HANDLE hub_device, ULONG connection_index,
}
static void enumerate_hub_ports(struct sp_port *port, HANDLE hub_device,
- ULONG nb_ports, char *parent_path)
+ ULONG nb_ports, const char *parent_path, DEVINST dev_inst)
{
char path[MAX_USB_PATH];
ULONG index = 0;
for (index = 1; index <= nb_ports; index++) {
PUSB_NODE_CONNECTION_INFORMATION_EX connection_info_ex;
- ULONG size = sizeof(*connection_info_ex) + 30*sizeof(USB_PIPE_INFO);
+ ULONG size = sizeof(*connection_info_ex) + (30 * sizeof(USB_PIPE_INFO));
if (!(connection_info_ex = malloc(size)))
break;
@@ -210,11 +166,13 @@ static void enumerate_hub_ports(struct sp_port *port, HANDLE hub_device,
IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX,
connection_info_ex, size,
connection_info_ex, size, &size, NULL)) {
- /* try to get CONNECTION_INFORMATION if CONNECTION_INFORMATION_EX
- did not work */
+ /*
+ * Try to get CONNECTION_INFORMATION if
+ * CONNECTION_INFORMATION_EX did not work.
+ */
PUSB_NODE_CONNECTION_INFORMATION connection_info;
- size = sizeof(*connection_info) + 30*sizeof(USB_PIPE_INFO);
+ size = sizeof(*connection_info) + (30 * sizeof(USB_PIPE_INFO));
if (!(connection_info = malloc(size))) {
free(connection_info_ex);
continue;
@@ -237,25 +195,25 @@ static void enumerate_hub_ports(struct sp_port *port, HANDLE hub_device,
}
if (connection_info_ex->DeviceIsHub) {
- /* recursively enumerate external hub */
+ /* Recursively enumerate external hub. */
PCHAR ext_hub_name;
if ((ext_hub_name = get_external_hub_name(hub_device, index))) {
snprintf(path, sizeof(path), "%s%ld.",
parent_path, connection_info_ex->ConnectionIndex);
- enumerate_hub(port, ext_hub_name, path);
+ enumerate_hub(port, ext_hub_name, path, dev_inst);
}
free(connection_info_ex);
} else {
snprintf(path, sizeof(path), "%s%ld",
parent_path, connection_info_ex->ConnectionIndex);
- /* check if this device is the one we search for */
+ /* Check if this device is the one we search for. */
if (strcmp(path, port->usb_path)) {
free(connection_info_ex);
continue;
}
- /* finally grab detailed informations regarding the device */
+ /* Finally grab detailed information regarding the device. */
port->usb_address = connection_info_ex->DeviceAddress + 1;
port->usb_vid = connection_info_ex->DeviceDescriptor.idVendor;
port->usb_pid = connection_info_ex->DeviceDescriptor.idProduct;
@@ -266,9 +224,18 @@ static void enumerate_hub_ports(struct sp_port *port, HANDLE hub_device,
if (connection_info_ex->DeviceDescriptor.iProduct)
port->usb_product = get_string_descriptor(hub_device, index,
connection_info_ex->DeviceDescriptor.iProduct);
- if (connection_info_ex->DeviceDescriptor.iSerialNumber)
+ if (connection_info_ex->DeviceDescriptor.iSerialNumber) {
port->usb_serial = get_string_descriptor(hub_device, index,
connection_info_ex->DeviceDescriptor.iSerialNumber);
+ if (port->usb_serial == NULL) {
+ //composite device, get the parent's serial number
+ char device_id[MAX_DEVICE_ID_LEN];
+ if (CM_Get_Parent(&dev_inst, dev_inst, 0) == CR_SUCCESS) {
+ if (CM_Get_Device_IDA(dev_inst, device_id, sizeof(device_id), 0) == CR_SUCCESS)
+ port->usb_serial = strdup(strrchr(device_id, '\\')+1);
+ }
+ }
+ }
free(connection_info_ex);
break;
@@ -276,15 +243,15 @@ static void enumerate_hub_ports(struct sp_port *port, HANDLE hub_device,
}
}
-static void enumerate_hub(struct sp_port *port, char *hub_name,
- char *parent_path)
+static void enumerate_hub(struct sp_port *port, const char *hub_name,
+ const char *parent_path, DEVINST dev_inst)
{
USB_NODE_INFORMATION hub_info;
HANDLE hub_device;
ULONG size = sizeof(hub_info);
char *device_name;
- /* open the hub with its full name */
+ /* Open the hub with its full name. */
if (!(device_name = malloc(strlen("\\\\.\\") + strlen(hub_name) + 1)))
return;
strcpy(device_name, "\\\\.\\");
@@ -295,23 +262,24 @@ static void enumerate_hub(struct sp_port *port, char *hub_name,
if (hub_device == INVALID_HANDLE_VALUE)
return;
- /* get the number of ports of the hub */
+ /* Get the number of ports of the hub. */
if (DeviceIoControl(hub_device, IOCTL_USB_GET_NODE_INFORMATION,
&hub_info, size, &hub_info, size, &size, NULL))
- /* enumarate the ports of the hub */
+ /* Enumerate the ports of the hub. */
enumerate_hub_ports(port, hub_device,
- hub_info.u.HubInformation.HubDescriptor.bNumberOfPorts, parent_path);
+ hub_info.u.HubInformation.HubDescriptor.bNumberOfPorts, parent_path, dev_inst);
CloseHandle(hub_device);
}
static void enumerate_host_controller(struct sp_port *port,
- HANDLE host_controller_device)
+ HANDLE host_controller_device,
+ DEVINST dev_inst)
{
char *root_hub_name;
if ((root_hub_name = get_root_hub_name(host_controller_device))) {
- enumerate_hub(port, root_hub_name, "");
+ enumerate_hub(port, root_hub_name, "", dev_inst);
free(root_hub_name);
}
}
@@ -322,11 +290,11 @@ static void get_usb_details(struct sp_port *port, DEVINST dev_inst_match)
SP_DEVINFO_DATA device_info_data;
ULONG i, size = 0;
- device_info = SetupDiGetClassDevs(&GUID_CLASS_USB_HOST_CONTROLLER,NULL,NULL,
+ device_info = SetupDiGetClassDevs(&GUID_CLASS_USB_HOST_CONTROLLER, NULL, NULL,
DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
device_info_data.cbSize = sizeof(device_info_data);
- for (i=0; SetupDiEnumDeviceInfo(device_info, i, &device_info_data); i++) {
+ for (i = 0; SetupDiEnumDeviceInfo(device_info, i, &device_info_data); i++) {
SP_DEVICE_INTERFACE_DATA device_interface_data;
PSP_DEVICE_INTERFACE_DETAIL_DATA device_detail_data;
DEVINST dev_inst = dev_inst_match;
@@ -366,7 +334,7 @@ static void get_usb_details(struct sp_port *port, DEVINST dev_inst_match)
GENERIC_WRITE, FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, 0, NULL);
if (host_controller_device != INVALID_HANDLE_VALUE) {
- enumerate_host_controller(port, host_controller_device);
+ enumerate_host_controller(port, host_controller_device, dev_inst_match);
CloseHandle(host_controller_device);
}
free(device_detail_data);
@@ -378,8 +346,10 @@ static void get_usb_details(struct sp_port *port, DEVINST dev_inst_match)
SP_PRIV enum sp_return get_port_details(struct sp_port *port)
{
- /* Description limited to 127 char,
- anything longer would not be user friendly anyway */
+ /*
+ * Description limited to 127 char, anything longer
+ * would not be user friendly anyway.
+ */
char description[128];
SP_DEVINFO_DATA device_info_data = { .cbSize = sizeof(device_info_data) };
HDEVINFO device_info;
@@ -390,28 +360,31 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
if (device_info == INVALID_HANDLE_VALUE)
RETURN_FAIL("SetupDiGetClassDevs() failed");
- for (i=0; SetupDiEnumDeviceInfo(device_info, i, &device_info_data); i++) {
+ for (i = 0; SetupDiEnumDeviceInfo(device_info, i, &device_info_data); i++) {
HKEY device_key;
DEVINST dev_inst;
char value[8], class[16];
DWORD size, type;
CONFIGRET cr;
- /* check if this is the device we are looking for */
- if (!(device_key = SetupDiOpenDevRegKey(device_info, &device_info_data,
- DICS_FLAG_GLOBAL, 0,
- DIREG_DEV, KEY_QUERY_VALUE)))
+ /* Check if this is the device we are looking for. */
+ device_key = SetupDiOpenDevRegKey(device_info, &device_info_data,
+ DICS_FLAG_GLOBAL, 0,
+ DIREG_DEV, KEY_QUERY_VALUE);
+ if (device_key == INVALID_HANDLE_VALUE)
continue;
size = sizeof(value);
if (RegQueryValueExA(device_key, "PortName", NULL, &type, (LPBYTE)value,
- &size) != ERROR_SUCCESS || type != REG_SZ)
+ &size) != ERROR_SUCCESS || type != REG_SZ) {
+ RegCloseKey(device_key);
continue;
+ }
RegCloseKey(device_key);
value[sizeof(value)-1] = 0;
if (strcmp(value, port->name))
continue;
- /* check port transport type */
+ /* Check port transport type. */
dev_inst = device_info_data.DevInst;
size = sizeof(class);
cr = CR_FAILURE;
@@ -423,7 +396,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
port->transport = SP_TRANSPORT_USB;
}
- /* get port description (friendly name) */
+ /* Get port description (friendly name). */
dev_inst = device_info_data.DevInst;
size = sizeof(description);
while ((cr = CM_Get_DevNode_Registry_PropertyA(dev_inst,
@@ -432,21 +405,21 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
if (cr == CR_SUCCESS)
port->description = strdup(description);
- /* get more informations for USB connected ports */
+ /* Get more informations for USB connected ports. */
if (port->transport == SP_TRANSPORT_USB) {
char usb_path[MAX_USB_PATH] = "", tmp[MAX_USB_PATH];
char device_id[MAX_DEVICE_ID_LEN];
- /* recurse over parents to build the USB device path */
+ /* Recurse over parents to build the USB device path. */
dev_inst = device_info_data.DevInst;
do {
- /* verify that this layer of the tree is USB related */
+ /* Verify that this layer of the tree is USB related. */
if (CM_Get_Device_IDA(dev_inst, device_id,
sizeof(device_id), 0) != CR_SUCCESS
|| strncmp(device_id, "USB\\", 4))
continue;
- /* discard one layer for composite devices */
+ /* Discard one layer for composite devices. */
char compat_ids[512], *p = compat_ids;
size = sizeof(compat_ids);
if (CM_Get_DevNode_Registry_PropertyA(dev_inst,
@@ -462,11 +435,11 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
continue;
}
- /* stop the recursion when reaching the USB root */
+ /* Stop the recursion when reaching the USB root. */
if (!strncmp(device_id, "USB\\ROOT", 8))
break;
- /* prepend the address of current USB layer to the USB path */
+ /* Prepend the address of current USB layer to the USB path. */
DWORD address;
size = sizeof(address);
if (CM_Get_DevNode_Registry_PropertyA(dev_inst, CM_DRP_ADDRESS,
@@ -479,7 +452,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
port->usb_path = strdup(usb_path);
- /* wake up the USB device to be able to read string descriptor */
+ /* Wake up the USB device to be able to read string descriptor. */
char *escaped_port_name;
HANDLE handle;
if (!(escaped_port_name = malloc(strlen(port->name) + 5)))
@@ -491,12 +464,14 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
free(escaped_port_name);
CloseHandle(handle);
- /* retrive USB device details from the device descriptor */
+ /* Retrieve USB device details from the device descriptor. */
get_usb_details(port, device_info_data.DevInst);
}
break;
}
+ SetupDiDestroyDeviceInfoList(device_info);
+
RETURN_OK();
}
@@ -525,11 +500,11 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
}
max_data_len = max_data_size / sizeof(TCHAR);
if (!(value = malloc((max_value_len + 1) * sizeof(TCHAR)))) {
- SET_ERROR(ret, SP_ERR_MEM, "registry value malloc failed");
+ SET_ERROR(ret, SP_ERR_MEM, "Registry value malloc failed");
goto out_close;
}
if (!(data = malloc((max_data_len + 1) * sizeof(TCHAR)))) {
- SET_ERROR(ret, SP_ERR_MEM, "registry data malloc failed");
+ SET_ERROR(ret, SP_ERR_MEM, "Registry data malloc failed");
goto out_free_value;
}
DEBUG("Iterating over values");
@@ -539,28 +514,30 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
RegEnumValue(key, index, value, &value_len,
NULL, &type, (LPBYTE)data, &data_size) == ERROR_SUCCESS)
{
- data_len = data_size / sizeof(TCHAR);
- data[data_len] = '\0';
+ if (type == REG_SZ) {
+ data_len = data_size / sizeof(TCHAR);
+ data[data_len] = '\0';
#ifdef UNICODE
- name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL);
+ name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL);
#else
- name_len = data_len + 1;
+ name_len = data_len + 1;
#endif
- if (!(name = malloc(name_len))) {
- SET_ERROR(ret, SP_ERR_MEM, "registry port name malloc failed");
- goto out;
- }
+ if (!(name = malloc(name_len))) {
+ SET_ERROR(ret, SP_ERR_MEM, "Registry port name malloc failed");
+ goto out;
+ }
#ifdef UNICODE
- WideCharToMultiByte(CP_ACP, 0, data, -1, name, name_len, NULL, NULL);
+ WideCharToMultiByte(CP_ACP, 0, data, -1, name, name_len, NULL, NULL);
#else
- strcpy(name, data);
+ strcpy(name, data);
#endif
- if (type == REG_SZ) {
- DEBUG("Found port %s", name);
+ DEBUG_FMT("Found port %s", name);
if (!(*list = list_append(*list, name))) {
- SET_ERROR(ret, SP_ERR_MEM, "list append failed");
+ SET_ERROR(ret, SP_ERR_MEM, "List append failed");
+ free(name);
goto out;
}
+ free(name);
}
index++;
}