Zadig 2.4

pbatard · Jul 26, 2018 · 4cbd90f · 4cbd90f
1 parent 2b0d7a2
commit 4cbd90f
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 105 deletions.
diff --git a/_bump.sh b/_bump.sh
diff --git a/_bz.cmd b/_bz.cmd
@@ -0,0 +1,13 @@
+@echo off
+
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=amd64
+cd /d "%~dp0"
+rem *** Get the version
+for /f "tokens=3" %%i in ('findstr FileVersion examples\zadig.rc') do set "ver=%%i"
+set ver=%ver:"=%
+for /f "tokens=1,2 delims=." %%i in ("%ver%") do set "ZADIG_VERSION=%%i.%%j"
+msbuild libwdi.sln /m /p:Project=Zadig;Configuration=Release,Platform=Win32 /t:Rebuild
+copy Win32\Release\examples\zadig.exe zadig-%ZADIG_VERSION%.exe
+upx --lzma zadig-%ZADIG_VERSION%.exe
+"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp zadig-%ZADIG_VERSION%.exe
+pause
diff --git a/_coverity.cmd b/_coverity.cmd
@@ -1,7 +1,7 @@
 @rem *** Internal developer script to run Coverity ***
 @echo off
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
-set COV_DIR=D:\cov-analysis-win64-8.7.0
+set COV_DIR=D:\cov-analysis-win64-2017.07
 set PATH=%PATH%;%COV_DIR%\bin
 set PWD=%~dp0
 set TARGET=Win32

diff --git a/_sign.cmd b/_sign.cmd
@@ -1,6 +1,3 @@
 @echo off
-"C:\Program Files (x86)\Windows Kits\10\bin\x64\signtool" sign /v /sha1 655f6413a8f721e3286ace95025c9e0ea132a984 /fd SHA1 /tr http://timestamp.comodoca.com/rfc3161 /td SHA1 %1
-if ERRORLEVEL 1 goto out
-"C:\Program Files (x86)\Windows Kits\10\bin\x64\signtool" sign /as /v /sha1 5759b23dc8f45e9120a7317f306e5b6890b612f0 /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 %1
-:out
+"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1
 exit
diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,718,0
- PRODUCTVERSION 1,3,718,0
+ FILEVERSION 1,3,719,0
+ PRODUCTVERSION 1,3,719,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.718"
+            VALUE "FileVersion", "1.3.719"
             VALUE "InternalName", "WDI-Simple"
-            VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
+            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.718"
+            VALUE "ProductVersion", "1.3.719"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadic.rc b/examples/zadic.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,718,0
- PRODUCTVERSION 1,3,718,0
+ FILEVERSION 1,3,719,0
+ PRODUCTVERSION 1,3,719,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadic"
-            VALUE "FileVersion", "1.3.718"
+            VALUE "FileVersion", "1.3.719"
             VALUE "InternalName", "Zadic"
-            VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
+            VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "zadic.exe"
             VALUE "ProductName", "Zadic"
-            VALUE "ProductVersion", "1.3.718"
+            VALUE "ProductVersion", "1.3.719"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadig.h b/examples/zadig.h
@@ -1,6 +1,6 @@
 /*
  * Zadig: Automated Driver Installer for USB devices (GUI version)
- * Copyright (c) 2010-2017 Pete Batard <[email protected]>
+ * Copyright (c) 2010-2018 Pete Batard <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,18 +35,18 @@
 
 #define APPLICATION_NAME            "Zadig"
 #define COMPANY_NAME                "Akeo Consulting"
-#define APPLICATION_URL             "http://zadig.akeo.ie"
+#define APPLICATION_URL             "https://zadig.akeo.ie"
 #define STR_BUFFER_SIZE             512
 #define NOTIFICATION_DELAY          1000
 #define MAX_TOOLTIPS                32
 #define MAX_LOG_SIZE                0x7FFFFFFE
 #define MAX_PROGRESS                (0xFFFF-1)
 #define INI_NAME                    "zadig.ini"
-#define LIBWDI_URL                  "http://libwdi.akeo.ie"
-#define LIBUSB_URL                  "http://windows.libusb.info"
-#define LIBUSB0_URL                 "http://sourceforge.net/apps/trac/libusb-win32/wiki"
+#define LIBWDI_URL                  "https://github.com/pbatard/libwdi"
+#define LIBUSB_URL                  "https://github.com/libusb/libusb/wiki/Windows"
+#define LIBUSB0_URL                 "https://sourceforge.net/p/libusb-win32/wiki/Home/"
 #define LIBUSBK_URL                 "http://libusbk.sourceforge.net/UsbK3/index.html"
-#define WINUSB_URL                  "https://msdn.microsoft.com/en-us/library/windows/hardware/ff540174.aspx"
+#define WINUSB_URL                  "https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/winusb"
 #define HELP_URL                    "https://github.com/pbatard/libwdi/wiki/Zadig"
 #define WCID_URL                    "https://github.com/pbatard/libwdi/wiki/WCID-Devices"
 #define USB_IDS_URL                 "http://www.linux-usb.org/usb-ids.html"
@@ -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.3.718"
+#define APP_VERSION                 "Zadig 2.4.719"
 
 // 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,3,718,0
- PRODUCTVERSION 2,3,718,0
+ FILEVERSION 2,4,719,0
+ PRODUCTVERSION 2,4,719,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.3.718"
+            VALUE "FileVersion", "2.4.719"
             VALUE "InternalName", "Zadig"
-            VALUE "LegalCopyright", "� 2010-2017 Pete Batard (GPL v3)"
+            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.3.718"
+            VALUE "ProductVersion", "2.4.719"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadig_README.creole b/examples/zadig_README.creole
@@ -1,3 +1,9 @@
+=== v2.4 (2018.07.26) ===
+* Update URLs
+* Improve error reporting
+* Fix Windows 7 showing a "Trusted Publisher" dialog
+* Embedded drivers: WinUSB v6.1.7600.16385, libusb-win32 v1.2.6.0, libusbK v3.0.7.0 & usbser (native)
+
 === v2.3 (2017.04.18) ===
 * Fix issues with extended characters in current user directory
 * Drop Windows XP and Windows Vista support

diff --git a/examples/zadig_license.h b/examples/zadig_license.h
@@ -1,6 +1,6 @@
 /*
  * Zadig: Automated Driver Installer for USB devices (GUI version)
- * Copyright (c) 2010-2017 Pete Batard <[email protected]>
+ * Copyright (c) 2010-2018 Pete Batard <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ const char* about_blurb_format =
 "{\\b\\fs20Zadig - The Automated Driver Installer}\\line\n"
 "\\fs18Version %d.%d (Build %d)\\line\n"
 "\\line\n"
-"Copyright © 2010-2017 Pete Batard / Akeo\\line\n"
+"Copyright © 2010-2018 Pete Batard / Akeo\\line\n"
 APPLICATION_URL "\\line\n"
 "\\line\n"
 "Report bugs or request enhancements at:\\line\n"
@@ -32,7 +32,7 @@ APPLICATION_URL "\\line\n"
 const char* additional_copyrights =
 "{\\rtf1\\ansi\n"
 "Windows Driver Installer library, libwdi:\\line\n"
-"Copyright © 2010-2017 by Pete Batard et al.\\line\n"
+"Copyright © 2010-2018 by Pete Batard et al.\\line\n"
 "GNU Lesser General Public License (LGPL) v3 or later\\line\n"
 "https://github.com/pbatard/libwdi/wiki\\line\n"
 "\\line\n"

diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,718,0
- PRODUCTVERSION 1,3,718,0
+ FILEVERSION 1,3,719,0
+ PRODUCTVERSION 1,3,719,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.718"
+            VALUE "FileVersion", "1.3.719"
             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.718"
+            VALUE "ProductVersion", "1.3.719"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END