diff --git a/.gitattributes b/.gitattributes index 97283bde..398a2312 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,9 @@ *.inf.in eol=crlf *.rc eol=crlf *.def eol=crlf +*.creole export-ignore .gitattributes export-ignore .gitignore export-ignore -*.creole export-ignore \ No newline at end of file +_*.sh export-ignore +_*.cmd export-ignore +appveyor.yml export-ignore diff --git a/AUTHORS b/AUTHORS index d0e64ad2..42380a70 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,16 +1,23 @@ -Copyright © 2010-2016 Pete Batard -Copyright © 2010-2011 Travis Robinson +Copyright © 2010-2020 Pete Batard +Copyright © 2010-2011 Travis Robinson Other contributors: Alexander Sashnov Bob Paddock +Fred Sundvik +Georg Vienna +Jacob Alexander JaggedJax +Jasper van Bourgognie +Jeorg Fischer Jerome-PS Joseph Marshall +Karel Bilek Liam Staskawicz Louie Caulfield PhracturedBlue Ryan Pavlik +Stanley Elliott Uri Lublin Vitali Lovich -Xiaofan Chen \ No newline at end of file +Xiaofan Chen diff --git a/ChangeLog b/ChangeLog index 111b6d5d..af210df9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,17 @@ For the latest changes, please visit: https://github.com/pbatard/libwdi/commits/master +o v1.3.1 (2020.03.30) + Bugfixes: + - fix handling of non western paths during cat file generation + - fix Windows 7 showing a "Trusted Publisher" dialog + - fix memory leaks + Improvements: + - update project files to VS2019 + - improve error reporting + - allow interface 0 for wdi-simple + - increase RSA bit key size + o v1.3.0 (2017.04.18) Bugfixes: - fix issues with extended characters in current user directory diff --git a/appveyor.yml b/appveyor.yml index f032f384..09b9f39f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -os: Visual Studio 2017 +os: Visual Studio 2019 init: - ps: >- diff --git a/configure.ac b/configure.ac index 297e8bbf..a7850300 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libwdi], [1.3.0], [libwdi-devel@lists.sourceforge.net], [libwdi], [http://libwdi.akeo.ie]) +AC_INIT([libwdi], [1.3.1], [libwdi-devel@lists.sourceforge.net], [libwdi], [http://libwdi.akeo.ie]) AM_INIT_AUTOMAKE([-Wno-portability 1.11 foreign]) AC_CONFIG_SRCDIR([libwdi/libwdi.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc index f916752a..ed5ca1d6 100644 --- a/examples/wdi-simple.rc +++ b/examples/wdi-simple.rc @@ -7,8 +7,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,730,0 - PRODUCTVERSION 1,3,730,0 + FILEVERSION 1,3,731,0 + PRODUCTVERSION 1,3,731,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.730" + VALUE "FileVersion", "1.3.731" 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.730" + VALUE "ProductVersion", "1.3.731" VALUE "Comments", "http://libwdi.akeo.ie" END END diff --git a/examples/zadic.rc b/examples/zadic.rc index 5e322edf..2d3a0320 100644 --- a/examples/zadic.rc +++ b/examples/zadic.rc @@ -56,8 +56,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,730,0 - PRODUCTVERSION 1,3,730,0 + FILEVERSION 1,3,731,0 + PRODUCTVERSION 1,3,731,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -74,13 +74,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Zadic" - VALUE "FileVersion", "1.3.730" + VALUE "FileVersion", "1.3.731" VALUE "InternalName", "Zadic" 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.730" + VALUE "ProductVersion", "1.3.731" VALUE "Comments", "http://libwdi.akeo.ie" END END diff --git a/examples/zadig.h b/examples/zadig.h index c4301edf..8013ccf3 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.5.730" +#define APP_VERSION "Zadig 2.5.731" // 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 9838ba46..c34a0be6 100644 --- a/examples/zadig.rc +++ b/examples/zadig.rc @@ -246,8 +246,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,730,0 - PRODUCTVERSION 2,5,730,0 + FILEVERSION 2,5,731,0 + PRODUCTVERSION 2,5,731,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -264,13 +264,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Zadig" - VALUE "FileVersion", "2.5.730" + VALUE "FileVersion", "2.5.731" 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.5.730" + VALUE "ProductVersion", "2.5.731" VALUE "Comments", "http://libwdi.akeo.ie" END END diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc index 27b689f8..2c6fcc39 100644 --- a/libwdi/libwdi.rc +++ b/libwdi/libwdi.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,730,0 - PRODUCTVERSION 1,3,730,0 + FILEVERSION 1,3,731,0 + PRODUCTVERSION 1,3,731,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.730" + VALUE "FileVersion", "1.3.731" 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.730" + VALUE "ProductVersion", "1.3.731" VALUE "Comments", "http://libwdi.akeo.ie" END END diff --git a/wdk_build.cmd b/wdk_build.cmd deleted file mode 100644 index 33ea4d8c..00000000 --- a/wdk_build.cmd +++ /dev/null @@ -1,185 +0,0 @@ -@echo off -rem default builds static library. -rem you can pass the following arguments (case insensitive): -rem - "DLL" to build a DLL instead of a static library -rem - "no_samples" to build the library only - -if not Test%DDK_TARGET_OS%==TestWin7 goto unsupported - -if Test%BUILD_ALT_DIR%==Test goto usage -rem /M 2 for multiple cores -set BUILD_CMD=build -bcwgZ -M2 -set PWD=%~dp0 - -rem process commandline parameters -set TARGET=LIBRARY -set BUILD_SAMPLES=YES - -:more_args -if "%1" == "" goto no_more_args -rem /I for case insensitive -if /I Test%1==TestDLL set TARGET=DYNLINK -if /I Test%1==Testno_samples set BUILD_SAMPLES=NO -rem - shift the arguments and examine %1 again -shift -goto more_args -:no_more_args - -rem Set DDK_DIR (=BASEDIR with escaped backslashes) -set DDK_DIR=%BASEDIR:\=\\% -rem Set target platform type -set ORG_BUILD_ALT_DIR=%BUILD_ALT_DIR% -set ORG_BUILDARCH=%_BUILDARCH% -set ORG_PATH=%PATH% -set ORG_BUILD_DEFAULT_TARGETS=%BUILD_DEFAULT_TARGETS% - -set ARCH_DIR=%_BUILDARCH% -if /I Test%_BUILDARCH%==Testx86 set ARCH_DIR=i386 - -if /I Test%_BUILDARCH%==Testamd64 goto x86_64 -echo #define NO_BUILD64> libwdi\build64.h -goto main_start -:x86_64 -echo #define BUILD64> libwdi\build64.h - -:main_start -cd libwdi -set srcPath=obj%BUILD_ALT_DIR%\%cpudir% - -del Makefile.hide >NUL 2>&1 -if EXIST Makefile ren Makefile Makefile.hide - -set 386=1 -set AMD64= -set BUILD_DEFAULT_TARGETS=-386 -set _AMD64bit= -set _BUILDARCH=x86 -set PATH=%BASEDIR%\bin\x86;%BASEDIR%\bin\x86\x86 - -copy .msvc\embedder_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -copy obj%BUILD_ALT_DIR%\i386\embedder.exe . >NUL 2>&1 - -copy .msvc\installer_x86_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -copy obj%BUILD_ALT_DIR%\i386\installer_x86.exe . >NUL 2>&1 - -set 386= -set AMD64=1 -set BUILD_DEFAULT_TARGETS=-amd64 -set _AMD64bit=true -set _BUILDARCH=AMD64 -set PATH=%BASEDIR%\bin\x86\amd64;%BASEDIR%\bin\x86 - -copy .msvc\installer_x64_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -copy obj%BUILD_ALT_DIR%\amd64\installer_x64.exe . >NUL 2>&1 - -if /I Test%ORG_BUILDARCH%==TestAMD64 goto restorePath -set 386=1 -set AMD64= -set BUILD_DEFAULT_TARGETS=-386 -set _AMD64bit= -set _BUILDARCH=x86 - -:restorePath -set PATH=%ORG_PATH% - -echo. -echo Embedding binary resources -embedder.exe embedded.h - -rem DLL or static lib selection (must use concatenation) -echo TARGETTYPE=%TARGET% > target -copy target+.msvc\libwdi_sources sources >NUL 2>&1 -del target -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -copy obj%BUILD_ALT_DIR%\%ARCH_DIR%\libwdi.lib . >NUL 2>&1 -copy obj%BUILD_ALT_DIR%\%ARCH_DIR%\libwdi.dll . >NUL 2>&1 - -if EXIST Makefile.hide ren Makefile.hide Makefile -cd .. -if Test%BUILD_SAMPLES%==TestNO goto done -cd examples\getopt - -del Makefile.hide >NUL 2>&1 -if EXIST Makefile ren Makefile Makefile.hide -copy .msvc\getopt_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -copy obj%BUILD_ALT_DIR%\%ARCH_DIR%\getopt.lib . >NUL 2>&1 - -if EXIST Makefile.hide ren Makefile.hide Makefile -cd .. - -del Makefile.hide >NUL 2>&1 -if EXIST Makefile ren Makefile Makefile.hide -rem Work around MS's VC++ and WDK weird icompatibilities with regards to rc files -echo #include ^ > afxres.h -echo #ifndef IDC_STATIC >> afxres.h -echo #define IDC_STATIC -1 >> afxres.h -echo #endif >> afxres.h -copy .msvc\zadic_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -copy obj%BUILD_ALT_DIR%\%ARCH_DIR%\zadic.exe . >NUL 2>&1 - -copy .msvc\zadig_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -del afxres.h -copy obj%BUILD_ALT_DIR%\%ARCH_DIR%\zadig.exe . >NUL 2>&1 - -copy .msvc\wdi-simple_sources sources >NUL 2>&1 -@echo on -%BUILD_CMD% -@echo off -if errorlevel 1 goto builderror -copy obj%BUILD_ALT_DIR%\%ARCH_DIR%\wdi-simple.exe . >NUL 2>&1 - -if EXIST Makefile.hide ren Makefile.hide Makefile -cd .. - -goto done - -:builderror -if EXIST Makefile.hide ren Makefile.hide Makefile -if EXIST afxres.h del afxres.h -echo Build failed -goto done - -:usage -echo wdk_build must be run in a Windows Driver Kit build environment -pause -goto done - -:done -set BUILD_ALT_DIR=%ORG_BUILD_ALT_DIR% -set _BUILDARCH=%ORG_BUILDARCH% -set PATH=%ORG_PATH% -set BUILD_DEFAULT_TARGETS=%ORG_BUILD_DEFAULT_TARGETS% -cd %PWD% -goto out - -:unsupported -echo Only Windows 7 or later is supported - -:out