libwdi 1.5.1

* Update libusb-win32 URL to latest
pbatard · Jun 13, 2024 · 9b23b82 · 9b23b82
1 parent 63dbca8
commit 9b23b82
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 35 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -22,7 +22,7 @@ on:
 
 env:
   WDK_URL: https://go.microsoft.com/fwlink/p/?LinkID=253170
-  LIBUSB0_URL: https://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip/download
+  LIBUSB0_URL: https://github.com/mcuee/libusb-win32/releases/download/release_1.4.0.0/libusb-win32-bin-1.4.0.0.zip
   LIBUSBK_URL: https://github.com/mcuee/libusbk/releases/download/V3.1.0.0/libusbK-3.1.0.0-bin.7z
   SOLUTION_FILE_PATH: ./libwdi.sln
   TARGET_PLATFORM: x64

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   WDK_URL: https://go.microsoft.com/fwlink/p/?LinkID=253170
-  LIBUSB0_URL: https://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/1.2.7.3/libusb-win32-bin-1.2.7.3.zip/download
+  LIBUSB0_URL: https://github.com/mcuee/libusb-win32/releases/download/release_1.4.0.0/libusb-win32-bin-1.4.0.0.zip
   LIBUSBK_URL: https://github.com/mcuee/libusbk/releases/download/V3.1.0.0/libusbK-3.1.0.0-bin.7z
   SOLUTION_FILE_PATH: ./libwdi.sln
   EMAIL: [email protected]

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -22,7 +22,7 @@ on:
 
 env:
   WDK_URL: https://go.microsoft.com/fwlink/p/?LinkID=253170
-  LIBUSB0_URL: https://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/1.2.7.3/libusb-win32-bin-1.2.7.3.zip/download
+  LIBUSB0_URL: https://github.com/mcuee/libusb-win32/releases/download/release_1.4.0.0/libusb-win32-bin-1.4.0.0.zip
   LIBUSBK_URL: https://github.com/mcuee/libusbk/releases/download/V3.1.0.0/libusbK-3.1.0.0-bin.7z
   BUILD_OPTIONS: '--enable-toggable-debug --enable-examples-build --disable-debug --disable-shared'
   DRIVERS_PATHS: '--with-wdkdir="wdk/Windows Kits/8.0" --with-wdfver=1011 --with-libusb0="libusb0" --with-libusbk="libusbk/bin"'

diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2022.yml
@@ -22,7 +22,7 @@ on:
 
 env:
   WDK_URL: https://go.microsoft.com/fwlink/p/?LinkID=253170
-  LIBUSB0_URL: https://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/1.2.7.3/libusb-win32-bin-1.2.7.3.zip/download
+  LIBUSB0_URL: https://github.com/mcuee/libusb-win32/releases/download/release_1.4.0.0/libusb-win32-bin-1.4.0.0.zip
   LIBUSBK_URL: https://github.com/mcuee/libusbk/releases/download/V3.1.0.0/libusbK-3.1.0.0-bin.7z
   SOLUTION_FILE_PATH: ./libwdi.sln
   BUILD_MACROS: '"WDK_DIR=\"../wdk/Windows Kits/8.0\";LIBUSB0_DIR=\"../libusb0\";LIBUSBK_DIR=\"../libusbk/bin\""'
@@ -99,14 +99,3 @@ jobs:
       with:
         name: Zadig
         path: ./zadig-*.exe
-
-  Merge-Artifacts:
-    runs-on: windows-latest
-    needs: VS2022-Build
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        if: ${{ github.event_name == 'push' }}
-        with:
-          name: Zadig
-          delete-merged: true
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,14 @@
 For the latest changes, please visit:
   https://github.com/pbatard/libwdi/commits/master
 
+o v1.5.1 (2024.06.13)
+  New features:
+  - libusb-win32 ARM64 driver installation support (courtesy of Peter Dons Tychsen)
+  Bugfixes:
+  - fix filter installer being potentially overwritten (courtesy of Peter Dons Tychsen)
+  Improvements:
+  - improve Windows edition and platform reporting
+
 o v1.5.0 (2023.03.01)
   New features:
   - ARM64 driver installation support (WinUSB, USBSer with MSVC only)

diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,0,787
- PRODUCTVERSION 1,5,0,787
+ FILEVERSION 1,5,1,788
+ PRODUCTVERSION 1,5,1,788
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "WDI-Simple"
-            VALUE "FileVersion", "1.5.0.787"
+            VALUE "FileVersion", "1.5.1.788"
             VALUE "InternalName", "WDI-Simple"
             VALUE "LegalCopyright", "� 2010-2023 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "wdi-simple.exe"
             VALUE "ProductName", "WDI-Simple"
-            VALUE "ProductVersion", "1.5.0.787"
+            VALUE "ProductVersion", "1.5.1.788"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadig.h b/examples/zadig.h
@@ -60,7 +60,7 @@
 #define FIELD_ORANGE                RGB(255,240,200)
 #define ARROW_GREEN                 RGB(92,228,65)
 #define ARROW_ORANGE                RGB(253,143,56)
-#define APP_VERSION                 "Zadig 2.8.787"
+#define APP_VERSION                 "Zadig 2.9.788"
 
 // These are used to flag end users about the driver they are going to replace
 enum driver_type {

diff --git a/examples/zadig.rc b/examples/zadig.rc
@@ -246,8 +246,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,787,0
- PRODUCTVERSION 2,8,787,0
+ FILEVERSION 2,9,788,0
+ PRODUCTVERSION 2,9,788,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.8.787"
+            VALUE "FileVersion", "2.9.788"
             VALUE "InternalName", "Zadig"
             VALUE "LegalCopyright", "� 2010-2023 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.8.787"
+            VALUE "ProductVersion", "2.9.788"
             VALUE "Comments", "https://zadig.akeo.ie"
         END
     END

diff --git a/examples/zadig_license.h b/examples/zadig_license.h
@@ -1,6 +1,6 @@
 /*
  * Zadig: Automated Driver Installer for USB devices (GUI version)
- * Copyright (c) 2010-2023 Pete Batard <[email protected]>
+ * Copyright (c) 2010-2024 Pete Batard <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ const char* about_blurb_format =
 "{\\b\\fs20Zadig - The Automated Driver Installer}\\line\n"
 "\\fs18Version %d.%d (Build %d)\\line\n"
 "\\line\n"
-"Copyright © 2010-2023 Pete Batard / Akeo\\line\n"
+"Copyright © 2010-2024 Pete Batard / Akeo\\line\n"
 APPLICATION_URL "\\line\n"
 "\\line\n"
 "Report bugs or request enhancements at:\\line\n"
@@ -32,7 +32,7 @@ APPLICATION_URL "\\line\n"
 const char* additional_copyrights =
 "{\\rtf1\\ansi\n"
 "Windows Driver Installer library, libwdi:\\line\n"
-"Copyright © 2010-2023 by Pete Batard et al.\\line\n"
+"Copyright © 2010-2024 by Pete Batard et al.\\line\n"
 "GNU Lesser General Public License (LGPL) v3 or later\\line\n"
 "https://github.com/pbatard/libwdi/wiki\\line\n"
 "\\line\n"

diff --git a/examples/zadig_net.c b/examples/zadig_net.c
@@ -1,7 +1,7 @@
 /*
  * Zadig: Automated Driver Installer for USB devices (GUI version)
  * Networking functionality (web file download, check for update, etc.)
- * Copyright © 2012-2023 Pete Batard <[email protected]>
+ * Copyright © 2012-2024 Pete Batard <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,0,787
- PRODUCTVERSION 1,5,0,787
+ FILEVERSION 1,5,1,788
+ PRODUCTVERSION 1,5,1,788
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
-            VALUE "FileVersion", "1.5.0.787"
+            VALUE "FileVersion", "1.5.1.788"
             VALUE "InternalName", "libwdi"
             VALUE "LegalCopyright", "� 2010-2023 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "libwdi"
             VALUE "ProductName", "libwdi"
-            VALUE "ProductVersion", "1.5.0.787"
+            VALUE "ProductVersion", "1.5.1.788"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/libwdi/vid_data.c b/libwdi/vid_data.c
@@ -29,14 +29,15 @@ struct vendor_name {
 
 /*
  * http://www.linux-usb.org/usb.ids
- * Version: 2023.01.16
+ * Version: 2024.03.18
  */
 static struct vendor_name usb_vendor[] = {
 	{ 0x0001, "Fry's Electronics" },
 	{ 0x0002, "Ingram" },
 	{ 0x0003, "Club Mac" },
 	{ 0x0004, "Nebraska Furniture Mart" },
 	{ 0x0011, "Unknown" },
+	{ 0x001f, "Walmart" },
 	{ 0x0040, "Anyware Corporation" },
 	{ 0x0042, "DMT" },
 	{ 0x0053, "Planex" },
@@ -173,7 +174,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0464, "AMP/Tycoelectronics Corp." },
 	{ 0x0467, "AT&T Paradyne" },
 	{ 0x0468, "Wieson Technologies Co., Ltd" },
-	{ 0x046a, "Cherry GmbH" },
+	{ 0x046a, "CHERRY" },
 	{ 0x046b, "American Megatrends, Inc." },
 	{ 0x046c, "Toshiba Corp., Digital Media Equipment" },
 	{ 0x046d, "Logitech, Inc." },
@@ -1226,6 +1227,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0a2c, "AK-Modul-Bus Computer GmbH" },
 	{ 0x0a34, "TG3 Electronics, Inc." },
 	{ 0x0a35, "Radikal Technologies" },
+	{ 0x0a38, "IRIS sa" },
 	{ 0x0a39, "Gilat Satellite Networks, Ltd" },
 	{ 0x0a3a, "PentaMedia Co., Ltd" },
 	{ 0x0a3c, "NTT DoCoMo, Inc." },
@@ -1249,7 +1251,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0a5b, "EAsics NV" },
 	{ 0x0a5c, "Broadcom Corp." },
 	{ 0x0a5d, "Diatrend Corp." },
-	{ 0x0a5f, "Zebra" },
+	{ 0x0a5f, "Zebra Technologies" },
 	{ 0x0a62, "MPMan" },
 	{ 0x0a66, "ClearCube Technology" },
 	{ 0x0a67, "Medeli Electronics Co., Ltd" },
@@ -3267,6 +3269,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x2e57, "MEGWARE Computer Vertrieb und Service GmbH" },
 	{ 0x2e69, "Swift Navigation" },
 	{ 0x2e95, "SCUF Gaming" },
+	{ 0x2ecc, "ASR Microelectronics" },
 	{ 0x2f76, "KeyXentic Inc." },
 	{ 0x2fad, "Definium Technologies" },
 	{ 0x2fb0, "Infocrypt" },