Skip to content

Commit d506f19

Browse files
committed
[core] fix filter-driver installation path
* Closes pbatard#163
1 parent e56e653 commit d506f19

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

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,4,763,0
11-
PRODUCTVERSION 1,4,763,0
10+
FILEVERSION 1,4,764,0
11+
PRODUCTVERSION 1,4,764,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.763"
28+
VALUE "FileVersion", "1.3.764"
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.763"
34+
VALUE "ProductVersion", "1.3.764"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

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.6.763"
62+
#define APP_VERSION "Zadig 2.6.764"
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,6,763,0
250-
PRODUCTVERSION 2,6,763,0
249+
FILEVERSION 2,6,764,0
250+
PRODUCTVERSION 2,6,764,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.763"
267+
VALUE "FileVersion", "2.6.764"
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.763"
273+
VALUE "ProductVersion", "2.6.764"
274274
VALUE "Comments", "http://libwdi.akeo.ie"
275275
END
276276
END

libwdi/libwdi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,8 @@ static int install_driver_internal(void* arglist)
17201720
static_sprintf(exeargs, "\"%s\"", params->inf_name);
17211721
} else {
17221722
// Use libusb-win32's filter driver installer
1723-
static_sprintf(exename, "\"%s\\%s\\\\install-filter.exe\"", path, is_x64?"amd64":"x86");
1723+
static_strcat(path, is_x64 ? "\\amd64" : "\\x86");
1724+
static_sprintf(exename, "\"%s\\install-filter.exe\"", path);
17241725
if (safe_stricmp(current_device->upper_filter, filter_name) == 0) {
17251726
// Device already has the libusb-win32 filter => remove
17261727
static_strcpy(exeargs, "uninstall -d=");

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,4,763,0
54-
PRODUCTVERSION 1,4,763,0
53+
FILEVERSION 1,4,764,0
54+
PRODUCTVERSION 1,4,764,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.763"
71+
VALUE "FileVersion", "1.3.764"
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.763"
77+
VALUE "ProductVersion", "1.3.764"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

0 commit comments

Comments
 (0)