[core] fix filter-driver installation path

* Closes #163
pbatard · Oct 31, 2021 · d506f19 · d506f19
1 parent e56e653
commit d506f19
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,763,0
- PRODUCTVERSION 1,4,763,0
+ FILEVERSION 1,4,764,0
+ PRODUCTVERSION 1,4,764,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "WDI-Simple"
-            VALUE "FileVersion", "1.3.763"
+            VALUE "FileVersion", "1.3.764"
             VALUE "InternalName", "WDI-Simple"
             VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "wdi-simple.exe"
             VALUE "ProductName", "WDI-Simple"
-            VALUE "ProductVersion", "1.3.763"
+            VALUE "ProductVersion", "1.3.764"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadig.h b/examples/zadig.h
@@ -59,7 +59,7 @@
 #define FIELD_ORANGE                RGB(255,240,200)
 #define ARROW_GREEN                 RGB(92,228,65)
 #define ARROW_ORANGE                RGB(253,143,56)
-#define APP_VERSION                 "Zadig 2.6.763"
+#define APP_VERSION                 "Zadig 2.6.764"
 
 // These are used to flag end users about the driver they are going to replace
 enum driver_type {

diff --git a/examples/zadig.rc b/examples/zadig.rc
@@ -246,8 +246,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,763,0
- PRODUCTVERSION 2,6,763,0
+ FILEVERSION 2,6,764,0
+ PRODUCTVERSION 2,6,764,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.6.763"
+            VALUE "FileVersion", "2.6.764"
             VALUE "InternalName", "Zadig"
             VALUE "LegalCopyright", "� 2010-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.6.763"
+            VALUE "ProductVersion", "2.6.764"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/libwdi/libwdi.c b/libwdi/libwdi.c
@@ -1720,7 +1720,8 @@ static int install_driver_internal(void* arglist)
 		static_sprintf(exeargs, "\"%s\"", params->inf_name);
 	} else {
 		// Use libusb-win32's filter driver installer
-		static_sprintf(exename, "\"%s\\%s\\\\install-filter.exe\"", path, is_x64?"amd64":"x86");
+		static_strcat(path, is_x64 ? "\\amd64" : "\\x86");
+		static_sprintf(exename, "\"%s\\install-filter.exe\"", path);
 		if (safe_stricmp(current_device->upper_filter, filter_name) == 0) {
 			// Device already has the libusb-win32 filter => remove
 			static_strcpy(exeargs, "uninstall -d=");

diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,763,0
- PRODUCTVERSION 1,4,763,0
+ FILEVERSION 1,4,764,0
+ PRODUCTVERSION 1,4,764,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
-            VALUE "FileVersion", "1.3.763"
+            VALUE "FileVersion", "1.3.764"
             VALUE "InternalName", "libwdi"
             VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "libwdi"
             VALUE "ProductName", "libwdi"
-            VALUE "ProductVersion", "1.3.763"
+            VALUE "ProductVersion", "1.3.764"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END