[WIN] handle composite ports in a saner way

Author: facchinm

libserialport_internal.h

@@ -116,6 +116,7 @@ struct sp_port {
 	BYTE pending_byte;
 	BOOL writing;
 	BOOL wait_running;
+	BOOL composite;
 #else
 	int fd;
 #endif

windows.c

@@ -281,6 +281,13 @@ static void enumerate_host_controller(struct sp_port *port,
 {
 	char *root_hub_name;
 
+	if (port->composite) {
+		//remove last part of the path
+		char * pch;
+		pch=strrchr(port->usb_path,'.');
+		port->usb_path[pch-port->usb_path] = '\0';
+	}
+
 	if ((root_hub_name = get_root_hub_name(host_controller_device))) {
 		enumerate_hub(port, root_hub_name, "", dev_inst, fetchDescriptors);
 		free(root_hub_name);
@@ -369,6 +376,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port, bool fetchDescript
 		char value[8], class[16];
 		DWORD size, type;
 		CONFIGRET cr;
+		port->composite = FALSE;
 
 		/* Check if this is the device we are looking for. */
 		device_key = SetupDiOpenDevRegKey(device_info, &device_info_data,
@@ -430,12 +438,12 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port, bool fetchDescript
 				                                      &compat_ids,
 				                                      &size, 0) == CR_SUCCESS) {
 					while (*p) {
-						if (!strncmp(p, "USB\\COMPOSITE", 13))
+						if (!strncmp(p, "USB\\COMPOSITE", 13)) {
+							port->composite = TRUE;
 							break;
+						}
 						p += strlen(p) + 1;
 					}
-					if (*p)
-						continue;
 				}
 
 				/* Stop the recursion when reaching the USB root. */