diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml index 6f1f79f..471f277 100644 --- a/.github/workflows/vs2019.yml +++ b/.github/workflows/vs2019.yml @@ -31,10 +31,6 @@ jobs: VS2019-Build: runs-on: windows-latest - strategy: - matrix: - TARGET_PLATFORM: [x64, Win32] - steps: - name: Checkout repository uses: actions/checkout@v2 @@ -62,17 +58,44 @@ jobs: - name: Build shell: cmd run: | - for %%B in (Debug Release) do ( - msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=%%B,Platform=${{ matrix.TARGET_PLATFORM }},BuildMacros=${{ env.BUILD_MACROS }} + for %%P in (Win32 x64) do ( + for %%B in (Debug Release) do ( + msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=%%B,Platform=%%P,BuildMacros=${{ env.BUILD_MACROS }} + ) ) - - name: Display SHA-256 - if: ${{ github.event_name == 'push' }} - run: sha256sum ./${{ matrix.TARGET_PLATFORM }}/*/examples/*.exe - - name: Upload artifacts uses: actions/upload-artifact@v2 if: ${{ github.event_name == 'push' }} with: name: VS2019 path: ./*/*/examples/*.exe + + - name: Display SHA-256 + if: ${{ github.event_name == 'push' }} + run: sha256sum ./*/*/examples/*.exe + + - name: Compress release-ready version of Zadig + uses: crazy-max/ghaction-upx@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + version: latest + files: ./Win32/Release/examples/zadig.exe + args: --lzma --best + + - name: Rename release-ready version of Zadig + if: startsWith(github.ref, 'refs/tags/') + shell: cmd + run: | + 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" + copy Win32\Release\examples\zadig.exe zadig-%ZADIG_VERSION%.exe + sha256sum zadig-*.exe + + - name: Upload release-ready version of Zadig + uses: actions/upload-artifact@v2 + if: startsWith(github.ref, 'refs/tags/') + with: + name: Zadig + path: ./zadig-*.exe diff --git a/ChangeLog b/ChangeLog index af210df..91b60cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ For the latest changes, please visit: https://github.com/pbatard/libwdi/commits/master +o v1.4.0 (2021.09.04) + Bugfixes: + - fix breakage when providing a user driver + - work around Windows corrupting the key containers + - don't populate empty device decriptors + Improvements: + - more error reporting improvements + - remove the zadic sample + o v1.3.1 (2020.03.30) Bugfixes: - fix handling of non western paths during cat file generation diff --git a/_bm.sh b/_bm.sh deleted file mode 100755 index 9d4fb79..0000000 --- a/_bm.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Create and upload a Zadig release -# !!!THIS SCRIPT IS FOR INTERNAL DEVELOPER USE ONLY!!! - -type -P git &>/dev/null || { echo "Git not found. Aborting." >&2; exit 1; } -type -P sed &>/dev/null || { echo "Sed not found. Aborting." >&2; exit 1; } -type -P upx &>/dev/null || { echo "UPX executable not found. Aborting." >&2; exit 1; } - -git clean -fdx -./autogen.sh --disable-shared - -zadig_version=`sed -n 's/^.*\"FileVersion\", \"\(.*\)\..*\"/\1/p' examples/zadig.rc` -echo Building Zadig v$zadig_version... - -make -j12 -make zadig_release \ No newline at end of file diff --git a/_bz.cmd b/_bz.cmd deleted file mode 100644 index 6554ea5..0000000 --- a/_bz.cmd +++ /dev/null @@ -1,13 +0,0 @@ -@echo off - -call "C:\Program Files (x86)\Microsoft Visual Studio\2019\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 --best zadig-%ZADIG_VERSION%.exe -"C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.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/_sign.cmd b/_sign.cmd index 804d4bd..0f0608c 100644 --- a/_sign.cmd +++ b/_sign.cmd @@ -1,3 +1,3 @@ @echo off -"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 +"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1 + diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc index 34579f2..b5e84a5 100644 --- a/examples/wdi-simple.rc +++ b/examples/wdi-simple.rc @@ -7,8 +7,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,753,0 - PRODUCTVERSION 1,4,753,0 + FILEVERSION 1,4,754,0 + PRODUCTVERSION 1,4,754,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.753" + VALUE "FileVersion", "1.3.754" 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.753" + VALUE "ProductVersion", "1.3.754" VALUE "Comments", "http://libwdi.akeo.ie" END END diff --git a/examples/zadig.c b/examples/zadig.c index 4b8f4ee..a4a10c4 100644 --- a/examples/zadig.c +++ b/examples/zadig.c @@ -1,6 +1,6 @@ /* * Zadig: Automated Driver Installer for USB devices (GUI version) - * Copyright (c) 2010-2020 Pete Batard + * Copyright (c) 2010-2021 Pete Batard * For more info, please visit http://libwdi.akeo.ie * * This program is free software: you can redistribute it and/or modify diff --git a/examples/zadig.h b/examples/zadig.h index ce45b58..579c2d8 100644 --- 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.753" +#define APP_VERSION "Zadig 2.6.754" // 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 index e58a9a6..1f9cb54 100644 --- a/examples/zadig.rc +++ b/examples/zadig.rc @@ -246,8 +246,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,753,0 - PRODUCTVERSION 2,6,753,0 + FILEVERSION 2,6,754,0 + PRODUCTVERSION 2,6,754,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -264,13 +264,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Zadig" - VALUE "FileVersion", "2.6.753" + VALUE "FileVersion", "2.6.754" 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.753" + VALUE "ProductVersion", "2.6.754" VALUE "Comments", "http://libwdi.akeo.ie" END END diff --git a/examples/zadig_license.h b/examples/zadig_license.h index a08182c..e8ab383 100644 --- 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-2020 Pete Batard + * Copyright (c) 2010-2021 Pete Batard * * 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-2020 Pete Batard / Akeo\\line\n" +"Copyright © 2010-2021 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-2020 by Pete Batard et al.\\line\n" +"Copyright © 2010-2021 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/examples/zadig_net.c b/examples/zadig_net.c index 8bc0ae0..08df0c6 100644 --- a/examples/zadig_net.c +++ b/examples/zadig_net.c @@ -1,7 +1,7 @@ /* * Zadig: Automated Driver Installer for USB devices (GUI version) * Networking functionality (web file download, check for update, etc.) - * Copyright © 2012-2017 Pete Batard + * Copyright © 2012-2021 Pete Batard * * 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 diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc index dccdd37..b259f4d 100644 --- a/libwdi/libwdi.rc +++ b/libwdi/libwdi.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,753,0 - PRODUCTVERSION 1,4,753,0 + FILEVERSION 1,4,754,0 + PRODUCTVERSION 1,4,754,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.753" + VALUE "FileVersion", "1.3.754" 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.753" + VALUE "ProductVersion", "1.3.754" VALUE "Comments", "http://libwdi.akeo.ie" END END