Skip to content

Commit 1745a5e

Browse files
pbatardpbatard
committed
libwdi 1.3.0
* Also bump Zadig to 2.3
1 parent 4817f0c commit 1745a5e

13 files changed

+78
-53
lines changed

‎.amend.cmd

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
echo off
2+
echo .>.amend

‎ChangeLog

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
For the latest changes, please visit:
22
https://github.com/pbatard/libwdi/commits/master
33

4+
o v1.3.0 (2017.04.18)
5+
Bugfixes:
6+
- fix issues with extended characters in current user directory
7+
Improvements:
8+
- drop Windows XP and Vista support
9+
410
o v1.2.5 (2016.01.22)
511
Bugfixes:
612
- fix possible crash when deleting the self signing private key

‎Makefile.am

+8
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,12 @@ SUBDIRS = libwdi
44

55
if BUILD_EXAMPLES
66
SUBDIRS += examples
7+
ZADIG_VERSION = $(shell sed -n 's/^.*\"FileVersion\", \"\(.*\)\..*\"/\1/p' examples/zadig.rc)
78
endif
9+
10+
# This step produces the UPX compressed and signed releases that are made available for public download
11+
# NB: UPX v3.09 or later is needed for LZMA compression (http://upx.sourceforge.net/)
12+
zadig_release:
13+
@cp examples/zadig.exe ./zadig-$(ZADIG_VERSION).exe
14+
@upx --lzma zadig-$(ZADIG_VERSION).exe
15+
@cmd.exe //c _sign.cmd zadig-$(ZADIG_VERSION).exe

‎_bm.sh

+6-15
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22
# Create and upload a Zadig release
33
# !!!THIS SCRIPT IS FOR INTERNAL DEVELOPER USE ONLY!!!
44

5-
target_dir=/e/dailies/libwdi
6-
75
type -P git &>/dev/null || { echo "Git not found. Aborting." >&2; exit 1; }
8-
type -P sed &>/dev/null || { echo "Set not found. Aborting." >&2; exit 1; }
6+
type -P sed &>/dev/null || { echo "Sed not found. Aborting." >&2; exit 1; }
97
type -P upx &>/dev/null || { echo "UPX executable not found. Aborting." >&2; exit 1; }
108

11-
zadig_version=`sed -n 's/^.*\"FileVersion\", \"\(.*\)\..*\"/\1/p' examples/zadig.rc`
12-
echo Building Zadig v$zadig_version...
13-
149
git clean -fdx
1510
./autogen.sh --disable-shared
1611

17-
cd libwdi
18-
make
19-
cd ../examples
20-
make zadig.exe
21-
type -P SetACL &>/dev/null && { SetACL -on ./zadig.exe -ot file -actn ace -ace "n:S-1-5-18;p:read,read_ex;s:y"; }
22-
upx --lzma zadig.exe
23-
cp zadig.exe $target_dir/zadig_$zadig_version.exe
24-
cmd.exe /k zadig_sign.bat "$target_dir/zadig_$zadig_version.exe"
25-
cd ..
12+
zadig_version=`sed -n 's/^.*\"FileVersion\", \"\(.*\)\..*\"/\1/p' examples/zadig.rc`
13+
echo Building Zadig v$zadig_version...
14+
15+
make -j12
16+
make zadig_release

‎_sign.cmd

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
@echo off
2+
:retry_sha1
3+
"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool" sign /v /sha1 655f6413a8f721e3286ace95025c9e0ea132a984 /fd SHA1 /tr http://timestamp.comodoca.com/rfc3161 /td SHA1 %1
4+
if ERRORLEVEL 1 goto retry_sha1
5+
:retry_sha256
6+
"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool" sign /as /v /sha1 5759b23dc8f45e9120a7317f306e5b6890b612f0 /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 %1
7+
if ERRORLEVEL 1 goto retry_sha256
8+
exit

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([libwdi], [1.2.5], [[email protected]], [libwdi], [http://libwdi.akeo.ie])
1+
AC_INIT([libwdi], [1.3.0], [[email protected]], [libwdi], [http://libwdi.akeo.ie])
22
AM_INIT_AUTOMAKE([-Wno-portability 1.11 foreign])
33
AC_CONFIG_SRCDIR([libwdi/libwdi.c])
44
AC_CONFIG_MACRO_DIR([m4])

‎examples/wdi-simple.rc

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#endif
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,2,5,700
11-
PRODUCTVERSION 1,2,5,700
10+
FILEVERSION 1,3,0,701
11+
PRODUCTVERSION 1,3,0,701
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.2.5.700"
28+
VALUE "FileVersion", "1.3.0.701"
2929
VALUE "InternalName", "WDI-Simple"
30-
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
30+
VALUE "LegalCopyright", "� 2010-2017 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.2.5.700"
34+
VALUE "ProductVersion", "1.3.0.701"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎examples/zadic.rc

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ END
5656
//
5757

5858
VS_VERSION_INFO VERSIONINFO
59-
FILEVERSION 1,2,5,700
60-
PRODUCTVERSION 1,2,5,700
59+
FILEVERSION 1,3,0,701
60+
PRODUCTVERSION 1,3,0,701
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.2.5.700"
77+
VALUE "FileVersion", "1.3.0.701"
7878
VALUE "InternalName", "Zadic"
79-
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
79+
VALUE "LegalCopyright", "� 2010-2017 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.2.5.700"
83+
VALUE "ProductVersion", "1.3.0.701"
8484
VALUE "Comments", "http://libwdi.akeo.ie"
8585
END
8686
END

‎examples/zadig.h

+1-1
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.2.700"
62+
#define APP_VERSION "Zadig 2.3.701"
6363

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

‎examples/zadig.rc

+5-5
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ END
246246
//
247247

248248
VS_VERSION_INFO VERSIONINFO
249-
FILEVERSION 2,2,682,700
250-
PRODUCTVERSION 2,2,682,700
249+
FILEVERSION 2,3,682,701
250+
PRODUCTVERSION 2,3,682,701
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.2.700"
267+
VALUE "FileVersion", "2.3.701"
268268
VALUE "InternalName", "Zadig"
269-
VALUE "LegalCopyright", "� 2010-2016 Pete Batard (GPL v3)"
269+
VALUE "LegalCopyright", "� 2010-2017 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.2.700"
273+
VALUE "ProductVersion", "2.3.701"
274274
VALUE "Comments", "http://libwdi.akeo.ie"
275275
END
276276
END

‎examples/zadig_sign.bat

-9
This file was deleted.

‎libwdi/libwdi.rc

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ END
5050
//
5151

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 1,2,5,700
54-
PRODUCTVERSION 1,2,5,700
53+
FILEVERSION 1,3,0,701
54+
PRODUCTVERSION 1,3,0,701
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.2.5.700"
71+
VALUE "FileVersion", "1.3.0.701"
7272
VALUE "InternalName", "libwdi"
73-
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
73+
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.2.5.700"
77+
VALUE "ProductVersion", "1.3.0.701"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

‎libwdi/vid_data.c

+26-7
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: 2015.12.17
32+
* Version: 2017.02.12
3333
*/
3434
static struct vendor_name usb_vendor[] = {
3535
{ 0x0001, "Fry's Electronics" },
@@ -137,6 +137,7 @@ static struct vendor_name usb_vendor[] = {
137137
{ 0x0445, "Lucent Technologies, Inc." },
138138
{ 0x0446, "NMB Technologies Corp." },
139139
{ 0x0447, "Momentum Microsystems" },
140+
{ 0x0449, "Duta Multi Robotik" },
140141
{ 0x044a, "Shamrock Tech. Co., Ltd" },
141142
{ 0x044b, "WSI" },
142143
{ 0x044c, "CCL/ITRI" },
@@ -881,6 +882,7 @@ static struct vendor_name usb_vendor[] = {
881882
{ 0x07da, "Arasan Chip Systems" },
882883
{ 0x07de, "Diamond Multimedia" },
883884
{ 0x07df, "David Electronics Co., Ltd" },
885+
{ 0x07e0, "NCP engineering GmbH" },
884886
{ 0x07e1, "Ambient Technologies, Inc." },
885887
{ 0x07e2, "Elmeg GmbH & Co., Ltd" },
886888
{ 0x07e3, "Planex Communications, Inc." },
@@ -899,6 +901,7 @@ static struct vendor_name usb_vendor[] = {
899901
{ 0x07f7, "Century Corp." },
900902
{ 0x07f9, "Dotop Technology, Inc." },
901903
{ 0x07fa, "DrayTek Corp." },
904+
{ 0x07fc, "Thomann" },
902905
{ 0x07fd, "Mark of the Unicorn" },
903906
{ 0x07ff, "Unknown" },
904907
{ 0x0801, "MagTek" },
@@ -1127,6 +1130,7 @@ static struct vendor_name usb_vendor[] = {
11271130
{ 0x0993, "Gemstar eBook Group, Ltd" },
11281131
{ 0x0996, "Integrated Telecom Express, Inc." },
11291132
{ 0x099a, "Zippy Technology Corp." },
1133+
{ 0x099e, "Trimble Navigation, Ltd" },
11301134
{ 0x09a3, "PairGain Technologies" },
11311135
{ 0x09a4, "Contech Research, Inc." },
11321136
{ 0x09a5, "VCON Telecommunications" },
@@ -1151,14 +1155,16 @@ static struct vendor_name usb_vendor[] = {
11511155
{ 0x09c4, "ACTiSYS Corp." },
11521156
{ 0x09c5, "Memory Corp." },
11531157
{ 0x09ca, "BMC Messsysteme GmbH" },
1158+
{ 0x09cb, "FLIR Systems" },
11541159
{ 0x09cc, "Workbit Corp." },
11551160
{ 0x09cd, "Psion Dacom Home Networks, Ltd" },
11561161
{ 0x09ce, "City Electronics, Ltd" },
11571162
{ 0x09cf, "Electronics Testing Center, Taiwan" },
11581163
{ 0x09d1, "NeoMagic, Inc." },
11591164
{ 0x09d2, "Vreelin Engineering, Inc." },
11601165
{ 0x09d3, "Com One" },
1161-
{ 0x09d7, "Novatel Wireless" },
1166+
{ 0x09d7, "NovAtel Inc." },
1167+
{ 0x09d8, "ELATEC" },
11621168
{ 0x09d9, "KRF Tech, Ltd" },
11631169
{ 0x09da, "A4Tech Co., Ltd." },
11641170
{ 0x09db, "Measurement Computing Corp." },
@@ -1438,6 +1444,7 @@ static struct vendor_name usb_vendor[] = {
14381444
{ 0x0bf7, "Sunny Giken, Inc." },
14391445
{ 0x0bf8, "Fujitsu Siemens Computers" },
14401446
{ 0x0bfd, "Kvaser AB" },
1447+
{ 0x0c00, "FireFly Mouse Mat" },
14411448
{ 0x0c04, "MOTO Development Group, Inc." },
14421449
{ 0x0c05, "Appian Graphics" },
14431450
{ 0x0c06, "Hasbro Games, Inc." },
@@ -1547,7 +1554,6 @@ static struct vendor_name usb_vendor[] = {
15471554
{ 0x0cc4, "emsys GmbH" },
15481555
{ 0x0cc5, "Sendo" },
15491556
{ 0x0cc6, "Intermagic Corp." },
1550-
{ 0x0cc7, "Kontron Medical AG" },
15511557
{ 0x0cc8, "Technotools Corp." },
15521558
{ 0x0cc9, "BroadMAX Technologies, Inc." },
15531559
{ 0x0cca, "Amphenol" },
@@ -1556,6 +1562,7 @@ static struct vendor_name usb_vendor[] = {
15561562
{ 0x0ccd, "TerraTec Electronic GmbH" },
15571563
{ 0x0cd4, "Bang Olufsen" },
15581564
{ 0x0cd5, "LabJack Corporation" },
1565+
{ 0x0cd6, "Scheidt & Bachmann" },
15591566
{ 0x0cd7, "NewChip S.r.l." },
15601567
{ 0x0cd8, "JS Digitech, Inc." },
15611568
{ 0x0cd9, "Hitachi Shin Din Cable, Ltd" },
@@ -1564,7 +1571,7 @@ static struct vendor_name usb_vendor[] = {
15641571
{ 0x0ce9, "Pico Technology" },
15651572
{ 0x0cf1, "e-Conn Electronic Co., Ltd" },
15661573
{ 0x0cf2, "ENE Technology, Inc." },
1567-
{ 0x0cf3, "Atheros Communications, Inc." },
1574+
{ 0x0cf3, "Qualcomm Atheros Communications" },
15681575
{ 0x0cf4, "Fomtex Corp." },
15691576
{ 0x0cf5, "Cellink Co., Ltd" },
15701577
{ 0x0cf6, "Compucable Corp." },
@@ -1664,7 +1671,7 @@ static struct vendor_name usb_vendor[] = {
16641671
{ 0x0d97, "Santa Barbara Instrument Group" },
16651672
{ 0x0d98, "Mars Semiconductor Corp." },
16661673
{ 0x0d99, "Trazer Technologies, Inc." },
1667-
{ 0x0d9a, "RTX Telecom AS" },
1674+
{ 0x0d9a, "RTX AS" },
16681675
{ 0x0d9b, "Tat Shing Electrical Co." },
16691676
{ 0x0d9c, "Chee Chen Hi-Technology Co., Ltd" },
16701677
{ 0x0d9d, "Sanwa Supply, Inc." },
@@ -1693,7 +1700,7 @@ static struct vendor_name usb_vendor[] = {
16931700
{ 0x0dc0, "G7 Solutions (formerly Great Notions)" },
16941701
{ 0x0dc1, "Tamagawa Seiki Co., Ltd" },
16951702
{ 0x0dc3, "Athena Smartcard Solutions, Inc." },
1696-
{ 0x0dc4, "Macpower Peripherals, Ltd" },
1703+
{ 0x0dc4, "inXtron, Inc." },
16971704
{ 0x0dc5, "SDK Co., Ltd" },
16981705
{ 0x0dc6, "Precision Squared Technology Corp." },
16991706
{ 0x0dc7, "First Cable Line, Inc." },
@@ -1841,6 +1848,7 @@ static struct vendor_name usb_vendor[] = {
18411848
{ 0x0f0c, "CAS Corp." },
18421849
{ 0x0f0d, "Hori Co., Ltd" },
18431850
{ 0x0f0e, "Energy Full Corp." },
1851+
{ 0x0f0f, "Silego Technology Inc" },
18441852
{ 0x0f11, "LD Didactic GmbH" },
18451853
{ 0x0f12, "Mars Engineering Corp." },
18461854
{ 0x0f13, "Acetek Technology Co., Ltd" },
@@ -1932,9 +1940,10 @@ static struct vendor_name usb_vendor[] = {
19321940
{ 0x0fdc, "Micro Plus" },
19331941
{ 0x0fde, "Oregon Scientific" },
19341942
{ 0x0fe0, "Osterhout Design Group" },
1943+
{ 0x0fe2, "Air Techniques" },
19351944
{ 0x0fe4, "IN-Tech Electronics, Ltd" },
19361945
{ 0x0fe5, "Greenconn (U.S.A.), Inc." },
1937-
{ 0x0fe6, "Kontron (Industrial Computer Source / ICS Advent)" },
1946+
{ 0x0fe6, "ICS Advent" },
19381947
{ 0x0fe9, "DVICO" },
19391948
{ 0x0fea, "United Computer Accessories" },
19401949
{ 0x0feb, "CRS Electronic Co., Ltd" },
@@ -2521,17 +2530,22 @@ static struct vendor_name usb_vendor[] = {
25212530
{ 0x18e8, "Qcom" },
25222531
{ 0x18ea, "Matrox Graphics, Inc." },
25232532
{ 0x18ec, "Arkmicro Technologies Inc." },
2533+
{ 0x18f8, "[Maxxter]" },
2534+
{ 0x18fb, "Scriptel Corporation" },
25242535
{ 0x18fd, "FineArch Inc." },
2536+
{ 0x1901, "GE Healthcare" },
25252537
{ 0x1908, "GEMBIRD" },
25262538
{ 0x190d, "Motorola GSG" },
25272539
{ 0x1914, "Alco Digital Devices Limited" },
25282540
{ 0x1915, "Nordic Semiconductor ASA" },
2541+
{ 0x191c, "Innovative Technology LTD" },
25292542
{ 0x1923, "FitLinxx" },
25302543
{ 0x1926, "NextWindow" },
25312544
{ 0x192f, "Avago Technologies, Pte." },
25322545
{ 0x1930, "Shenzhen Xianhe Technology Co., Ltd." },
25332546
{ 0x1931, "Ningbo Broad Telecommunication Co., Ltd." },
25342547
{ 0x1934, "Feature Integration Technology Inc. (Fintek)" },
2548+
{ 0x1938, "Meinberg Funkuhren GmbH & Co. KG" },
25352549
{ 0x1941, "Dream Link" },
25362550
{ 0x1943, "Sensoray Co., Inc." },
25372551
{ 0x1949, "Lab126, Inc." },
@@ -2625,6 +2639,7 @@ static struct vendor_name usb_vendor[] = {
26252639
{ 0x1b04, "Meilhaus Electronic GmbH" },
26262640
{ 0x1b0e, "BLUTRONICS S.r.l." },
26272641
{ 0x1b1c, "Corsair" },
2642+
{ 0x1b1f, "eQ-3 Entwicklung GmbH" },
26282643
{ 0x1b20, "MStar Semiconductor, Inc." },
26292644
{ 0x1b22, "WiLinx Corp." },
26302645
{ 0x1b26, "Cellex Power Products, Inc." },
@@ -2756,6 +2771,7 @@ static struct vendor_name usb_vendor[] = {
27562771
{ 0x1d5b, "Smartronix, Inc." },
27572772
{ 0x1d6b, "Linux Foundation" },
27582773
{ 0x1d90, "Citizen" },
2774+
{ 0x1d9d, "Sigma Sport" },
27592775
{ 0x1de1, "Actions Microelectronics Co." },
27602776
{ 0x1e0e, "Qualcomm / Option" },
27612777
{ 0x1e10, "Point Grey Research, Inc." },
@@ -2855,6 +2871,7 @@ static struct vendor_name usb_vendor[] = {
28552871
{ 0x2676, "Basler AG" },
28562872
{ 0x2730, "Citizen" },
28572873
{ 0x2735, "DigitalWay" },
2874+
{ 0x273f, "Hughski Limited" },
28582875
{ 0x2770, "NHJ, Ltd" },
28592876
{ 0x27b8, "ThingM" },
28602877
{ 0x2821, "ASUSTek Computer Inc." },
@@ -2864,8 +2881,10 @@ static struct vendor_name usb_vendor[] = {
28642881
{ 0x2a03, "dog hunter AG" },
28652882
{ 0x2a37, "RTD Embedded Technologies, Inc." },
28662883
{ 0x2a45, "Meizu Corp." },
2884+
{ 0x2b24, "KeepKey LLC" },
28672885
{ 0x2c02, "Planex Communications" },
28682886
{ 0x2c1a, "Dolphin Peripherals" },
2887+
{ 0x2dcf, "Dialog Semiconductor" },
28692888
{ 0x2fb2, "Fujitsu, Ltd" },
28702889
{ 0x3125, "Eagletron" },
28712890
{ 0x3136, "Navini Networks" },

0 commit comments

Comments
 (0)