Skip to content

Commit dc63334

Browse files
pbatardpbatard
committed
libwdi 1.4.1
1 parent d506f19 commit dc63334

File tree

9 files changed

+63
-49
lines changed

9 files changed

+63
-49
lines changed

‎ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
For the latest changes, please visit:
22
https://github.com/pbatard/libwdi/commits/master
33

4+
o v1.4.1 (2021.11.01)
5+
New features:
6+
- add a new 'external_inf' boolean option to wdi_options_prepare_driver
7+
to allow the use of an external .inf instead of the embedded ones
8+
Bugfixes:
9+
- prevent an infinite loop when a certificate cannot be deleted
10+
- fix the use of -w option in wdi-simple
11+
- fix error when trying to install libusb0.sys as a filter-driver
12+
Improvements:
13+
- improve Windows version reporting for Windows 11
14+
- stop on .cat signing error if test signing is not enabled
15+
- add an explicit error for code 0x109 (for Windows 11 Insider builds)
16+
417
o v1.4.0 (2021.09.04)
518
Bugfixes:
619
- fix breakage when providing a user driver

‎_chlver.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ _EOF
3838
# First run sed to substitute our variable in the sed command file
3939
sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" -e "s/@@MICRO@@/$MICRO/g" cmd.sed
4040
# Run sed to update the .rc version
41-
sed -i -f cmd.sed libwdi/libwdi.rc
42-
sed -i 's/$/\r/' libwdi/libwdi.rc
43-
sed -i -f cmd.sed examples/wdi-simple.rc
44-
sed -i 's/$/\r/' examples/wdi-simple.rc
41+
sed -b -i -f cmd.sed libwdi/libwdi.rc
42+
sed -b -i -f cmd.sed examples/wdi-simple.rc
4543
rm cmd.sed

‎_chzver.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ s/^\(.*\)"Zadig .*\..*\.\(.*\)"\(.*\)/\1"Zadig @@MAJOR@@.@@MINOR@@.\2"\3/
3131
_EOF
3232

3333
sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" cmd.sed
34-
sed -i -f cmd.sed examples/zadig.rc
35-
sed -i 's/$/\r/' examples/zadig.rc
36-
sed -i -f cmd.sed examples/zadig.h
37-
sed -i 's/$/\r/' examples/zadig.h
34+
sed -b -i -f cmd.sed examples/zadig.rc
35+
sed -b -i -f cmd.sed examples/zadig.h
3836

3937
rm cmd.sed
4038

‎_pre-commit.sh‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,40 @@ if [ -x ./_detect-amend.sh ]; then
1616
. ./_detect-amend.sh
1717
fi
1818

19-
VER=`git log --oneline | wc -l`
19+
BUILD=`git rev-list HEAD --count`
2020
# adjust so that we match the github commit count
21-
TAGVER=`expr $VER + 1`
21+
((BUILD++))
2222
# there may be a better way to prevent improper nano on amend. For now the detection
2323
# of a .amend file in the current directory will do
2424
if [ -f ./.amend ]; then
25-
TAGVER=`expr $TAGVER - 1`
25+
((BUILD--))
2626
rm ./.amend;
2727
fi
28-
echo "setting nano to $TAGVER"
28+
echo "setting nano to $BUILD"
2929

30-
cat > cmd.sed <<\_EOF
31-
s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),.*,0/ FILEVERSION \1,\2,@@TAGVER@@,0/
32-
s/^[ \t]*PRODUCTVERSION[ \t]*\(.*\),\(.*\),.*,0/ PRODUCTVERSION \1,\2,@@TAGVER@@,0/
33-
s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*"\(.*\)\..*"/\1VALUE "FileVersion", "\2.@@TAGVER@@"/
34-
s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*"\(.*\)\..*"/\1VALUE "ProductVersion", "\2.@@TAGVER@@"/
35-
s/^\(.*\)"Zadig \(.*\)\..*"\(.*\)/\1"Zadig \2.@@TAGVER@@"\3/
30+
cat > _library.sed <<\_EOF
31+
s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ FILEVERSION \1,\2,\3,@@BUILD@@/
32+
s/^[ \t]*PRODUCTVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ PRODUCTVERSION \1,\2,\3,@@BUILD@@/
33+
s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*"\(.*\)\..*"/\1VALUE "FileVersion", "\2.@@BUILD@@"/
34+
s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*"\(.*\)\..*"/\1VALUE "ProductVersion", "\2.@@BUILD@@"/
35+
_EOF
36+
37+
cat > _zadig.sed <<\_EOF
38+
s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),.*,0/ FILEVERSION \1,\2,@@BUILD@@,0/
39+
s/^[ \t]*PRODUCTVERSION[ \t]*\(.*\),\(.*\),.*,0/ PRODUCTVERSION \1,\2,@@BUILD@@,0/
40+
s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*"\(.*\)\..*"/\1VALUE "FileVersion", "\2.@@BUILD@@"/
41+
s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*"\(.*\)\..*"/\1VALUE "ProductVersion", "\2.@@BUILD@@"/
42+
s/^\(.*\)"Zadig \(.*\)\..*"\(.*\)/\1"Zadig \2.@@BUILD@@"\3/
3643
_EOF
3744

3845
# First run sed to substitute our variable in the sed command file
39-
sed -i -e "s/@@TAGVER@@/$TAGVER/g" cmd.sed
46+
sed -i -e "s/@@BUILD@@/$BUILD/g" _library.sed
47+
sed -i -e "s/@@BUILD@@/$BUILD/g" _zadig.sed
4048

4149
# Run sed to update the nano version, and add the modified files
42-
sed -i -f cmd.sed libwdi/libwdi.rc
43-
sed -i 's/$/\r/' libwdi/libwdi.rc
44-
sed -i -f cmd.sed examples/zadig.rc
45-
sed -i 's/$/\r/' examples/zadig.rc
46-
sed -i -f cmd.sed examples/zadig.h
47-
sed -i 's/$/\r/' examples/zadig.h
48-
sed -i -f cmd.sed examples/wdi-simple.rc
49-
sed -i 's/$/\r/' examples/wdi-simple.rc
50+
sed -b -i -f _library.sed libwdi/libwdi.rc
51+
sed -b -i -f _library.sed examples/wdi-simple.rc
52+
sed -b -i -f _zadig.sed examples/zadig.rc
53+
sed -b -i -f _zadig.sed examples/zadig.h
54+
rm _library.sed _zadig.sed
5055
git add libwdi/libwdi.rc examples/zadig.rc examples/zadig.h examples/wdi-simple.rc
51-
rm cmd.sed

‎examples/wdi-simple.rc‎

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

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,4,764,0
11-
PRODUCTVERSION 1,4,764,0
10+
FILEVERSION 1,4,1,765
11+
PRODUCTVERSION 1,4,1,765
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.764"
28+
VALUE "FileVersion", "1.4.1.765"
2929
VALUE "InternalName", "WDI-Simple"
30-
VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
31-
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
30+
VALUE "LegalCopyright", "� 2010-2021 Pete Batard (LGPL v3)"
31+
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/lesser.html"
3232
VALUE "OriginalFilename", "wdi-simple.exe"
3333
VALUE "ProductName", "WDI-Simple"
34-
VALUE "ProductVersion", "1.3.764"
34+
VALUE "ProductVersion", "1.4.1.765"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎examples/zadig.h‎

Lines changed: 2 additions & 2 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-2021 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
@@ -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.6.764"
62+
#define APP_VERSION "Zadig 2.7.765"
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ END
246246
//
247247

248248
VS_VERSION_INFO VERSIONINFO
249-
FILEVERSION 2,6,764,0
250-
PRODUCTVERSION 2,6,764,0
249+
FILEVERSION 2,7,765,0
250+
PRODUCTVERSION 2,7,765,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.6.764"
267+
VALUE "FileVersion", "2.7.765"
268268
VALUE "InternalName", "Zadig"
269-
VALUE "LegalCopyright", "� 2010-2018 Pete Batard (GPL v3)"
270-
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
269+
VALUE "LegalCopyright", "� 2010-2021 Pete Batard (GPL v3)"
270+
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
271271
VALUE "OriginalFilename", "zadig.exe"
272272
VALUE "ProductName", "Zadig"
273-
VALUE "ProductVersion", "2.6.764"
273+
VALUE "ProductVersion", "2.7.765"
274274
VALUE "Comments", "http://libwdi.akeo.ie"
275275
END
276276
END

‎libwdi/libwdi.rc‎

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

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 1,4,764,0
54-
PRODUCTVERSION 1,4,764,0
53+
FILEVERSION 1,4,1,765
54+
PRODUCTVERSION 1,4,1,765
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.764"
71+
VALUE "FileVersion", "1.4.1.765"
7272
VALUE "InternalName", "libwdi"
73-
VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
74-
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
73+
VALUE "LegalCopyright", "� 2010-2021 Pete Batard (LGPL v3)"
74+
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/lesser.html"
7575
VALUE "OriginalFilename", "libwdi"
7676
VALUE "ProductName", "libwdi"
77-
VALUE "ProductVersion", "1.3.764"
77+
VALUE "ProductVersion", "1.4.1.765"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

‎libwdi/vid_data.c‎

Lines changed: 2 additions & 1 deletion
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: 2021.07.19
32+
* Version: 2021.10.24
3333
*/
3434
static struct vendor_name usb_vendor[] = {
3535
{ 0x0001, "Fry's Electronics" },
@@ -3103,6 +3103,7 @@ static struct vendor_name usb_vendor[] = {
31033103
{ 0x25c6, "Vitus Audio (AVA Group A/S)" },
31043104
{ 0x25c8, "Visual Planet Ltd" },
31053105
{ 0x25da, "Netatmo" },
3106+
{ 0x25dd, "Bit4id Srl" },
31063107
{ 0x25e3, "Lumigon" },
31073108
{ 0x25f0, "ShanWan" },
31083109
{ 0x25fb, "Pentax Ricoh Imaging Co., Ltd" },

0 commit comments

Comments
 (0)