Zadig 2.5

* Update copyrights
pbatard · Mar 28, 2020 · bccb43d · bccb43d
1 parent 88cee37
commit bccb43d
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 34 deletions.
diff --git a/_bz.cmd b/_bz.cmd
@@ -1,13 +1,13 @@
 @echo off
 
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=amd64
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=amd64
 cd /d "%~dp0"
 rem *** Get the version
 for /f "tokens=3" %%i in ('findstr FileVersion examples\zadig.rc') do set "ver=%%i"
 set ver=%ver:"=%
 for /f "tokens=1,2 delims=." %%i in ("%ver%") do set "ZADIG_VERSION=%%i.%%j"
 msbuild libwdi.sln /m /p:Project=Zadig;Configuration=Release,Platform=Win32 /t:Rebuild
 copy Win32\Release\examples\zadig.exe zadig-%ZADIG_VERSION%.exe
-upx --lzma zadig-%ZADIG_VERSION%.exe
-"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp zadig-%ZADIG_VERSION%.exe
+upx --lzma --best zadig-%ZADIG_VERSION%.exe
+"C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp zadig-%ZADIG_VERSION%.exe
 pause
diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,729,0
- PRODUCTVERSION 1,3,729,0
+ FILEVERSION 1,3,730,0
+ PRODUCTVERSION 1,3,730,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "WDI-Simple"
-            VALUE "FileVersion", "1.3.729"
+            VALUE "FileVersion", "1.3.730"
             VALUE "InternalName", "WDI-Simple"
             VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "wdi-simple.exe"
             VALUE "ProductName", "WDI-Simple"
-            VALUE "ProductVersion", "1.3.729"
+            VALUE "ProductVersion", "1.3.730"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadic.rc b/examples/zadic.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,729,0
- PRODUCTVERSION 1,3,729,0
+ FILEVERSION 1,3,730,0
+ PRODUCTVERSION 1,3,730,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadic"
-            VALUE "FileVersion", "1.3.729"
+            VALUE "FileVersion", "1.3.730"
             VALUE "InternalName", "Zadic"
             VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "zadic.exe"
             VALUE "ProductName", "Zadic"
-            VALUE "ProductVersion", "1.3.729"
+            VALUE "ProductVersion", "1.3.730"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadig.c b/examples/zadig.c
@@ -1,6 +1,6 @@
 /*
  * Zadig: Automated Driver Installer for USB devices (GUI version)
- * Copyright (c) 2010-2017 Pete Batard <pete@akeo.ie>
+ * Copyright (c) 2010-2020 Pete Batard <pete@akeo.ie>
  * For more info, please visit http://libwdi.akeo.ie
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/examples/zadig.h b/examples/zadig.h
@@ -59,7 +59,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.4.729"
+#define APP_VERSION                 "Zadig 2.5.730"
 
 // 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,4,729,0
- PRODUCTVERSION 2,4,729,0
+ FILEVERSION 2,5,730,0
+ PRODUCTVERSION 2,5,730,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.4.729"
+            VALUE "FileVersion", "2.5.730"
             VALUE "InternalName", "Zadig"
             VALUE "LegalCopyright", "� 2010-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.4.729"
+            VALUE "ProductVersion", "2.5.730"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadig_README.creole b/examples/zadig_README.creole
@@ -1,3 +1,9 @@
+=== v2.5 (2020.03.28) ===
+* Fix cat generation for some user directories with non western characters
+* Fix update check
+* Improve error reporting
+* Embedded drivers: WinUSB v6.1.7600.16385, libusb-win32 v1.2.6.0, libusbK v3.0.7.0 & usbser (native)
+
 === v2.4 (2018.07.26) ===
 * Fix HTTPS download and update URLs
 * Improve error reporting

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-2018 Pete Batard <pete@akeo.ie>
+ * Copyright (c) 2010-2020 Pete Batard <pete@akeo.ie>
  *
  * 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-2018 Pete Batard / Akeo\\line\n"
+"Copyright © 2010-2020 Pete Batard / Akeo\\line\n"
 APPLICATION_URL "\\line\n"
 "\\line\n"
 "Report bugs or request enhancements at:\\line\n"
@@ -32,21 +32,21 @@ APPLICATION_URL "\\line\n"
 const char* additional_copyrights =
 "{\\rtf1\\ansi\n"
 "Windows Driver Installer library, libwdi:\\line\n"
-"Copyright © 2010-2018 by Pete Batard et al.\\line\n"
+"Copyright © 2010-2020 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"
 "Configuration file parsing based on profile.c:\\line\n"
-"Copyright © 2005-2006, Theodore Ts'o.\\line\n"
-"Copyright © 2006-2011, the Kerberos Team.\\line\n"
+"Copyright © 2005-2006, Theodore Ts'o.\\line\n"
+"Copyright © 2006-2011, the Kerberos Team.\\line\n"
 "Redistributable under the GNU General Public License (GPL)\\line\n"
 "\\line\n"
 "VID identification from the USB ID Repository\\line\n"
-"Copyright © Stephen J. Gowdy et al., Public Domain\\line\n"
+"Copyright © Stephen J. Gowdy et al., Public Domain\\line\n"
 "http://www.linux-usb.org/usb-ids.html\\line\n"
 "\\line\n"
 "About and License dialogs inspired by WinSCP\\line\n"
-"Copyright © 2000-2013 Martin Prikryl.\\line\n"
+"Copyright © 2000-2013 Martin Prikryl.\\line\n"
 "GNU General Public License (GPL) v3 or later\\line\n"
 "\\line\n"
 "All other references can be found in the source.\\line\n}";

diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,729,0
- PRODUCTVERSION 1,3,729,0
+ FILEVERSION 1,3,730,0
+ PRODUCTVERSION 1,3,730,0
  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.3.729"
+            VALUE "FileVersion", "1.3.730"
             VALUE "InternalName", "libwdi"
             VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "libwdi"
             VALUE "ProductName", "libwdi"
-            VALUE "ProductVersion", "1.3.729"
+            VALUE "ProductVersion", "1.3.730"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/libwdi/vid_data.c b/libwdi/vid_data.c
@@ -29,7 +29,7 @@ struct vendor_name {
 
 /*
  * http://www.linux-usb.org/usb.ids
- * Version: 2018.07.03
+ * Version: 2020.03.25
  */
 static struct vendor_name usb_vendor[] = {
 	{ 0x0001, "Fry's Electronics" },
@@ -40,7 +40,9 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0053, "Planex" },
 	{ 0x0078, "Microntek" },
 	{ 0x0079, "DragonRise Inc." },
+	{ 0x0080, "Assmann Electronic GmbH" },
 	{ 0x0085, "Boeye Technology Co., Ltd." },
+	{ 0x0102, "miniSTREAK" },
 	{ 0x0105, "Trust International B.V." },
 	{ 0x0127, "IBP" },
 	{ 0x0145, "Unknown" },
@@ -108,7 +110,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0421, "Nokia Mobile Phones" },
 	{ 0x0422, "ADI Systems, Inc." },
 	{ 0x0423, "Computer Access Technology Corp." },
-	{ 0x0424, "Standard Microsystems Corp." },
+	{ 0x0424, "Microchip Technology, Inc. (formerly SMSC)" },
 	{ 0x0425, "Motorola Semiconductors HK, Ltd" },
 	{ 0x0426, "Integrated Device Technology, Inc." },
 	{ 0x0427, "Motorola Electronics Taiwan, Ltd" },
@@ -1157,7 +1159,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x09c0, "Genpix Electronics, LLC" },
 	{ 0x09c1, "Arris Interactive LLC" },
 	{ 0x09c2, "Nisca Corp." },
-	{ 0x09c3, "ActivCard, Inc." },
+	{ 0x09c3, "HID Global" },
 	{ 0x09c4, "ACTiSYS Corp." },
 	{ 0x09c5, "Memory Corp." },
 	{ 0x09ca, "BMC Messsysteme GmbH" },
@@ -2062,7 +2064,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x10bd, "TMT Technology, Inc." },
 	{ 0x10bf, "SmartHome" },
 	{ 0x10c3, "Universal Laser Systems, Inc." },
-	{ 0x10c4, "Cygnal Integrated Products, Inc." },
+	{ 0x10c4, "Silicon Labs" },
 	{ 0x10c5, "Sanei Electric, Inc." },
 	{ 0x10c6, "Intec, Inc." },
 	{ 0x10cb, "Eratech" },
@@ -2158,7 +2160,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x11f6, "Prolific" },
 	{ 0x11f7, "Alcatel (?)" },
 	{ 0x1203, "TSC Auto ID Technology Co., Ltd" },
-	{ 0x1209, "InterBiometrics" },
+	{ 0x1209, "Generic" },
 	{ 0x120e, "Hudson Soft Co., Ltd" },
 	{ 0x120f, "Magellan" },
 	{ 0x1210, "DigiTech" },
@@ -2801,7 +2803,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1e0e, "Qualcomm / Option" },
 	{ 0x1e10, "Point Grey Research, Inc." },
 	{ 0x1e17, "Mirion Technologies Dosimetry Services Division" },
-	{ 0x1e1d, "Lumension Security" },
+	{ 0x1e1d, "Kanguru Solutions" },
 	{ 0x1e1f, "INVIA" },
 	{ 0x1e29, "Festo AG & Co. KG" },
 	{ 0x1e3d, "Chipsbank Microelectronics Co., Ltd" },
@@ -2874,12 +2876,16 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x2232, "Silicon Motion" },
 	{ 0x2233, "RadioShack Corporation" },
 	{ 0x2237, "Kobo Inc." },
+	{ 0x224f, "APDM" },
 	{ 0x225d, "Morpho" },
 	{ 0x228d, "8D Technologies inc." },
 	{ 0x22a6, "Pie Digital, Inc." },
 	{ 0x22b8, "Motorola PCS" },
 	{ 0x22b9, "eTurboTouch Technology, Inc." },
 	{ 0x22ba, "Technology Innovation Holdings, Ltd" },
+	{ 0x22c9, "StepOver GmbH" },
+	{ 0x22cd, "Kinova Robotics Inc." },
+	{ 0x22e0, "secunet Security Networks AG" },
 	{ 0x2304, "Pinnacle Systems, Inc." },
 	{ 0x2318, "Shining Technologies, Inc. [hex]" },
 	{ 0x2341, "Arduino SA" },
@@ -2894,30 +2900,42 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x24e1, "Paratronic" },
 	{ 0x2516, "Cooler Master Co., Ltd." },
 	{ 0x2548, "Pulse-Eight" },
+	{ 0x25b5, "FlatFrog" },
 	{ 0x2632, "TwinMOS" },
 	{ 0x2639, "Xsens" },
 	{ 0x2650, "Electronics For Imaging, Inc. [hex]" },
 	{ 0x2659, "Sundtek" },
 	{ 0x2676, "Basler AG" },
+	{ 0x2717, "Xiaomi Inc." },
 	{ 0x2730, "Citizen" },
 	{ 0x2735, "DigitalWay" },
 	{ 0x273f, "Hughski Limited" },
 	{ 0x2770, "NHJ, Ltd" },
 	{ 0x27b8, "ThingM" },
+	{ 0x27c6, "Shenzhen Goodix Technology Co.,Ltd." },
 	{ 0x2821, "ASUSTek Computer Inc." },
 	{ 0x2899, "Toptronic Industrial Co., Ltd" },
 	{ 0x289b, "Dracal/Raphnet technologies" },
+	{ 0x28de, "Valve Software" },
 	{ 0x2931, "Jolla Oy" },
 	{ 0x2939, "Zaber Technologies Inc." },
 	{ 0x2a03, "dog hunter AG" },
 	{ 0x2a37, "RTD Embedded Technologies, Inc." },
 	{ 0x2a45, "Meizu Corp." },
+	{ 0x2ac7, "Ultrahaptics Ltd." },
 	{ 0x2b24, "KeepKey LLC" },
 	{ 0x2c02, "Planex Communications" },
 	{ 0x2c1a, "Dolphin Peripherals" },
+	{ 0x2c23, "Supermicro Computer Incorporated" },
 	{ 0x2c7c, "Quectel Wireless Solutions Co., Ltd." },
+	{ 0x2cdc, "Sea & Sun Technology GmbH" },
 	{ 0x2dcf, "Dialog Semiconductor" },
 	{ 0x2fb2, "Fujitsu, Ltd" },
+	{ 0x3016, "Boundary Devices, LLC" },
+	{ 0x30a4, "Blues Wireless" },
+	{ 0x30c2, "UNPARALLEL Innovation, Lda" },
+	{ 0x30c9, "Luxvisions Innotech Limited" },
+	{ 0x30ee, "Fujitsu Connected Technologies Limited" },
 	{ 0x3125, "Eagletron" },
 	{ 0x3136, "Navini Networks" },
 	{ 0x3176, "Whanam Electronics Co., Ltd" },