winusb: Ignore missing DeviceInterfaceGUID
authorTormod Volden <debian.tormod@gmail.com>
Sun, 11 Jul 2021 12:40:01 +0000 (14:40 +0200)
committerNathan Hjelm <hjelmn@google.com>
Tue, 20 Jul 2021 13:54:35 +0000 (07:54 -0600)
Closes #948

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Nathan Hjelm <hjelmn@google.com>
libusb/os/windows_winusb.c
libusb/version_nano.h

index 1fdc703f7fc613bd66b01106a4fe3c3d4c302ec9..4ddd3dcfeb6615ca74de155f2f1516d840033846 100644 (file)
@@ -1626,7 +1626,9 @@ static int winusb_get_device_list(struct libusb_context *ctx, struct discovered_
                                        s = pRegQueryValueExA(key, "DeviceInterfaceGUID", NULL, &reg_type,
                                                (LPBYTE)guid_string, &size);
                                pRegCloseKey(key);
-                               if (s != ERROR_SUCCESS) {
+                               if (s == ERROR_FILE_NOT_FOUND) {
+                                       break; /* no DeviceInterfaceGUID registered */
+                               } else if (s != ERROR_SUCCESS) {
                                        usbi_warn(ctx, "unexpected error from pRegQueryValueExA for '%s'", dev_id);
                                        break;
                                }
index 6b45e58202051f56fa18d058624d606f7a7786da..ca4698121cc1c85a671cbb4eca3fd8ca0eda1de8 100644 (file)
@@ -1 +1 @@
-#define LIBUSB_NANO 11636
+#define LIBUSB_NANO 11637