Update libusb to lastet master

Merge commit 'd4f681c61451f28378dce3a9e3e16e731a43af26'

Author: Youw

libusb/.github/workflows/msys2_clang64-aarch64.yml

@@ -0,0 +1,29 @@
+name: MSYS2 aarch64 clang64
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-11-arm
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: clangarm64
+          update: true
+          install: git mingw-w64-clang-aarch64-cc mingw-w64-clang-aarch64-autotools
+      - name: CI-Build
+        run: |
+          echo 'Running in MSYS2!'
+          ./bootstrap.sh
+          ./.private/ci-build.sh --no-asan --build-dir build-msys2-clang64-aarch64
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build-msys2-clang64-aarch64
+          path: |
+            build-msys2-clang64-aarch64/libusb/.libs/libusb-1.0.dll.a
+            build-msys2-clang64-aarch64/libusb/.libs/libusb-1.0.a
+            build-msys2-clang64-aarch64/libusb/.libs/libusb-1.0.dll

libusb/.github/workflows/windows.yml

@@ -0,0 +1,37 @@
+name: Windows build and Package
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os:
+          - 'windows-2022'
+          - 'windows-2025'
+        configuration:
+          - 'Debug'
+          - 'Release'
+          - 'Debug-MT'
+          - 'Release-MT'
+          - 'Debug-Hotplug'
+          - 'Release-Hotplug'
+          - 'Debug-Hotplug-MT'
+          - 'Release-Hotplug-MT'
+        architecture:
+          - 'Win32'
+          - 'x64'
+          - 'ARM64'
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup MSBuild
+        uses: microsoft/[email protected]
+        
+      - name: Build solution
+        run: |
+          msbuild msvc/libusb.sln /m -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.architecture }}

libusb/.gitignore

@@ -61,6 +61,10 @@ Debug
 Release
 Debug-MT
 Release-MT
+Debug-Hotplug
+Release-Hotplug
+Debug-Hotplug-MT
+Release-Hotplug-MT
 *.db
 *.user
 *.suo

libusb/configure.ac

@@ -397,10 +397,20 @@ AM_CONDITIONAL([OS_EMSCRIPTEN], [test "x$backend" = xemscripten])
 AM_CONDITIONAL([PLATFORM_POSIX], [test "x$platform" = xposix])
 AM_CONDITIONAL([PLATFORM_WINDOWS], [test "x$platform" = xwindows])
 AM_CONDITIONAL([USE_UDEV], [test "x$use_udev" = xyes])
+AM_CONDITIONAL([LIBUSB_WINDOWS_HOTPLUG], [test "x$enable_windows_hotplug" = xyes])
 
 dnl The -Wcast-function-type warning causes a flurry of warnings when compiling
 dnl Windows with GCC 8 or later because of dynamically loaded functions
 if test "x$backend" = xwindows; then
+	AC_ARG_ENABLE([windows-hotplug],
+	AS_HELP_STRING([--enable-windows-hotplug], [Enable Windows hotplug support]),
+	[enable_windows_hotplug="$enableval"],
+	[enable_windows_hotplug=no])
+
+	if test "x$enable_windows_hotplug" = "xyes"; then
+		AC_DEFINE([LIBUSB_WINDOWS_HOTPLUG], [1], [Define to enable Windows hotplug support])
+	fi
+
 	saved_CFLAGS="${CFLAGS}"
 	CFLAGS="-Werror -Wcast-function-type"
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])],

libusb/examples/hotplugtest.c

@@ -23,12 +23,14 @@
 
 #include "libusb.h"
 
-int done = 0;
+int done_attach = 0;
+int done_detach = 0;
 libusb_device_handle *handle = NULL;
 
 static int LIBUSB_CALL hotplug_callback(libusb_context *ctx, libusb_device *dev, libusb_hotplug_event event, void *user_data)
 {
 	struct libusb_device_descriptor desc;
+	libusb_device_handle *new_handle;
 	int rc;
 
 	(void)ctx;
@@ -45,18 +47,23 @@ static int LIBUSB_CALL hotplug_callback(libusb_context *ctx, libusb_device *dev,
 			 libusb_strerror((enum libusb_error)rc));
 	}
 
-	if (handle) {
-		libusb_close (handle);
-		handle = NULL;
-	}
-
-	rc = libusb_open (dev, &handle);
-	if (LIBUSB_SUCCESS != rc) {
+	rc = libusb_open (dev, &new_handle);
+	if (LIBUSB_SUCCESS == rc) {
+		if (handle) {
+			libusb_close (handle);
+		}
+		handle = new_handle;
+	} else if (LIBUSB_ERROR_ACCESS != rc
+#if defined(PLATFORM_WINDOWS)
+		&& LIBUSB_ERROR_NOT_SUPPORTED != rc
+		&& LIBUSB_ERROR_NOT_FOUND != rc
+#endif
+		) {
 		fprintf (stderr, "No access to device: %s\n",
 			 libusb_strerror((enum libusb_error)rc));
 	}
 
-	done++;
+	done_attach++;
 
 	return 0;
 }
@@ -85,7 +92,7 @@ static int LIBUSB_CALL hotplug_callback_detach(libusb_context *ctx, libusb_devic
 		handle = NULL;
 	}
 
-	done++;
+	done_detach++;
 
 	return 0;
 }
@@ -130,14 +137,15 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	while (done < 2) {
+	while (done_detach < done_attach || done_attach == 0) {
 		rc = libusb_handle_events (NULL);
 		if (LIBUSB_SUCCESS != rc)
 			printf ("libusb_handle_events() failed: %s\n",
 				libusb_strerror((enum libusb_error)rc));
 	}
 
 	if (handle) {
+		printf ("Warning: Closing left-over open handle\n");
 		libusb_close (handle);
 	}
 

libusb/examples/xusb.c

@@ -31,6 +31,11 @@
 #if defined(_MSC_VER)
 #define snprintf _snprintf
 #define putenv _putenv
+/* Disable: warning C5287: operands are different enum types */
+#if (_MSC_VER > 1800)
+/* Disable: warning C5287: operands are different enum types, supported after Visual Studio 2013 */
+#pragma warning(disable:5287)
+#endif
 #endif
 
 // Future versions of libusb will use usb_interface instead of interface

libusb/libusb/Makefile.am

@@ -30,6 +30,10 @@ OS_WINDOWS_SRC = libusb-1.0.def libusb-1.0.rc \
 		 os/windows_usbdk.h os/windows_usbdk.c \
 		 os/windows_winusb.h os/windows_winusb.c
 
+if LIBUSB_WINDOWS_HOTPLUG
+OS_WINDOWS_SRC += os/windows_hotplug.h os/windows_hotplug.c
+endif	 
+
 if OS_DARWIN
 OS_SRC = $(OS_DARWIN_SRC)
 endif

libusb/libusb/core.c

@@ -728,20 +728,24 @@ struct libusb_device *usbi_alloc_device(struct libusb_context *ctx,
 	return dev;
 }
 
-void usbi_connect_device(struct libusb_device *dev)
+void usbi_attach_device(struct libusb_device *dev)
 {
 	struct libusb_context *ctx = DEVICE_CTX(dev);
 
 	usbi_atomic_store(&dev->attached, 1);
 
-	usbi_mutex_lock(&dev->ctx->usb_devs_lock);
-	list_add(&dev->list, &dev->ctx->usb_devs);
-	usbi_mutex_unlock(&dev->ctx->usb_devs_lock);
+	usbi_mutex_lock(&ctx->usb_devs_lock);
+	list_add(&dev->list, &ctx->usb_devs);
+	usbi_mutex_unlock(&ctx->usb_devs_lock);
+}
 
-	usbi_hotplug_notification(ctx, dev, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED);
+void usbi_connect_device(struct libusb_device *dev)
+{
+	usbi_attach_device(dev);
+	usbi_hotplug_notification(DEVICE_CTX(dev), dev, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED);
 }
 
-void usbi_disconnect_device(struct libusb_device *dev)
+void usbi_detach_device(struct libusb_device *dev)
 {
 	struct libusb_context *ctx = DEVICE_CTX(dev);
 
@@ -750,8 +754,12 @@ void usbi_disconnect_device(struct libusb_device *dev)
 	usbi_mutex_lock(&ctx->usb_devs_lock);
 	list_del(&dev->list);
 	usbi_mutex_unlock(&ctx->usb_devs_lock);
+}
 
-	usbi_hotplug_notification(ctx, dev, LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT);
+void usbi_disconnect_device(struct libusb_device *dev)
+{
+	usbi_detach_device(dev);
+	usbi_hotplug_notification(DEVICE_CTX(dev), dev, LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT);
 }
 
 /* Perform some final sanity checks on a newly discovered device. If this

libusb/libusb/descriptor.c

@@ -1311,9 +1311,10 @@ int API_EXPORTED libusb_get_string_descriptor_ascii(libusb_device_handle *dev_ha
 	r = libusb_get_string_descriptor(dev_handle, 0, 0, str.buf, 4);
 	if (r < 0)
 		return r;
-	else if (r != 4 || str.desc.bLength < 4 || str.desc.bDescriptorType != LIBUSB_DT_STRING)
+	else if (r != 4 || str.desc.bLength < 4 || str.desc.bDescriptorType != LIBUSB_DT_STRING) {
+		usbi_warn(HANDLE_CTX(dev_handle), "invalid language ID string descriptor");
 		return LIBUSB_ERROR_IO;
-	else if (str.desc.bLength & 1)
+	} else if (str.desc.bLength & 1)
 		usbi_warn(HANDLE_CTX(dev_handle), "suspicious bLength %u for language ID string descriptor", str.desc.bLength);
 
 	langid = libusb_le16_to_cpu(str.desc.wData[0]);

libusb/libusb/libusb.h

@@ -65,9 +65,6 @@ typedef SSIZE_T ssize_t;
 #if defined(interface)
 #undef interface
 #endif
-#if !defined(__CYGWIN__)
-#include <winsock.h>
-#endif
 #endif /* _WIN32 || __CYGWIN__ */
 
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
@@ -192,7 +189,7 @@ extern "C" {
  * \param x the host-endian value to convert
  * \returns the value in little-endian byte order
  */
-static inline uint16_t libusb_cpu_to_le16(const uint16_t x)
+static inline uint16_t libusb_cpu_to_le16(uint16_t x)
 {
 	union {
 		uint8_t  b8[2];
@@ -1182,16 +1179,16 @@ struct libusb_device_handle;
  */
 struct libusb_version {
 	/** Library major version. */
-	const uint16_t major;
+	uint16_t major;
 
 	/** Library minor version. */
-	const uint16_t minor;
+	uint16_t minor;
 
 	/** Library micro version. */
-	const uint16_t micro;
+	uint16_t micro;
 
 	/** Library nano version. */
-	const uint16_t nano;
+	uint16_t nano;
 
 	/** Library release candidate suffix string, e.g. "-rc4". */
 	const char *rc;