Merge from pbatard/libwdi

.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
+_*.sh           export-ignore
+_*.cmd          export-ignore
+appveyor.yml    export-ignore

.github/workflows/codeql.yml

@@ -0,0 +1,73 @@
+name: CodeQL
+
+on: 
+  push:
+    paths-ignore:
+      - '.gitignore'
+      - '.gitattributes'
+      - '**.cmd'
+      - '**.md'
+      - 'AUTHORS'
+      - 'NEWS'
+      - 'ChangeLog'
+  pull_request:
+    paths-ignore:
+      - '.gitignore'
+      - '.gitattributes'
+      - '**.cmd'
+      - '**.md'
+      - 'AUTHORS'
+      - 'NEWS'
+      - 'ChangeLog'
+
+env:
+  WDK_URL: https://go.microsoft.com/fwlink/p/?LinkID=253170
+  LIBUSB0_URL: https://github.com/mcuee/libusb-win32/releases/download/release_1.4.0.0/libusb-win32-bin-1.4.0.0.zip
+  LIBUSBK_URL: https://github.com/mcuee/libusbk/releases/download/V3.1.0.0/libusbK-3.1.0.0-bin.7z
+  SOLUTION_FILE_PATH: ./libwdi.sln
+  TARGET_PLATFORM: x64
+  BUILD_CONFIGURATION: Debug
+  BUILD_MACROS: '"WDK_DIR=\"../wdk/Windows Kits/8.0\";LIBUSB0_DIR=\"../libusb0\";LIBUSBK_DIR=\"../libusbk/bin\""'
+
+jobs:
+  CodeQL-Build:
+    runs-on: windows-latest
+
+    permissions:
+      security-events: write
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: Download support files
+      shell: cmd
+      run: |
+        curl -L ${{ env.WDK_URL }} -o wdk-redist.msi
+        curl -L ${{ env.LIBUSB0_URL }} -o libusb0-redist.zip
+        curl -L ${{ env.LIBUSBK_URL }} -o libusbk-redist.7z
+        msiexec /a wdk-redist.msi /qn TARGETDIR=%CD%\wdk
+        7z x libusb0-redist.zip
+        7z x libusbk-redist.7z
+        del *.zip
+        del *.7z
+        move libusb-win32* libusb0
+        move libusbK* libusbk
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: cpp
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Build
+      shell: cmd
+      run: msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION}},Platform=${{ env.TARGET_PLATFORM }},BuildMacros=${{ env.BUILD_MACROS }}
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

.github/workflows/coverity.yml

@@ -0,0 +1,64 @@
+name: Coverity
+
+on: 
+  push:
+    paths-ignore:
+      - '.gitignore'
+      - '.gitattributes'
+      - '**.cmd'
+      - '**.md'
+      - 'AUTHORS'
+      - 'NEWS'
+      - 'ChangeLog'
+
+env:
+  WDK_URL: https://go.microsoft.com/fwlink/p/?LinkID=253170
+  LIBUSB0_URL: https://github.com/mcuee/libusb-win32/releases/download/release_1.4.0.0/libusb-win32-bin-1.4.0.0.zip
+  LIBUSBK_URL: https://github.com/mcuee/libusbk/releases/download/V3.1.0.0/libusbK-3.1.0.0-bin.7z
+  SOLUTION_FILE_PATH: ./libwdi.sln
+  EMAIL: [email protected]
+  BUILD_MACROS: '"WDK_DIR=\"../wdk/Windows Kits/8.0\";LIBUSB0_DIR=\"../libusb0\";LIBUSBK_DIR=\"../libusbk/bin\""'
+
+jobs:
+  Coverity-Build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+    - name: Download Coverity
+      run: |
+        curl -d "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=pbatard%2Flibwdi" -L https://scan.coverity.com/download/cxx/win64 -o cov-analysis-win64.zip
+        7z x cov-analysis-win64.zip
+        del cov-analysis-win64.zip
+        move cov-analysis-win64* cov-analysis-win64
+    - name: Add Coverity to PATH
+      shell: bash
+      run: echo "${{ github.workspace }}/cov-analysis-win64/bin" >> $GITHUB_PATH
+    - name: Download support files
+      shell: cmd
+      run: |
+        curl -L ${{ env.WDK_URL }} -o wdk-redist.msi
+        curl -L ${{ env.LIBUSB0_URL }} -o libusb0-redist.zip
+        curl -L ${{ env.LIBUSBK_URL }} -o libusbk-redist.7z
+        msiexec /a wdk-redist.msi /qn TARGETDIR=%CD%\wdk
+        7z x libusb0-redist.zip
+        7z x libusbk-redist.7z
+        del *.zip
+        del *.7z
+        move libusb-win32* libusb0
+        move libusbK* libusbk
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v2
+    - name: Build with Coverity
+      shell: cmd
+      run: |
+        cov-configure --msvc
+        cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=Release,Platform=x64,BuildMacros=${{ env.BUILD_MACROS }}
+    - name: Upload Coverity build for analysis
+      run: |
+        7z a -r cov-int.zip cov-int
+        curl --form email=${{ env.EMAIL }} --form token=${{ secrets.COVERITY_SCAN_TOKEN }} --form [email protected] --form version="${{ env.GITHUB_SHA }}" --form description="libwdi" https://scan.coverity.com/builds?project=pbatard%2Flibwdi

.github/workflows/mingw.yml

@@ -0,0 +1,100 @@
+name: MinGW
+
+on: 
+  push:
+    paths-ignore:
+      - '.gitignore'
+      - '.gitattributes'
+      - '**.cmd'
+      - '**.md'
+      - 'AUTHORS'
+      - 'NEWS'
+      - 'ChangeLog'
+  pull_request:
+    paths-ignore:
+      - '.gitignore'
+      - '.gitattributes'
+      - '**.cmd'
+      - '**.md'
+      - 'AUTHORS'
+      - 'NEWS'
+      - 'ChangeLog'
+
+env:
+  WDK_URL: https://go.microsoft.com/fwlink/p/?LinkID=253170
+  LIBUSB0_URL: https://github.com/mcuee/libusb-win32/releases/download/release_1.4.0.0/libusb-win32-bin-1.4.0.0.zip
+  LIBUSBK_URL: https://github.com/mcuee/libusbk/releases/download/V3.1.0.0/libusbK-3.1.0.0-bin.7z
+  BUILD_OPTIONS: '--enable-toggable-debug --enable-examples-build --disable-debug --disable-shared'
+  DRIVERS_PATHS: '--with-wdkdir="wdk/Windows Kits/8.0" --with-wdfver=1011 --with-libusb0="libusb0" --with-libusbk="libusbk/bin"'
+
+jobs:
+  MinGW-Build:
+    runs-on: windows-latest
+
+    strategy:
+      matrix:
+        include:
+          - { sys: mingw64, env: x86_64 }
+          - { sys: mingw32, env: i686 }
+
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+    - name: Install MinGW
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.sys }}
+        update: true
+        install: >-
+          mingw-w64-${{ matrix.env }}-toolchain
+          base-devel
+          autotools
+          git
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+    - name: Download support files
+      shell: cmd
+      run: |
+        curl -L ${{ env.WDK_URL }} -o wdk-redist.msi
+        curl -L ${{ env.LIBUSB0_URL }} -o libusb0-redist.zip
+        curl -L ${{ env.LIBUSBK_URL }} -o libusbk-redist.7z
+        msiexec /a wdk-redist.msi /qn TARGETDIR=%CD%\wdk
+        7z x libusb0-redist.zip
+        7z x libusbk-redist.7z
+        del *.zip
+        del *.7z
+        move libusb-win32* libusb0
+        move libusbK* libusbk
+    - name: Build
+      run: |
+        ./bootstrap.sh
+        [ "${{ matrix.env }}" == "x86_64" ] && EXTRA_OPTION=--disable-32bit
+        ./configure --build=${{ matrix.env }}-w64-mingw32 --host=${{ matrix.env }}-w64-mingw32 ${{ env.BUILD_OPTIONS }} $EXTRA_OPTION ${{ env.DRIVERS_PATHS }}
+        make
+        mkdir -p artifacts/${{ matrix.env }}
+        mv examples/*.exe artifacts/${{ matrix.env }}
+    - name: Display SHA-256
+      if: ${{ github.event_name == 'push' }}
+      run: sha256sum artifacts/${{ matrix.env }}/*.exe
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      if: ${{ github.event_name == 'push' }}
+      with:
+        name: ${{ matrix.sys }}
+        path: ./artifacts/*/*.exe
+
+  Merge-Artifacts:
+    runs-on: windows-latest
+    needs: MinGW-Build
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        if: ${{ github.event_name == 'push' }}
+        with:
+          name: MinGW
+          delete-merged: true

.github/workflows/vs2022.yml

@@ -0,0 +1,101 @@
+name: VS2022
+
+on: 
+  push:
+    paths-ignore:
+      - '.gitignore'
+      - '.gitattributes'
+      - '**.cmd'
+      - '**.md'
+      - 'AUTHORS'
+      - 'NEWS'
+      - 'ChangeLog'
+  pull_request:
+    paths-ignore:
+      - '.gitignore'
+      - '.gitattributes'
+      - '**.cmd'
+      - '**.md'
+      - 'AUTHORS'
+      - 'NEWS'
+      - 'ChangeLog'
+
+env:
+  WDK_URL: https://go.microsoft.com/fwlink/p/?LinkID=253170
+  LIBUSB0_URL: https://github.com/mcuee/libusb-win32/releases/download/release_1.4.0.0/libusb-win32-bin-1.4.0.0.zip
+  LIBUSBK_URL: https://github.com/mcuee/libusbk/releases/download/V3.1.0.0/libusbK-3.1.0.0-bin.7z
+  SOLUTION_FILE_PATH: ./libwdi.sln
+  BUILD_MACROS: '"WDK_DIR=\"../wdk/Windows Kits/8.0\";LIBUSB0_DIR=\"../libusb0\";LIBUSBK_DIR=\"../libusbk/bin\""'
+
+jobs:
+  VS2022-Build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: Download support files
+      shell: cmd
+      run: |
+        curl -L ${{ env.WDK_URL }} -o wdk-redist.msi
+        curl -L ${{ env.LIBUSB0_URL }} -o libusb0-redist.zip
+        curl -L ${{ env.LIBUSBK_URL }} -o libusbk-redist.7z
+        msiexec /a wdk-redist.msi /qn TARGETDIR=%CD%\wdk
+        7z x libusb0-redist.zip
+        7z x libusbk-redist.7z
+        del *.zip
+        del *.7z
+        move libusb-win32* libusb0
+        move libusbK* libusbk
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Build
+      shell: cmd
+      run: |
+        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: Upload artifacts
+      uses: actions/upload-artifact@v4
+      if: ${{ github.event_name == 'push' }}
+      with:
+        name: VS2022
+        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@v3
+      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@v4
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        name: Zadig
+        path: ./zadig-*.exe

AUTHORS

@@ -1,16 +1,28 @@
-Copyright �  2010-2016 Pete Batard <[email protected]>
-Copyright �  2010-2011 Travis Robinson <[email protected]>
+Copyright © 2010-2023 Pete Batard <[email protected]>
+Copyright © 2010-2011 Travis Robinson <[email protected]>
 
 Other contributors:
 Alexander Sashnov
 Bob Paddock
+Fred Sundvik
+Georg Vienna
+Giovanni Bajo
+Jacob Alexander
 JaggedJax
+Jasper van Bourgognie
+Jeorg Fischer
 Jerome-PS
+Joel Holdsworth
 Joseph Marshall
+Josh Soerf
+Karel Bilek
 Liam Staskawicz
 Louie Caulfield
 PhracturedBlue
 Ryan Pavlik
+Spiro Trikaliotis
+Stanley Elliott
+Tim Gates
 Uri Lublin
 Vitali Lovich
-Xiaofan Chen
+Xiaofan Chen