Skip to content

Commit bccb43d

Browse files
pbatardpbatard
committed
Zadig 2.5
* Update copyrights
1 parent 88cee37 commit bccb43d

File tree

10 files changed

+58
-34
lines changed

10 files changed

+58
-34
lines changed

‎_bz.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@echo off
22

3-
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=amd64
3+
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=amd64
44
cd /d "%~dp0"
55
rem *** Get the version
66
for /f "tokens=3" %%i in ('findstr FileVersion examples\zadig.rc') do set "ver=%%i"
77
set ver=%ver:"=%
88
for /f "tokens=1,2 delims=." %%i in ("%ver%") do set "ZADIG_VERSION=%%i.%%j"
99
msbuild libwdi.sln /m /p:Project=Zadig;Configuration=Release,Platform=Win32 /t:Rebuild
1010
copy Win32\Release\examples\zadig.exe zadig-%ZADIG_VERSION%.exe
11-
upx --lzma zadig-%ZADIG_VERSION%.exe
12-
"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
11+
upx --lzma --best zadig-%ZADIG_VERSION%.exe
12+
"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
1313
pause

‎examples/wdi-simple.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#endif
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,3,729,0
11-
PRODUCTVERSION 1,3,729,0
10+
FILEVERSION 1,3,730,0
11+
PRODUCTVERSION 1,3,730,0
1212
FILEFLAGSMASK 0x17L
1313
#ifdef _DEBUG
1414
FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
2525
BEGIN
2626
VALUE "CompanyName", "akeo.ie"
2727
VALUE "FileDescription", "WDI-Simple"
28-
VALUE "FileVersion", "1.3.729"
28+
VALUE "FileVersion", "1.3.730"
2929
VALUE "InternalName", "WDI-Simple"
3030
VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
3131
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
3232
VALUE "OriginalFilename", "wdi-simple.exe"
3333
VALUE "ProductName", "WDI-Simple"
34-
VALUE "ProductVersion", "1.3.729"
34+
VALUE "ProductVersion", "1.3.730"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎examples/zadic.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ END
5656
//
5757

5858
VS_VERSION_INFO VERSIONINFO
59-
FILEVERSION 1,3,729,0
60-
PRODUCTVERSION 1,3,729,0
59+
FILEVERSION 1,3,730,0
60+
PRODUCTVERSION 1,3,730,0
6161
FILEFLAGSMASK 0x17L
6262
#ifdef _DEBUG
6363
FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
7474
BEGIN
7575
VALUE "CompanyName", "akeo.ie"
7676
VALUE "FileDescription", "Zadic"
77-
VALUE "FileVersion", "1.3.729"
77+
VALUE "FileVersion", "1.3.730"
7878
VALUE "InternalName", "Zadic"
7979
VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
8080
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
8181
VALUE "OriginalFilename", "zadic.exe"
8282
VALUE "ProductName", "Zadic"
83-
VALUE "ProductVersion", "1.3.729"
83+
VALUE "ProductVersion", "1.3.730"
8484
VALUE "Comments", "http://libwdi.akeo.ie"
8585
END
8686
END

‎examples/zadig.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Zadig: Automated Driver Installer for USB devices (GUI version)
3-
* Copyright (c) 2010-2017 Pete Batard <pete@akeo.ie>
3+
* Copyright (c) 2010-2020 Pete Batard <pete@akeo.ie>
44
* For more info, please visit http://libwdi.akeo.ie
55
*
66
* This program is free software: you can redistribute it and/or modify

‎examples/zadig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#define FIELD_ORANGE RGB(255,240,200)
6060
#define ARROW_GREEN RGB(92,228,65)
6161
#define ARROW_ORANGE RGB(253,143,56)
62-
#define APP_VERSION "Zadig 2.4.729"
62+
#define APP_VERSION "Zadig 2.5.730"
6363

6464
// These are used to flag end users about the driver they are going to replace
6565
enum driver_type {

‎examples/zadig.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ END
246246
//
247247

248248
VS_VERSION_INFO VERSIONINFO
249-
FILEVERSION 2,4,729,0
250-
PRODUCTVERSION 2,4,729,0
249+
FILEVERSION 2,5,730,0
250+
PRODUCTVERSION 2,5,730,0
251251
FILEFLAGSMASK 0x17L
252252
#ifdef _DEBUG
253253
FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
264264
BEGIN
265265
VALUE "CompanyName", "akeo.ie"
266266
VALUE "FileDescription", "Zadig"
267-
VALUE "FileVersion", "2.4.729"
267+
VALUE "FileVersion", "2.5.730"
268268
VALUE "InternalName", "Zadig"
269269
VALUE "LegalCopyright", "� 2010-2018 Pete Batard (GPL v3)"
270270
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
271271
VALUE "OriginalFilename", "zadig.exe"
272272
VALUE "ProductName", "Zadig"
273-
VALUE "ProductVersion", "2.4.729"
273+
VALUE "ProductVersion", "2.5.730"
274274
VALUE "Comments", "http://libwdi.akeo.ie"
275275
END
276276
END

‎examples/zadig_README.creole‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
=== v2.5 (2020.03.28) ===
2+
* Fix cat generation for some user directories with non western characters
3+
* Fix update check
4+
* Improve error reporting
5+
* Embedded drivers: WinUSB v6.1.7600.16385, libusb-win32 v1.2.6.0, libusbK v3.0.7.0 & usbser (native)
6+
17
=== v2.4 (2018.07.26) ===
28
* Fix HTTPS download and update URLs
39
* Improve error reporting

‎examples/zadig_license.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Zadig: Automated Driver Installer for USB devices (GUI version)
3-
* Copyright (c) 2010-2018 Pete Batard <pete@akeo.ie>
3+
* Copyright (c) 2010-2020 Pete Batard <pete@akeo.ie>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ const char* about_blurb_format =
2121
"{\\b\\fs20Zadig - The Automated Driver Installer}\\line\n"
2222
"\\fs18Version %d.%d (Build %d)\\line\n"
2323
"\\line\n"
24-
"Copyright © 2010-2018 Pete Batard / Akeo\\line\n"
24+
"Copyright © 2010-2020 Pete Batard / Akeo\\line\n"
2525
APPLICATION_URL "\\line\n"
2626
"\\line\n"
2727
"Report bugs or request enhancements at:\\line\n"
@@ -32,21 +32,21 @@ APPLICATION_URL "\\line\n"
3232
const char* additional_copyrights =
3333
"{\\rtf1\\ansi\n"
3434
"Windows Driver Installer library, libwdi:\\line\n"
35-
"Copyright © 2010-2018 by Pete Batard et al.\\line\n"
35+
"Copyright © 2010-2020 by Pete Batard et al.\\line\n"
3636
"GNU Lesser General Public License (LGPL) v3 or later\\line\n"
3737
"https://github.com/pbatard/libwdi/wiki\\line\n"
3838
"\\line\n"
3939
"Configuration file parsing based on profile.c:\\line\n"
40-
"Copyright © 2005-2006, Theodore Ts'o.\\line\n"
41-
"Copyright © 2006-2011, the Kerberos Team.\\line\n"
40+
"Copyright © 2005-2006, Theodore Ts'o.\\line\n"
41+
"Copyright © 2006-2011, the Kerberos Team.\\line\n"
4242
"Redistributable under the GNU General Public License (GPL)\\line\n"
4343
"\\line\n"
4444
"VID identification from the USB ID Repository\\line\n"
45-
"Copyright © Stephen J. Gowdy et al., Public Domain\\line\n"
45+
"Copyright © Stephen J. Gowdy et al., Public Domain\\line\n"
4646
"http://www.linux-usb.org/usb-ids.html\\line\n"
4747
"\\line\n"
4848
"About and License dialogs inspired by WinSCP\\line\n"
49-
"Copyright © 2000-2013 Martin Prikryl.\\line\n"
49+
"Copyright © 2000-2013 Martin Prikryl.\\line\n"
5050
"GNU General Public License (GPL) v3 or later\\line\n"
5151
"\\line\n"
5252
"All other references can be found in the source.\\line\n}";

‎libwdi/libwdi.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ END
5050
//
5151

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 1,3,729,0
54-
PRODUCTVERSION 1,3,729,0
53+
FILEVERSION 1,3,730,0
54+
PRODUCTVERSION 1,3,730,0
5555
FILEFLAGSMASK 0x17L
5656
#ifdef _DEBUG
5757
FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
6868
BEGIN
6969
VALUE "CompanyName", "akeo.ie"
7070
VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
71-
VALUE "FileVersion", "1.3.729"
71+
VALUE "FileVersion", "1.3.730"
7272
VALUE "InternalName", "libwdi"
7373
VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
7474
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
7575
VALUE "OriginalFilename", "libwdi"
7676
VALUE "ProductName", "libwdi"
77-
VALUE "ProductVersion", "1.3.729"
77+
VALUE "ProductVersion", "1.3.730"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

‎libwdi/vid_data.c‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct vendor_name {
2929

3030
/*
3131
* http://www.linux-usb.org/usb.ids
32-
* Version: 2018.07.03
32+
* Version: 2020.03.25
3333
*/
3434
static struct vendor_name usb_vendor[] = {
3535
{ 0x0001, "Fry's Electronics" },
@@ -40,7 +40,9 @@ static struct vendor_name usb_vendor[] = {
4040
{ 0x0053, "Planex" },
4141
{ 0x0078, "Microntek" },
4242
{ 0x0079, "DragonRise Inc." },
43+
{ 0x0080, "Assmann Electronic GmbH" },
4344
{ 0x0085, "Boeye Technology Co., Ltd." },
45+
{ 0x0102, "miniSTREAK" },
4446
{ 0x0105, "Trust International B.V." },
4547
{ 0x0127, "IBP" },
4648
{ 0x0145, "Unknown" },
@@ -108,7 +110,7 @@ static struct vendor_name usb_vendor[] = {
108110
{ 0x0421, "Nokia Mobile Phones" },
109111
{ 0x0422, "ADI Systems, Inc." },
110112
{ 0x0423, "Computer Access Technology Corp." },
111-
{ 0x0424, "Standard Microsystems Corp." },
113+
{ 0x0424, "Microchip Technology, Inc. (formerly SMSC)" },
112114
{ 0x0425, "Motorola Semiconductors HK, Ltd" },
113115
{ 0x0426, "Integrated Device Technology, Inc." },
114116
{ 0x0427, "Motorola Electronics Taiwan, Ltd" },
@@ -1157,7 +1159,7 @@ static struct vendor_name usb_vendor[] = {
11571159
{ 0x09c0, "Genpix Electronics, LLC" },
11581160
{ 0x09c1, "Arris Interactive LLC" },
11591161
{ 0x09c2, "Nisca Corp." },
1160-
{ 0x09c3, "ActivCard, Inc." },
1162+
{ 0x09c3, "HID Global" },
11611163
{ 0x09c4, "ACTiSYS Corp." },
11621164
{ 0x09c5, "Memory Corp." },
11631165
{ 0x09ca, "BMC Messsysteme GmbH" },
@@ -2062,7 +2064,7 @@ static struct vendor_name usb_vendor[] = {
20622064
{ 0x10bd, "TMT Technology, Inc." },
20632065
{ 0x10bf, "SmartHome" },
20642066
{ 0x10c3, "Universal Laser Systems, Inc." },
2065-
{ 0x10c4, "Cygnal Integrated Products, Inc." },
2067+
{ 0x10c4, "Silicon Labs" },
20662068
{ 0x10c5, "Sanei Electric, Inc." },
20672069
{ 0x10c6, "Intec, Inc." },
20682070
{ 0x10cb, "Eratech" },
@@ -2158,7 +2160,7 @@ static struct vendor_name usb_vendor[] = {
21582160
{ 0x11f6, "Prolific" },
21592161
{ 0x11f7, "Alcatel (?)" },
21602162
{ 0x1203, "TSC Auto ID Technology Co., Ltd" },
2161-
{ 0x1209, "InterBiometrics" },
2163+
{ 0x1209, "Generic" },
21622164
{ 0x120e, "Hudson Soft Co., Ltd" },
21632165
{ 0x120f, "Magellan" },
21642166
{ 0x1210, "DigiTech" },
@@ -2801,7 +2803,7 @@ static struct vendor_name usb_vendor[] = {
28012803
{ 0x1e0e, "Qualcomm / Option" },
28022804
{ 0x1e10, "Point Grey Research, Inc." },
28032805
{ 0x1e17, "Mirion Technologies Dosimetry Services Division" },
2804-
{ 0x1e1d, "Lumension Security" },
2806+
{ 0x1e1d, "Kanguru Solutions" },
28052807
{ 0x1e1f, "INVIA" },
28062808
{ 0x1e29, "Festo AG & Co. KG" },
28072809
{ 0x1e3d, "Chipsbank Microelectronics Co., Ltd" },
@@ -2874,12 +2876,16 @@ static struct vendor_name usb_vendor[] = {
28742876
{ 0x2232, "Silicon Motion" },
28752877
{ 0x2233, "RadioShack Corporation" },
28762878
{ 0x2237, "Kobo Inc." },
2879+
{ 0x224f, "APDM" },
28772880
{ 0x225d, "Morpho" },
28782881
{ 0x228d, "8D Technologies inc." },
28792882
{ 0x22a6, "Pie Digital, Inc." },
28802883
{ 0x22b8, "Motorola PCS" },
28812884
{ 0x22b9, "eTurboTouch Technology, Inc." },
28822885
{ 0x22ba, "Technology Innovation Holdings, Ltd" },
2886+
{ 0x22c9, "StepOver GmbH" },
2887+
{ 0x22cd, "Kinova Robotics Inc." },
2888+
{ 0x22e0, "secunet Security Networks AG" },
28832889
{ 0x2304, "Pinnacle Systems, Inc." },
28842890
{ 0x2318, "Shining Technologies, Inc. [hex]" },
28852891
{ 0x2341, "Arduino SA" },
@@ -2894,30 +2900,42 @@ static struct vendor_name usb_vendor[] = {
28942900
{ 0x24e1, "Paratronic" },
28952901
{ 0x2516, "Cooler Master Co., Ltd." },
28962902
{ 0x2548, "Pulse-Eight" },
2903+
{ 0x25b5, "FlatFrog" },
28972904
{ 0x2632, "TwinMOS" },
28982905
{ 0x2639, "Xsens" },
28992906
{ 0x2650, "Electronics For Imaging, Inc. [hex]" },
29002907
{ 0x2659, "Sundtek" },
29012908
{ 0x2676, "Basler AG" },
2909+
{ 0x2717, "Xiaomi Inc." },
29022910
{ 0x2730, "Citizen" },
29032911
{ 0x2735, "DigitalWay" },
29042912
{ 0x273f, "Hughski Limited" },
29052913
{ 0x2770, "NHJ, Ltd" },
29062914
{ 0x27b8, "ThingM" },
2915+
{ 0x27c6, "Shenzhen Goodix Technology Co.,Ltd." },
29072916
{ 0x2821, "ASUSTek Computer Inc." },
29082917
{ 0x2899, "Toptronic Industrial Co., Ltd" },
29092918
{ 0x289b, "Dracal/Raphnet technologies" },
2919+
{ 0x28de, "Valve Software" },
29102920
{ 0x2931, "Jolla Oy" },
29112921
{ 0x2939, "Zaber Technologies Inc." },
29122922
{ 0x2a03, "dog hunter AG" },
29132923
{ 0x2a37, "RTD Embedded Technologies, Inc." },
29142924
{ 0x2a45, "Meizu Corp." },
2925+
{ 0x2ac7, "Ultrahaptics Ltd." },
29152926
{ 0x2b24, "KeepKey LLC" },
29162927
{ 0x2c02, "Planex Communications" },
29172928
{ 0x2c1a, "Dolphin Peripherals" },
2929+
{ 0x2c23, "Supermicro Computer Incorporated" },
29182930
{ 0x2c7c, "Quectel Wireless Solutions Co., Ltd." },
2931+
{ 0x2cdc, "Sea & Sun Technology GmbH" },
29192932
{ 0x2dcf, "Dialog Semiconductor" },
29202933
{ 0x2fb2, "Fujitsu, Ltd" },
2934+
{ 0x3016, "Boundary Devices, LLC" },
2935+
{ 0x30a4, "Blues Wireless" },
2936+
{ 0x30c2, "UNPARALLEL Innovation, Lda" },
2937+
{ 0x30c9, "Luxvisions Innotech Limited" },
2938+
{ 0x30ee, "Fujitsu Connected Technologies Limited" },
29212939
{ 0x3125, "Eagletron" },
29222940
{ 0x3136, "Navini Networks" },
29232941
{ 0x3176, "Whanam Electronics Co., Ltd" },

0 commit comments

Comments
 (0)