Skip to content

Commit bab1864

Browse files
committed
[core] pick libusb-win32 and libusbK versions from the DLL
* Unfortunately, libusbK does not keep the .sys and .dll versions in check and we logically picked our version from the .sys. Considering that the projects are more likely to update the DLL than the driver, switch to using the version from the DLL.
1 parent f0cc626 commit bab1864

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

ChangeLog

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ o v1.4.0 (2021.09.04)
55
Bugfixes:
66
- fix breakage when providing a user driver
77
- work around Windows corrupting the key containers
8-
- don't populate empty device decriptors
8+
- don't populate empty device descriptors
99
Improvements:
1010
- more error reporting improvements
1111
- remove the zadic sample

examples/wdi-simple.rc

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

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,4,754,0
11-
PRODUCTVERSION 1,4,754,0
10+
FILEVERSION 1,4,755,0
11+
PRODUCTVERSION 1,4,755,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.754"
28+
VALUE "FileVersion", "1.3.755"
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.754"
34+
VALUE "ProductVersion", "1.3.755"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
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.6.754"
62+
#define APP_VERSION "Zadig 2.6.755"
6363

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

examples/zadig.rc

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

248248
VS_VERSION_INFO VERSIONINFO
249-
FILEVERSION 2,6,754,0
250-
PRODUCTVERSION 2,6,754,0
249+
FILEVERSION 2,6,755,0
250+
PRODUCTVERSION 2,6,755,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.754"
267+
VALUE "FileVersion", "2.6.755"
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.6.754"
273+
VALUE "ProductVersion", "2.6.755"
274274
VALUE "Comments", "http://libwdi.akeo.ie"
275275
END
276276
END

libwdi/libwdi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static BOOL filter_driver = FALSE;
5454
static DWORD timeout = DEFAULT_TIMEOUT;
5555
static HANDLE pipe_handle = INVALID_HANDLE_VALUE;
5656
static VS_FIXEDFILEINFO driver_version[WDI_NB_DRIVERS-1] = { {0}, {0}, {0}, {0} };
57-
static const char* driver_name[WDI_NB_DRIVERS-1] = {"winusbcoinstaller2.dll", "libusb0.sys", "libusbK.sys", ""};
57+
static const char* driver_name[WDI_NB_DRIVERS-1] = {"winusbcoinstaller2.dll", "libusb0.dll", "libusbK.dll", ""};
5858
static const char* inf_template[WDI_NB_DRIVERS-1] = {"winusb.inf.in", "libusb0.inf.in", "libusbk.inf.in", "usbser.inf.in"};
5959
static const char* cat_template[WDI_NB_DRIVERS-1] = {"winusb.cat.in", "libusb0.cat.in", "libusbk.cat.in", "usbser.cat.in"};
6060
static const char* ms_compat_id[WDI_NB_DRIVERS-1] = {"MS_COMP_WINUSB", "MS_COMP_LIBUSB0", "MS_COMP_LIBUSBK", "MS_COMP_USBSER"};

libwdi/libwdi.rc

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

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 1,4,754,0
54-
PRODUCTVERSION 1,4,754,0
53+
FILEVERSION 1,4,755,0
54+
PRODUCTVERSION 1,4,755,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.754"
71+
VALUE "FileVersion", "1.3.755"
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.754"
77+
VALUE "ProductVersion", "1.3.755"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

0 commit comments

Comments
 (0)