.github/workflows/main.yml

@@ -8,411 +8,316 @@ on:
     types: [published]
 
 jobs:
-# Release builds
+  build_mac:
-  build_release_macos:
+    name: Build on macOS
-    name: Release build (macOS universal, static Qt 6.5.0)
+    runs-on: macos-12
-    runs-on: macos-latest
+    env:
+        HAS_QT: 1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
+    
       - name: Get Qt
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
-          repository: LongSoft/qt-6-static-universal-macos
+          repository: LongSoft/qt-5.6.3-static-universal-macos-sdk12.3
           path: qt
           lfs: true
+          
       - name: Unpack Qt
         shell: bash
         working-directory: qt
-        run: sudo 7z x qt-6.5.0-static-universal-macos.7z -o/opt
+        run: sudo unzip -q qt-5.6.3-static-universal-macos-sdk12.3.zip -d/opt && echo "/opt/qt56sm/bin" >> $GITHUB_PATH
-      - name: Create build directory
+        
-        run: cmake -E make_directory ${{runner.workspace}}/build
-      - name: Configure everything
-        working-directory: ${{runner.workspace}}/build
-        run: cmake -DCMAKE_PREFIX_PATH="/opt/qt-6.5.0-static-universal-macos" -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" ../UEFITool
       - name: Build everything
-        working-directory: ${{runner.workspace}}/build
+        run: ./unixbuild.sh
-        shell: bash
+        
-        run: cmake --build . --config Release
-      - name: Create dist directory
-        run: cmake -E make_directory ${{runner.workspace}}/UEFITool/dist
-      - name: Signed archive everything
-        if: github.repository_owner == 'LongSoft'
-        working-directory: ${{runner.workspace}}/build
-        env:
-          MAC_CERTIFICATE_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
-          MAC_ACCOUNT_NAME: ${{ secrets.MAC_ACCOUNT_NAME }}
-          MAC_ACCOUNT_PASSWORD: ${{ secrets.MAC_ACCOUNT_PASSWORD }}
-        shell: bash
-        run: |
-          UEFITOOL_VER=$(cat ../UEFITool/version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
-          codesign -fs - UEFIExtract/UEFIExtract
-          codesign -fs - UEFIFind/UEFIFind
-          zip -qryj ../UEFITool/dist/UEFIExtract_NE_${UEFITOOL_VER}_universal_mac.zip ./UEFIExtract/UEFIExtract
-          zip -qryj ../UEFITool/dist/UEFIFind_NE_${UEFITOOL_VER}_universal_mac.zip ./UEFIFind/UEFIFind
-          brew install create-dmg || exit 1
-          curl -OL "https://github.com/acidanthera/ocbuild/raw/master/codesign/appsign.sh" || exit 1
-          chmod a+x appsign.sh || exit 1
-          "$(pwd)/appsign.sh" ./UEFITool/UEFITool.app ../UEFITool/dist/UEFITool_NE_${UEFITOOL_VER}_universal_mac.dmg
-      - name: Archive everything
-        if: github.repository_owner != 'LongSoft'
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        run: |
-          UEFITOOL_VER=$(cat ../UEFITool/version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
-          codesign -fs - UEFIExtract/UEFIExtract
-          codesign -fs - UEFIFind/UEFIFind
-          zip -qryj ../UEFITool/dist/UEFIExtract_NE_${UEFITOOL_VER}_universal_mac.zip ./UEFIExtract/UEFIExtract
-          zip -qryj ../UEFITool/dist/UEFIFind_NE_${UEFITOOL_VER}_universal_mac.zip ./UEFIFind/UEFIFind
-          cd UEFITool
-          codesign -fs - --deep UEFITool.app
-          zip -qry ../../UEFITool/dist/UEFITool_NE_${UEFITOOL_VER}_universal_mac.zip ./UEFITool.app
       - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: macOS builds
-          path: dist/*
+          path: dist/*.zip
+          
       - name: Upload to releases
         if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@v2
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: dist/*
+          file: dist/*.zip
           tag: ${{ github.ref }}
           file_glob: true
 
-  build_release_linux:
+  build_linux:
-    name: Release build (Linux x64, shared Qt 6)
+    name: Build on Linux
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
+    env:
+        HAS_QT: 1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
+      
       - name: Get Qt
-        run: | 
+        run: sudo apt-get install -qq qt5-default qt5-qmake qtbase5-dev-tools cmake
-          sudo apt update
+      
-          sudo apt-get install -qq zip cmake libgl1-mesa-dev qt6-base-dev
-      - name: Create build directory
-        run: cmake -E make_directory ${{runner.workspace}}/build
-      - name: Configure everything
-        working-directory: ${{runner.workspace}}/build
-        run: cmake ../UEFITool
       - name: Build everything
-        working-directory: ${{runner.workspace}}/build
+        run: ./unixbuild.sh
-        shell: bash
+      
-        run: cmake --build . --config Release
-      - name: Create dist directory
-        run: cmake -E make_directory ${{runner.workspace}}/UEFITool/dist
-      - name: Archive everything
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        run: |
-          UEFITOOL_VER=$(cat ../UEFITool/version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
-          zip -qryj ../UEFITool/dist/UEFIExtract_NE_${UEFITOOL_VER}_x64_linux.zip ./UEFIExtract/uefiextract
-          zip -qryj ../UEFITool/dist/UEFIFind_NE_${UEFITOOL_VER}_x64_linux.zip ./UEFIFind/uefifind
-          zip -qryj ../UEFITool/dist/UEFITool_NE_${UEFITOOL_VER}_x64_linux.zip ./UEFITool/uefitool
       - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: Linux builds
           path: dist/*.zip
+
       - name: Upload to releases
         if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@v2
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: dist/*.zip
           tag: ${{ github.ref }}
           file_glob: true
 
-  build_release_freebsd:
+  build_linux_meson:
-    name: Release build (FreeBSD x64, shared Qt 6)
+    name: Build on Linux with Meson
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
-      - name: Build on FreeBSD inside Ubuntu VM
+      - name: Get Deps
-        id: test
+        run: sudo apt-get install -qq zlib1g-dev meson qt5-default
-        uses: cross-platform-actions/action@v0.27.0
+      - name: Configure build
-        with:
+        run: mkdir build-meson && meson ./build-meson
-          operating_system: freebsd
+      - name: Build everything
-          version: '13.3'
+        run: ninja -C build-meson
-          shell: sh
-          run: |
-            sudo pkg install -y zip cmake qt6-base
-            mkdir dist
-            mkdir build
-            cd build
-            cmake ..
-            cmake --build . --config Release
-            UEFITOOL_VER=$(cat ../version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
-            zip -qryj ../dist/UEFIExtract_NE_${UEFITOOL_VER}_x64_freebsd.zip ./UEFIExtract/uefiextract
-            zip -qryj ../dist/UEFIFind_NE_${UEFITOOL_VER}_x64_freebsd.zip ./UEFIFind/uefifind
-            zip -qryj ../dist/UEFITool_NE_${UEFITOOL_VER}_x64_freebsd.zip ./UEFITool/uefitool
-      - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: FreeBSD builds
-          path: dist/*.zip
-      - name: Upload to releases
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: dist/*.zip
-          tag: ${{ github.ref }}
-          file_glob: true
 
-  build_release_windows_32:
+  build_win:
-    name: Release build (Win32, static Qt 5.6.3)
+    name: Build on Windows
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v3 
+      - uses: actions/checkout@v2
-      - name: Get Qt 5.6.3
+
-        uses: actions/checkout@v3
+      - name: Get Qt
+        uses: actions/checkout@v2
         with:
           repository: LongSoft/qt-5.6.3-static-x86-msvc2017
-          path: qt5
+          path: qt
           lfs: true
-      - name: Unpack Qt 5.6.3
+          
+      - name: Unpack Qt
         shell: bash
-        working-directory: qt5
+        working-directory: qt
         run: 7z x qt-5.6.3-static-x86-msvc2017.7z -o../..
+        
       - name: Create dist directory
         shell: bash
         run: mkdir dist
+
       - name: Create UEFIExtract build directory
         run: cmake -E make_directory ${{runner.workspace}}/build/UEFIExtract
+        
       - name: Configure UEFIExtract
         shell: bash
         working-directory: ${{runner.workspace}}/build/UEFIExtract
-        run: cmake -G "Visual Studio 16 2019" -A Win32 -T "v141_xp" -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded" ../../UEFITool/UEFIExtract/
+        run: cmake -G "Visual Studio 16 2019" -T "v141_xp" -DU_STATIC_RT=YES ../../UEFITool/UEFIExtract/
+      
       - name: Build UEFIExtract
         working-directory: ${{runner.workspace}}/build/UEFIExtract
         shell: bash
         run: cmake --build . --config Release
+      
       - name: Archive UEFIExtract
         working-directory: ${{runner.workspace}}/build/UEFIExtract/Release
         shell: bash
         run: |
           UEFITOOL_VER=$(cat ../../../UEFITool/version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
           7z a ../../../UEFITool/dist/UEFIExtract_NE_${UEFITOOL_VER}_win32.zip UEFIExtract.exe
+
       - name: Create UEFIFind build directory
         run: cmake -E make_directory ${{runner.workspace}}/build/UEFIFind
+      
       - name: Configure UEFIFind
-        working-directory: ${{runner.workspace}}/build/UEFIFind
         shell: bash
-        run: cmake -G "Visual Studio 16 2019" -A Win32 -T "v141_xp" -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded" ../../UEFITool/UEFIFind/
+        working-directory: ${{runner.workspace}}/build/UEFIFind
+        run: cmake -G "Visual Studio 16 2019" -T "v141_xp" -DU_STATIC_RT=YES ../../UEFITool/UEFIFind/
+      
       - name: Build UEFIFind
         working-directory: ${{runner.workspace}}/build/UEFIFind
         shell: bash
         run: cmake --build . --config Release
+      
       - name: Archive UEFIFind
         working-directory: ${{runner.workspace}}/build/UEFIFind/Release
         shell: bash
         run: |
           UEFITOOL_VER=$(cat ../../../UEFITool/version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
           7z a ../../../UEFITool/dist/UEFIFind_NE_${UEFITOOL_VER}_win32.zip UEFIFind.exe
+
       - name: Create UEFITool build directory
         run: cmake -E make_directory ${{runner.workspace}}/build/UEFITool
+      
       - name: Configure UEFITool
         shell: bash
         working-directory: ${{runner.workspace}}/build/UEFITool
-        run: ../../qt-5.6.3-static-x86-msvc2017/bin/qmake.exe -tp vc ../../UEFITool/UEFITool/
+        run: ../../qt-5.6.3-static-x86-msvc2017/bin/qmake.exe ../../UEFITool/UEFITool/
+      
       - name: Build UEFITool
         working-directory: ${{runner.workspace}}/build/UEFITool
         shell: cmd
         run: |
             call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
-            msbuild -t:Rebuild -p:PlatformToolset=v141_xp;Configuration=Release
+            nmake release
+      
       - name: Archive UEFITool
         working-directory: ${{runner.workspace}}/build/UEFITool/release
         shell: bash
         run: |
           UEFITOOL_VER=$(cat ../../../UEFITool/version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
           7z a ../../../UEFITool/dist/UEFITool_NE_${UEFITOOL_VER}_win32.zip UEFITool.exe
+
       - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
-          name: Windows 32-bit builds
+          name: Windows builds
           path: dist/*.zip
+      
       - name: Upload to releases
         if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@v2
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: dist/*.zip
           tag: ${{ github.ref }}
           file_glob: true
 
-  build_release_windows_64:
+  analyze_coverity:
-    name: Release build (Win64, static Qt 6.5.0)
-    runs-on: windows-2022
-    steps:
-      - uses: actions/checkout@v3 
-      - name: Get Qt 6.5.0
-        uses: actions/checkout@v3
-        with:
-          repository: LongSoft/qt-6-static-x64-msvc2022
-          path: qt6
-          lfs: true
-      - name: Unpack Qt 6.5.0
-        shell: bash
-        working-directory: qt6
-        run: 7z x qt-6.5.0-static-x64-msvc2022.7z -o../..
-      - name: Create build directory
-        run: cmake -E make_directory ${{runner.workspace}}/build
-      - name: Configure everything
-        working-directory: ${{runner.workspace}}/build
-        shell: cmd
-        run: cmake -DCMAKE_PREFIX_PATH="D:\a\UEFITool\qt-6.5.0-static-x64-msvc2022" -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded" -A x64 ../UEFITool
-      - name: Build everything
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        run: cmake --build . --config Release
-      - name: Create dist directory
-        run: cmake -E make_directory ${{runner.workspace}}/UEFITool/dist
-      - name: Archive everything
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        run: |
-          UEFITOOL_VER=$(cat ../UEFITool/version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
-          7z a ../UEFITool/dist/UEFIExtract_NE_${UEFITOOL_VER}_win64.zip ./UEFIExtract/Release/UEFIExtract.exe
-          7z a ../UEFITool/dist/UEFIFind_NE_${UEFITOOL_VER}_win64.zip ./UEFIFind/Release/UEFIFind.exe
-          7z a ../UEFITool/dist/UEFITool_NE_${UEFITOOL_VER}_win64.zip ./UEFITool/Release/UEFITool.exe
-      - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: Windows 64-bit builds
-          path: dist/*.zip
-      - name: Upload to releases
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: dist/*.zip
-          tag: ${{ github.ref }}
-          file_glob: true
-
-# Build Tests
-  build_test_linux_meson:
-    name: Meson build system test (shared Qt 5)
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Get Deps
-        run: | 
-          sudo apt update
-          sudo apt-get install -qq cmake meson zlib1g-dev qtbase5-dev
-      - name: Configure build
-        run: mkdir build-meson && meson ./build-meson
-      - name: Build everything
-        run: ninja -C build-meson
-
-  build_test_windows_mingw:
-    name: MinGW compiler test (shared Qt 6.5.0)
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: '6.5.0'
-          host: 'windows'
-          target: 'desktop'
-          arch: 'win64_mingw'
-      - name: Build everything
-        run: |
-          cmake -G "MinGW Makefiles" -B build .
-          cmake --build build --parallel
-
-  build_test_linux_fuzzer:
-    name: Fuzzer build test (Clang, Linux x64)
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Create build directory
-        run: cmake -E make_directory ${{runner.workspace}}/build
-      - name: Configure everything
-        working-directory: ${{runner.workspace}}/build
-        run: CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake ../UEFITool/fuzzing
-      - name: Build everything
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        run: cmake --build .
-      - name: Create dist directory
-        run: cmake -E make_directory ${{runner.workspace}}/dist
-      - name: Archive everything
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        run: |
-          UEFITOOL_VER=$(cat ../UEFITool/version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') ; \
-          zip -qryj ../dist/ffsparser_fuzzer_NE_${UEFITOOL_VER}_x64_linux.zip ./ffsparser_fuzzer
-      - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: Fuzzer
-          path: ${{runner.workspace}}/dist/*.zip
-
-# Static Analysis
-  build_analyze_linux_coverity:
     env:
       PROJECT_TYPE: TOOL
       JOB_TYPE: COVERITY
+      HAS_QT: 1
     if: github.repository_owner == 'LongSoft' && github.event_name != 'pull_request'
-    name: Coverity Static Analysis (shared Qt 6.5.0)
+    name: Coverity Static Analysis
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.0'
+          version: '6.3.1'
           host: 'linux'
           target: 'desktop'
-      - name: Create build directory
+    
-        run: cmake -E make_directory ${{runner.workspace}}/build
+      - name: CI Bootstrap
-      - name: Configure everything
+        run: |
-        working-directory: ${{runner.workspace}}/build
+          src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
-        run: cmake ../UEFITool
+      - uses: actions/checkout@v2
+      - run: ./unixbuild.sh --configure
+
       - name: Run Coverity
-        working-directory: ${{runner.workspace}}/build
         run: |
           src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap-linux.sh) && eval "$src" || exit 1
         env:
           COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
           COVERITY_SCAN_EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
-          COVERITY_BUILD_COMMAND: cmake --build .
+          COVERITY_BUILD_COMMAND: ./unixbuild.sh --build
 
-  build_analyze_linux_sonarcloud:
+  analyze_pvs_studio_and_codeql:
     if: github.repository_owner == 'LongSoft' && github.event_name != 'pull_request'
-    name: SonarCloud Static Analysis (shared Qt 6.5.0)
+    name: PVS-Studio and CodeQL Static Analysis
     runs-on: ubuntu-latest
-    env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.0'
+          version: '6.3.1'
           host: 'linux'
           target: 'desktop'
-      - name: Install JDK 17
+
-        uses: actions/setup-java@v3
+      - name: Check out
+        uses: actions/checkout@v2
+
+      - name: Install PVS-Studio
+        run: |
+          wget -q -O - https://files.pvs-studio.com/etc/pubkey.txt \
+            | sudo apt-key add -
+          sudo wget -O /etc/apt/sources.list.d/viva64.list \
+            https://files.pvs-studio.com/etc/viva64.list
+          sudo apt update
+          sudo apt install pvs-studio
+          pvs-studio-analyzer credentials ${{ secrets.PVS_STUDIO_CREDENTIALS }}
+      
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
         with:
-          distribution: 'zulu'
+          languages: cpp
-          java-version: 17
+    
-      - name: Install build-wrapper
+      - name: Build everything using CMake
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
+        run: |
+          cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=On -B build .
+          cmake --build build -j
+    
+      - name: Perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2
+    
+      - name: Perform PVS-Studio analysis
+        run: |
+          pvs-studio-analyzer analyze -f build/compile_commands.json -j
+          
+      - name: Convert PVS-Studio report
+        run: |
+          plog-converter -t sarif -o pvs-report.sarif PVS-Studio.log
+          
+      - name: Publish  PVS-Studio report
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: pvs-report.sarif
+          category: PVS-Studio
+          
+  analyze_sonarcloud:
+    if: github.repository_owner == 'LongSoft' && github.event_name != 'pull_request'
+    name: SonarCloud Static Analysis
+    runs-on: ubuntu-latest
+    env:
+      SONAR_SCANNER_VERSION: 4.7.0.2747
+      SONAR_SERVER_URL: "https://sonarcloud.io"
+      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
+    steps:
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.3.1'
+          host: 'linux'
+          target: 'desktop'
+        
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+          
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+          
+      - name: Download and set up sonar-scanner
+        env:
+          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
+        run: |
+          mkdir -p $HOME/.sonar
+          curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
+          unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+          echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
+          
+      - name: Download and set up build-wrapper
+        env:
+          BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
+        run: |
+          curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
+          unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/
+          echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
+          
       - name: Run build-wrapper
         run: |
           cmake -B build .
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build -j
-      - name: SonarQube Scan
+          
-        uses: SonarSource/sonarqube-scan-action@v4.2.1
+      - name: Run sonar-scanner
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          SONAR_ROOT_CERT: ${{ secrets.SONAR_ROOT_CERT }}
+        run: |
-        with:
+          sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"     
-          # Consult https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/scanners/sonarscanner/ for more information and options
-          args: >
-            --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json" 

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.22)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.16)
 
 PROJECT(UEFITool_everything)
 

README.md

@@ -3,7 +3,7 @@
 UEFITool is a viewer and editor of firmware images conforming to UEFI Platform Interface (PI) Specifications.
 
 ![UEFITool icon](https://raw.githubusercontent.com/LongSoft/UEFITool/new_engine/UEFITool/icons/uefitool_64x64.png "UEFITool icon")  
-![CI Status](https://github.com/LongSoft/UEFITool/actions/workflows/main.yml/badge.svg?branch=new_engine) [![Scan Status](https://scan.coverity.com/projects/17209/badge.svg?flat=1)](https://scan.coverity.com/projects/17209) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=LongSoft_UEFITool&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=LongSoft_UEFITool)
+![CI Status](https://github.com/LongSoft/UEFITool/actions/workflows/main.yml/badge.svg?branch=new_engine) [![Scan Status](https://scan.coverity.com/projects/17209/badge.svg?flat=1)](https://scan.coverity.com/projects/17209)
 
 
 ## Very Brief Introduction to UEFI
@@ -29,37 +29,28 @@ The missing parts are in development and the version with a new engine will be m
 
 There are some other projects that use UEFITool's engine:
 * UEFIExtract, which uses ffsParser to parse supplied firmware image into a tree structure and dumps the parsed structure recursively on the FS. Jethro Beekman's [tree](https://github.com/jethrogb/uefireverse) utility can be used to work with the extracted tree.
-* UEFIFind, which uses ffsParser to find image elements containing a specified pattern. It was developed for [UBU](https://winraid.level1techs.com/t/tool-guide-news-uefi-bios-updater-ubu/30357) project.
+* UEFIFind, which uses ffsParser to find image elements containing a specified pattern. It was developed for [UBU](http://www.win-raid.com/t154f16-Tool-Guide-News-quot-UEFI-BIOS-Updater-quot-UBU.html) project.
+* [OZMTool](https://github.com/tuxuser/UEFITool/tree/OZM/OZMTool), which uses UEFITool's engine to perform various "hackintosh"-related firmware modifications.
 
 ## Alternatives
 
 Right now there are some alternatives to UEFITool that you could find useful too:
-* **[FMMT](https://github.com/tianocore/edk2/tree/master/BaseTools/Source/Python/FMMT)** by TianoCore. Python-based open source toolset for modifying EDK2-based UEFI firmware images. Does not support any IBV customizations, but is _official_, and lives in EDK2 repository.
 * **[Fiano](https://github.com/linuxboot/fiano)** by Google and Facebook. Go-based cross-platform open source toolset for modifying UEFI firmware images.
-* **[PhoenixTool](https://forums.mydigitallife.net/threads/tool-to-insert-replace-slic-in-phoenix-insyde-dell-efi-bioses.13194)** by [AndyP](https://forums.mydigitallife.net/members/andyp.39295). Windows-only freeware GUI application written in C#. Used mostly for SLIC-related modifications, but it not limited to this task. Requires Microsoft .NET 3.5 to work properly. Supports unpacking firmware images from various vendor-specific formats like encrypted HP update files and Dell installers.
+* **[PhoenixTool](http://forums.mydigitallife.info/threads/13194-Tool-to-Insert-Replace-SLIC-in-Phoenix-Insyde-Dell-EFI-BIOSes)** by [AndyP](http://forums.mydigitallife.info/members/39295-andyp). Windows-only freeware GUI application written in C#. Used mostly for SLIC-related modifications, but it not limited to this task. Requires Microsoft .NET 3.5 to work properly. Supports unpacking firmware images from various vendor-specific formats like encrypted HP update files and Dell installers.  
 * **[uefi-firmware-parser](https://github.com/theopolis/uefi-firmware-parser)** by [Teddy Reed](https://github.com/theopolis). Cross-platform open source console application written in Python. Very tinker-friendly due to use of Python. Can be used in scripts to automate firmware patching.
 * **[Chipsec](https://github.com/chipsec/chipsec)** by Intel. Cross-platform partially open source console application written in Python and C. Can be used to test Intel-based platforms for various security-related misconfigurations, but also has NVRAM parser and other components aimed to firmware modification.
+* **MMTool** by AMI. Windows-only proprietary application available to AMI clients. Works only with Aptio4- and AptioV-based firmware images, but has some interesting features including OptionROM replacement and microcode update. Must be licensed from AMI.
+* **H2OEZE** by Insyde. Windows-only proprietary application available to Insyde clients. Works only with InsydeH2O-based firmware images. Must be licensed from Insyde.
+* **SCT BIOS Editor** by Phoenix. Windows-only proprietary application available to Phoenix clients. Works only with Phoenix SCT-based firmware images. Must be licensed from Phoenix.
 
 ## Installation
 
-You can either use [pre-built binaries](https://github.com/LongSoft/UEFITool/releases) or build a binary yourself.  
+You can either use [pre-built binaries for Windows and macOS](https://github.com/LongSoft/UEFITool/releases) or build a binary yourself.  
-* To build a binary that uses Qt library (UEFITool) you need a C++ compiler and an instance of [Qt5 or Qt6](https://www.qt.io) library. Install both of them, get the sources, generate makefiles using qmake (`qmake ./UEFITool/uefitool.pro`) and use your system's make command on that generated files (i.e. `nmake release`, `make release` and so on). Qt6-based builds can also use CMAKE as an altearnative build system.
+* To build a binary that uses Qt library (UEFITool) you need a C++ compiler and an instance of [Qt5](https://www.qt.io) library. Install both of them, get the sources, generate makefiles using qmake (`qmake UEFITool.pro`) and use your system's make command on that generated files (i.e. `nmake release`, `make release` and so on).
-* To build a binary that doesn't use Qt (UEFIExtract, UEFIFind), you need a C++ compiler and [CMAKE](https://cmake.org) utility to generate a makefile for your OS and build environment. Install both of them, get the sources, generate makefiles using cmake (`cmake UEFIExtract`) and use your system's make command on that generated files (i.e. `nmake release`, `make release` and so on). Non-Qt builds can also use Meson as an alternative build system.
+* To build a binary that doesn't use Qt (UEFIExtract, UEFIFind), you need a C++ compiler and [CMAKE](https://cmake.org) utility to generate a makefile for your OS and build environment. Install both of them, get the sources, generate makefiles using cmake (`cmake UEFIExtract`) and use your system's make command on that generated files (i.e. `nmake release`, `make release` and so on).
 
 ## Known issues
 
-* Image editing is currently only possible using an outdated and unsupported UEFITool 0.28 (`old_engine` branch) and the tools based on it (`UEFIReplace`, `UEFIPatch`). This is the top priority [issue #67](https://github.com/LongSoft/UEFITool/issues/67), which is being worked on, albeit slowly (due to the amount of coding and testing required to implement it correctly). 
 * Some vendor-specific firmware update files can be opened incorrectly or can't be opened at all. This includes encrypted HP update files, Dell HDR and EXE files, some InsydeFlash FD files and so on. Enabling support for such files will require massive amount of reverse-engineering which is almost pointless because the updated image can be obtained from BIOS chip where it's already decrypted and unpacked.
-* Intel Firmware Interface Table (FIT) editing is not supported right now. FIT contains pointers to various image components that must be loaded before executing the first CPU instruction from the BIOS chip. Those components include CPU microcode updates, binaries and settings used by BIOS Guard and Boot Guard technologies and some other stuff. More information on FIT can be obtained [here](https://edc.intel.com/content/www/us/en/design/products-and-solutions/software-and-services/firmware-and-bios/firmware-interface-table/firmware-interface-table/).
+* Intel Firmware Interface Table (FIT) editing is not supported right now. FIT contains pointers to various image components that must be loaded before executing the first CPU instruction from the BIOS chip. Those components include CPU microcode updates, binaries and settings used by BIOS Guard and Boot Guard technologies and some other stuff. More information on FIT can be obtained [here](http://downloadmirror.intel.com/18931/eng/Intel%20TXT%20LAB%20Handout.pdf).
-* Windows builds of `UEFIExtract` and `UEFIFind` might encouter an issue with folder paths being longer than 260 bytes (`MAX_PATH`) on some input files (see [issue #363](https://github.com/LongSoft/UEFITool/issues/363)). This is a [known Windows limitation](https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry), that can be fixed by enabling long paths support via Windows Registry and adding a manifest to the executable file that requires such support. `UEFIExtract` has the required manifest additions since version `A67`, and the required registry file is provided by Microsoft on the page linked above, but this workaround is only awailable starting with Windows 10 build 1067.   
+* Builder code is still not ready.
-
-## Bug repellents
-
-* [Coverity Scan](https://scan.coverity.com/projects/17209) - static analyzer for C, C++, C#, JavaScript, Ruby, or Python code.
-* [SonarCloud](https://sonarcloud.io/project/overview?id=LongSoft_UEFITool) - cloud-based source code analysis service.
-
-## GUID Database
-
-Every new release includes an update to the database of known UEFI-related GUIDs build with help of [Linux Vendor Firmware Service](https://fwupd.org).
-
-You can download the up-to-date version of that database using [this link](https://fwupd.org/lvfs/shards/export/csv).

UEFIExtract/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.22)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0 FATAL_ERROR)
 
 PROJECT(UEFIExtract)
 
@@ -12,7 +12,6 @@ SET(PROJECT_SOURCES
  uefidump.cpp
  ../common/guiddatabase.cpp
  ../common/types.cpp
- ../common/filesystem.cpp
  ../common/descriptor.cpp
  ../common/ffs.cpp
  ../common/nvram.cpp
@@ -34,18 +33,6 @@ SET(PROJECT_SOURCES
  ../common/ustring.cpp
  ../common/bstrlib/bstrlib.c
  ../common/bstrlib/bstrwrap.cpp
- ../common/generated/ami_nvar.cpp
- ../common/generated/apple_sysf.cpp
- ../common/generated/dell_dvar.cpp
- ../common/generated/edk2_vss.cpp
- ../common/generated/edk2_vss2.cpp
- ../common/generated/edk2_ftw.cpp
- ../common/generated/insyde_fdc.cpp
- ../common/generated/insyde_fdm.cpp
- ../common/generated/ms_slic_marker.cpp
- ../common/generated/ms_slic_pubkey.cpp
- ../common/generated/phoenix_flm.cpp
- ../common/generated/phoenix_evsa.cpp
  ../common/generated/intel_acbp_v1.cpp
  ../common/generated/intel_acbp_v2.cpp
  ../common/generated/intel_keym_v1.cpp
@@ -73,20 +60,7 @@ SET(PROJECT_SOURCES
  ../common/zlib/zutil.c
 )
 
-ADD_DEFINITIONS(
+ADD_DEFINITIONS(-DU_ENABLE_NVRAM_PARSING_SUPPORT -DU_ENABLE_ME_PARSING_SUPPORT  -DU_ENABLE_FIT_PARSING_SUPPORT -DU_ENABLE_GUID_DATABASE_SUPPORT)
- -DU_ENABLE_NVRAM_PARSING_SUPPORT
- -DU_ENABLE_ME_PARSING_SUPPORT
- -DU_ENABLE_FIT_PARSING_SUPPORT
- -DU_ENABLE_GUID_DATABASE_SUPPORT
-)
 
-ADD_EXECUTABLE(UEFIExtract ${PROJECT_SOURCES} uefiextract.manifest)
+ADD_EXECUTABLE(UEFIExtract ${PROJECT_SOURCES})
 
-IF(UNIX)
- SET_TARGET_PROPERTIES(UEFIExtract PROPERTIES OUTPUT_NAME uefiextract)
-ENDIF()
-
-INSTALL(
- TARGETS UEFIExtract
- RUNTIME DESTINATION bin
-)

UEFIExtract/ffsdumper.cpp

@@ -30,12 +30,11 @@ USTATUS FfsDumper::dump(const UModelIndex & root, const UString & path, const Du
 
     USTATUS result = recursiveDump(root, path, dumpMode, sectionType, guid);
     if (result) {
-        printf("Error %zu returned from recursiveDump (directory \"%s\").\n", result, (const char*)path.toLocal8Bit());
+        printf("Error %lu returned from recursiveDump (directory \"%s\").\n", result, (const char*)path.toLocal8Bit());
         return result;
     } else if (!dumped) {
-        if (removeDirectory(path)) {
+        removeDirectory(path);
-            printf("Removed directory \"%s\" since nothing was dumped.\n", (const char*)path.toLocal8Bit());
+        printf("Removed directory \"%s\" since nothing was dumped.\n", (const char*)path.toLocal8Bit());
-        }
         return U_ITEM_NOT_FOUND;
     }
 
@@ -59,7 +58,7 @@ USTATUS FfsDumper::recursiveDump(const UModelIndex & index, const UString & path
         }
 
         if (currentPath != path) {
-            counterHeader = counterBody = counterUncData = counterRaw = counterInfo = 0;
+            counterHeader = counterBody = counterRaw = counterInfo = 0;
             currentPath = path;
         }
 
@@ -68,7 +67,7 @@ USTATUS FfsDumper::recursiveDump(const UModelIndex & index, const UString & path
             && (sectionType == IgnoreSectionType || model->subtype(index) == sectionType)) {
 
             if ((dumpMode == DUMP_ALL || dumpMode == DUMP_CURRENT || dumpMode == DUMP_HEADER)
-                && !model->hasEmptyHeader(index)) {
+                && !model->header(index).isEmpty()) {
                 fileList.insert(index);
 
                 UString filename;
@@ -91,7 +90,7 @@ USTATUS FfsDumper::recursiveDump(const UModelIndex & index, const UString & path
             }
 
             if ((dumpMode == DUMP_ALL || dumpMode == DUMP_CURRENT || dumpMode == DUMP_BODY)
-                && !model->hasEmptyBody(index)) {
+                && !model->body(index).isEmpty()) {
                 fileList.insert(index);
                 UString filename;
                 if (counterBody == 0)
@@ -112,28 +111,6 @@ USTATUS FfsDumper::recursiveDump(const UModelIndex & index, const UString & path
                 dumped = true;
             }
 
-            if ((dumpMode == DUMP_ALL || dumpMode == DUMP_CURRENT || dumpMode == DUMP_UNC_DATA)
-                && !model->hasEmptyUncompressedData(index)) {
-                fileList.insert(index);
-                UString filename;
-                if (counterUncData == 0)
-                    filename = usprintf("%s/unc_data.bin", path.toLocal8Bit());
-                else
-                    filename = usprintf("%s/unc_data_%d.bin", path.toLocal8Bit(), counterUncData);
-                counterUncData++;
-
-                std::ofstream file(filename.toLocal8Bit(), std::ofstream::binary);
-                if (!file) {
-                    printf("Cannot open uncompressed data \"%s\".\n", (const char*)filename.toLocal8Bit());
-                    return U_FILE_OPEN;
-                }
-
-                const UByteArray &data = model->uncompressedData(index);
-                file.write(data.constData(), data.size());
-
-                dumped = true;
-            }
-            
             if (dumpMode == DUMP_FILE) {
                 UModelIndex fileIndex = index;
                 if (model->type(fileIndex) != Types::File) {
@@ -222,7 +199,7 @@ USTATUS FfsDumper::recursiveDump(const UModelIndex & index, const UString & path
         }
         result = recursiveDump(childIndex, childPath, dumpMode, sectionType, guid);
         if (result) {
-            printf("Error %zu returned from recursiveDump (child directory \"%s\").\n", result, (const char*)childPath.toLocal8Bit());
+            printf("Error %lu returned from recursiveDump (child directory \"%s\").\n", result, (const char*)childPath.toLocal8Bit());
             return result;
         }
     }

UEFIExtract/ffsdumper.h

@@ -30,7 +30,6 @@ public:
         DUMP_CURRENT,
         DUMP_ALL,
         DUMP_BODY,
-        DUMP_UNC_DATA,
         DUMP_HEADER,
         DUMP_INFO,
         DUMP_FILE
@@ -39,7 +38,7 @@ public:
     static const UINT8 IgnoreSectionType = 0xFF;
 
     explicit FfsDumper(TreeModel * treeModel) : model(treeModel), dumped(false), 
-        counterHeader(0), counterBody(0), counterUncData(0), counterRaw(0), counterInfo(0) {}
+        counterHeader(0), counterBody(0), counterRaw(0), counterInfo(0) {}
     ~FfsDumper() {};
 
     USTATUS dump(const UModelIndex & root, const UString & path, const DumpMode dumpMode = DUMP_CURRENT, const UINT8 sectionType = IgnoreSectionType, const UString & guid = UString());
@@ -49,7 +48,7 @@ private:
     TreeModel* model;
     UString currentPath;
     bool dumped;
-    int counterHeader, counterBody, counterUncData, counterRaw, counterInfo;
+    int counterHeader, counterBody, counterRaw, counterInfo;
     std::set<UModelIndex> fileList;
 };
 #endif // FFSDUMPER_H

UEFIExtract/uefidump.cpp

@@ -85,59 +85,67 @@ USTATUS UEFIDumper::recursiveDump(const UModelIndex & index)
     if (!index.isValid())
         return U_INVALID_PARAMETER;
 
-    // Construct file name
+    //UByteArray itemHeader = model.header(index);
-    UString orgName = uniqueItemName(index);
+    //UByteArray fileHeader = model.header(model.findParentOfType(index, Types::File));
-    UString name = orgName;
+
-    bool nameFound = false;
+    //if (guid.length() == 0 ||
-    for (int i = 1; i < 1000; ++i) {
+    //    (itemHeader.size() >= sizeof (EFI_GUID) && guidToUString(*(const EFI_GUID*)itemHeader.constData()) == guid) ||
-        if (!isExistOnFs(name + UString("_info.txt"))) {
+    //    (fileHeader.size() >= sizeof(EFI_GUID) && guidToUString(*(const EFI_GUID*)fileHeader.constData()) == guid)) {
-            nameFound = true;
+
-            break;
+        // Construct file name
+        UString orgName = uniqueItemName(index);
+        UString name = orgName;
+        bool nameFound = false;
+        for (int i = 1; i < 1000; ++i) {
+            if (!isExistOnFs(name + UString("_info.txt"))) {
+                nameFound = true;
+                break;
+            }
+            name = orgName + UString("_") + usprintf("%03d", i);
         }
-        name = orgName + UString("_") + usprintf("%03d", i);
+
-    }
+        if (!nameFound) {
-    
+            printf("Cannot find unique name for \"%s\".\n", (const char*)orgName.toLocal8Bit());
-    if (!nameFound) {
+            return U_INVALID_PARAMETER; //TODO: replace with proper errorCode
-        printf("Cannot find unique name for \"%s\".\n", (const char*)orgName.toLocal8Bit());
-        return U_INVALID_PARAMETER; //TODO: replace with proper errorCode
-    }
-    
-    // Add header and body only for leaf sections
-    if (model.rowCount(index) == 0) {
-        // Header
-        UByteArray data = model.header(index);
-        if (!data.isEmpty()) {
-            std::ofstream file;
-            UString str = name + UString("_header.bin");
-            file.open(str.toLocal8Bit(), std::ios::out | std::ios::binary);
-            file.write(data.constData(), data.size());
-            file.close();
         }
-        
+
-        // Body
+        // Add header and body only for leaf sections
-        data = model.body(index);
+        if (model.rowCount(index) == 0) {
-        if (!data.isEmpty()) {
+            // Header
-            std::ofstream file;
+            UByteArray data = model.header(index);
-            UString str = name + UString("_body.bin");
+            if (!data.isEmpty()) {
-            file.open(str.toLocal8Bit(), std::ios::out | std::ios::binary);
+                std::ofstream file;
-            file.write(data.constData(), data.size());
+                UString str = name + UString("_header.bin");
-            file.close();
+                file.open(str.toLocal8Bit(), std::ios::out | std::ios::binary);
+                file.write(data.constData(), data.size());
+                file.close();
+            }
+
+            // Body
+            data = model.body(index);
+            if (!data.isEmpty()) {
+                std::ofstream file;
+                UString str = name + UString("_body.bin");
+                file.open(str.toLocal8Bit(), std::ios::out | std::ios::binary);
+                file.write(data.constData(), data.size());
+                file.close();
+            }
         }
-    }
+        // Info
-    // Info
+        UString info = "Type: " + itemTypeToUString(model.type(index)) + "\n" +
-    UString info = "Type: " + itemTypeToUString(model.type(index)) + "\n" +
+            "Subtype: " + itemSubtypeToUString(model.type(index), model.subtype(index)) + "\n";
-    "Subtype: " + itemSubtypeToUString(model.type(index), model.subtype(index)) + "\n";
+        if (model.text(index).length() > 0)
-    if (model.text(index).length() > 0)
+            info += "Text: " + model.text(index) + "\n";
-        info += "Text: " + model.text(index) + "\n";
+        info += model.info(index) + "\n";
-    info += model.info(index) + "\n";
+
-    
+        std::ofstream file;
-    std::ofstream file;
+        UString str = name + UString("_info.txt");
-    UString str = name + UString("_info.txt");
+        file.open(str.toLocal8Bit(), std::ios::out);
-    file.open(str.toLocal8Bit(), std::ios::out);
+        file.write(info.toLocal8Bit(), info.length());
-    file.write(info.toLocal8Bit(), info.length());
+        file.close();
-    file.close();
+
-    
+        dumped = true;
-    dumped = true;
+    //}
     
     // Process child items
     USTATUS result;

UEFIExtract/uefiextract.manifest

@@ -1,8 +0,0 @@
-<assembly xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <asmv1:assemblyIdentity type='win32' name='me.coderush.UEFIExtract' version='1.0.0.0' />
-    <asmv3:application>
-        <asmv3:windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
-            <ws2:longPathAware>true</ws2:longPathAware>
-        </asmv3:windowsSettings>
-    </asmv3:application>
-</assembly>

UEFIExtract/uefiextract_main.cpp

@@ -30,97 +30,110 @@ enum ReadType {
     READ_SECTION
 };
 
-void print_usage()
-{
-    std::cout << "UEFIExtract " PROGRAM_VERSION << std::endl
-        << "Usage: UEFIExtract {-h | --help | -v | --version} - show help and/or version information." << std::endl
-        << "       UEFIExtract imagefile        - generate report and GUID database, then dump only leaf tree items into .dump folder." << std::endl
-        << "       UEFIExtract imagefile all    - generate report and GUID database, then dump all tree items into .dump folder." << std::endl
-        << "       UEFIExtract imagefile unpack - generate report, then dump all tree items into a single .dump folder (legacy UEFIDump compatibility mode)." << std::endl
-        << "       UEFIExtract imagefile dump   - only generate dump, no report or GUID database needed." << std::endl
-        << "       UEFIExtract imagefile report - only generate report, no dump or GUID database needed." << std::endl
-        << "       UEFIExtract imagefile guids  - only generate GUID database, no dump or report needed." << std::endl
-        << "       UEFIExtract imagefile GUID_1 ... [ -o FILE_1 ... ] [ -m MODE_1 ... ] [ -t TYPE_1 ... ] -" << std::endl
-        << "         Dump only FFS file(s) with specific GUID(s), without report or GUID database." << std::endl
-        << "         Type is section type or FF to ignore. Mode is one of: all, body, unc_data, header, info, file." << std::endl
-        << "         Return value is a bit mask where 0 at position N means that file with GUID_N was found and unpacked, 1 otherwise." << std::endl;
-}
-
 int main(int argc, char *argv[])
 {
     initGuidDatabase("guids.csv");
 
-    if (argc <= 1) {
+    if (argc > 1) {
-        print_usage();
+        // Check that input file exists
-        return 1;
+        USTATUS result;
-    }
+        UByteArray buffer;
-    
+        UString path = getAbsPath(argv[1]);
-    // Help and version
+        result = readFileIntoBuffer(path, buffer);
-    if (argc == 2) {
+        if (result)
-        UString arg = UString(argv[1]);
+            return result;
-        if (arg == UString("-h") || arg == UString("--help")) {
+
-            print_usage();
+        // Hack to support legacy UEFIDump mode.
-            return 0;
+        if (argc == 3 && !std::strcmp(argv[2], "unpack")) {
+            UEFIDumper uefidumper;
+            return (uefidumper.dump(buffer, UString(argv[1])) != U_SUCCESS);
         }
-        else if (arg == UString("-v") || arg == UString("--version")) {
+
-            std::cout << PROGRAM_VERSION << std::endl;
+        // Create model and ffsParser
-            return 0;
+        TreeModel model;
+        FfsParser ffsParser(&model);
+        // Parse input buffer
+        result = ffsParser.parse(buffer);
+        if (result)
+            return result;
+
+        ffsParser.outputInfo();
+
+        // Create ffsDumper
+        FfsDumper ffsDumper(&model);
+
+        // Dump only leaf elements, no report
+        if (argc == 3 && !std::strcmp(argv[2], "dump")) {
+            return (ffsDumper.dump(model.index(0, 0), path + UString(".dump")) != U_SUCCESS);
         }
-    }
+        else if (argc > 3 ||
-    
+            (argc == 3 && std::strcmp(argv[2], "all") != 0 && std::strcmp(argv[2], "report") != 0)) { // Dump specific files, without report
-    // Check that input file exists
+            std::vector<UString> inputs, outputs;
-    USTATUS result;
+            std::vector<FfsDumper::DumpMode> modes;
-    UByteArray buffer;
+            std::vector<UINT8> sectionTypes;
-    UString path = getAbsPath(argv[1]);
+            ReadType readType = READ_INPUT;
-    if (false == readFileIntoBuffer(path, buffer))
+            for (int i = 2; i < argc; i++) {
-        return U_FILE_OPEN;
+                const char *arg = argv[i];
-    
+                if (!std::strcmp(arg, "-i")) {
-    // Hack to support legacy UEFIDump mode
+                    readType = READ_INPUT;
-    if (argc == 3 && !std::strcmp(argv[2], "unpack")) {
+                    continue;
-        UEFIDumper uefidumper;
+                } else if (!std::strcmp(arg, "-o")) {
-        return (uefidumper.dump(buffer, UString(argv[1])) != U_SUCCESS);
+                    readType = READ_OUTPUT;
-    }
+                    continue;
-    
+                } else if (!std::strcmp(arg, "-m")) {
-    // Create model and ffsParser
+                    readType = READ_MODE;
-    TreeModel model;
+                    continue;
-    FfsParser ffsParser(&model);
+                } else if (!std::strcmp(arg, "-t")) {
-    // Parse input buffer
+                    readType = READ_SECTION;
-    result = ffsParser.parse(buffer);
+                    continue;
-    if (result)
+                }
-        return (int)result;
+
-    
+                if (readType == READ_INPUT) {
-    ffsParser.outputInfo();
+                    inputs.push_back(arg);
-    
+                } else if (readType == READ_OUTPUT) {
-    // Create ffsDumper
+                    outputs.push_back(getAbsPath(arg));
-    FfsDumper ffsDumper(&model);
+                } else if (readType == READ_MODE) {
-    
+                    if (!std::strcmp(arg, "all"))
-    // Dump only leaf elements, no report or GUID database
+                        modes.push_back(FfsDumper::DUMP_ALL);
-    if (argc == 3 && !std::strcmp(argv[2], "dump")) {
+                    else if (!std::strcmp(arg, "body"))
-        return (ffsDumper.dump(model.index(0, 0), path + UString(".dump")) != U_SUCCESS);
+                        modes.push_back(FfsDumper::DUMP_BODY);
-    }
+                    else if (!std::strcmp(arg, "header"))
-    // Dump named GUIDs found in the image, no dump or report
+                        modes.push_back(FfsDumper::DUMP_HEADER);
-    else if (argc == 3 && !std::strcmp(argv[2], "guids")) {
+                    else if (!std::strcmp(arg, "info"))
-        GuidDatabase db = guidDatabaseFromTreeRecursive(&model, model.index(0, 0));
+                        modes.push_back(FfsDumper::DUMP_INFO);
-        if (!db.empty()) {
+                    else if (!std::strcmp(arg, "file"))
-            return (int)guidDatabaseExportToFile(path + UString(".guids.csv"), db);
+                        modes.push_back(FfsDumper::DUMP_FILE);
+                    else
+                        return U_INVALID_PARAMETER;
+                } else if (readType == READ_SECTION) {
+                    char *converted = const_cast<char *>(arg);
+                    UINT8 sectionType = (UINT8)std::strtol(arg, &converted, 16);
+                    if (converted == arg)
+                        return U_INVALID_PARAMETER;
+                    sectionTypes.push_back(sectionType);
+                }
+            }
+            if (inputs.empty() || (!outputs.empty() && inputs.size() != outputs.size()) ||
+                (!modes.empty() && inputs.size() != modes.size()) ||
+                (!sectionTypes.empty() && inputs.size() != sectionTypes.size()))
+                return U_INVALID_PARAMETER;
+
+            USTATUS lastError = U_SUCCESS;
+            for (size_t i = 0; i < inputs.size(); i++) {
+                UString outPath = outputs.empty() ? path + UString(".dump") : outputs[i];
+                FfsDumper::DumpMode mode = modes.empty() ? FfsDumper::DUMP_ALL : modes[i];
+                UINT8 type = sectionTypes.empty() ? FfsDumper::IgnoreSectionType : sectionTypes[i];
+                result = ffsDumper.dump(model.index(0, 0), outPath, mode, type, inputs[i]);
+                if (result) {
+                    std::cout << "Guid " << inputs[i].toLocal8Bit() << " failed with " << result << " code!" << std::endl;
+                    lastError = result;
+                }
+            }
+
+            return lastError;
         }
-    }
+
-    // Generate report, no dump or GUID database
+        // Create ffsReport
-    else if (argc == 3 && !std::strcmp(argv[2], "report")) {
-        FfsReport ffsReport(&model);
-        std::vector<UString> report = ffsReport.generate();
-        if (report.size()) {
-            std::ofstream file;
-            file.open((path + UString(".report.txt")).toLocal8Bit());
-            for (size_t i = 0; i < report.size(); i++)
-                file << report[i].toLocal8Bit() << '\n';
-            return 0;
-        }
-        return 1;
-    }
-    // Either default or all mode
-    else if (argc == 2 || (argc == 3 && !std::strcmp(argv[2], "all"))) {
-        // Generate report
         FfsReport ffsReport(&model);
         std::vector<UString> report = ffsReport.generate();
         if (report.size()) {
@@ -129,91 +142,28 @@ int main(int argc, char *argv[])
             for (size_t i = 0; i < report.size(); i++)
                 file << report[i].toLocal8Bit() << '\n';
         }
-        
+
-        // Create GUID database
+        // Dump all non-leaf elements, with report, default
-        GuidDatabase db = guidDatabaseFromTreeRecursive(&model, model.index(0, 0));
-        if (!db.empty()) {
-            guidDatabaseExportToFile(path + UString(".guids.csv"), db);
-        }
-        
-        // Dump all non-leaf elements, with report and GUID database, default
         if (argc == 2) {
             return (ffsDumper.dump(model.index(0, 0), path + UString(".dump")) != U_SUCCESS);
         }
-        else if (argc == 3 && !std::strcmp(argv[2], "all")) { // Dump every element with report and GUID database
+        else if (argc == 3 && !std::strcmp(argv[2], "all")) { // Dump every element with report
             return (ffsDumper.dump(model.index(0, 0), path + UString(".dump"), FfsDumper::DUMP_ALL) != U_SUCCESS);
         }
-    }
+        else if (argc == 3 && !std::strcmp(argv[2], "report")) { // Skip dumping
-    // Dump specific files, without report or GUID database
+            return 0;
-    else {
-        std::vector<UString> inputs, outputs;
-        std::vector<FfsDumper::DumpMode> modes;
-        std::vector<UINT8> sectionTypes;
-        ReadType readType = READ_INPUT;
-        for (int i = 2; i < argc; i++) {
-            const char *arg = argv[i];
-            if (!std::strcmp(arg, "-i")) {
-                readType = READ_INPUT;
-                continue;
-            } else if (!std::strcmp(arg, "-o")) {
-                readType = READ_OUTPUT;
-                continue;
-            } else if (!std::strcmp(arg, "-m")) {
-                readType = READ_MODE;
-                continue;
-            } else if (!std::strcmp(arg, "-t")) {
-                readType = READ_SECTION;
-                continue;
-            }
-            
-            if (readType == READ_INPUT) {
-                inputs.push_back(arg);
-            } else if (readType == READ_OUTPUT) {
-                outputs.push_back(getAbsPath(arg));
-            } else if (readType == READ_MODE) {
-                if (!std::strcmp(arg, "all"))
-                    modes.push_back(FfsDumper::DUMP_ALL);
-                else if (!std::strcmp(arg, "body"))
-                    modes.push_back(FfsDumper::DUMP_BODY);
-                else if (!std::strcmp(arg, "unc_data"))
-                    modes.push_back(FfsDumper::DUMP_UNC_DATA);
-                else if (!std::strcmp(arg, "header"))
-                    modes.push_back(FfsDumper::DUMP_HEADER);
-                else if (!std::strcmp(arg, "info"))
-                    modes.push_back(FfsDumper::DUMP_INFO);
-                else if (!std::strcmp(arg, "file"))
-                    modes.push_back(FfsDumper::DUMP_FILE);
-                else
-                    return U_INVALID_PARAMETER;
-            } else if (readType == READ_SECTION) {
-                char *converted = const_cast<char *>(arg);
-                UINT8 sectionType = (UINT8)std::strtol(arg, &converted, 16);
-                if (converted == arg)
-                    return U_INVALID_PARAMETER;
-                sectionTypes.push_back(sectionType);
-            }
         }
-        if (inputs.empty() || (!outputs.empty() && inputs.size() != outputs.size()) ||
-            (!modes.empty() && inputs.size() != modes.size()) ||
-            (!sectionTypes.empty() && inputs.size() != sectionTypes.size()))
-            return U_INVALID_PARAMETER;
-        
-        USTATUS lastError = U_SUCCESS;
-        for (size_t i = 0; i < inputs.size(); i++) {
-            UString outPath = outputs.empty() ? path + UString(".dump") : outputs[i];
-            FfsDumper::DumpMode mode = modes.empty() ? FfsDumper::DUMP_ALL : modes[i];
-            UINT8 type = sectionTypes.empty() ? FfsDumper::IgnoreSectionType : sectionTypes[i];
-            result = ffsDumper.dump(model.index(0, 0), outPath, mode, type, inputs[i]);
-            if (result) {
-                std::cout << "Guid " << inputs[i].toLocal8Bit() << " failed with " << result << " code!" << std::endl;
-                lastError = result;
-            }
-        }
-        
-        return (int)lastError;
     }
-    
     // If parameters are different, show version and usage information
-    print_usage();
+    std::cout << "UEFIExtract " PROGRAM_VERSION << std::endl << std::endl
+        << "Usage: UEFIExtract imagefile        - generate report and dump only leaf tree items into .dump folder." << std::endl
+        << "       UEFIExtract imagefile all    - generate report and dump all tree items." << std::endl
+        << "       UEFIExtract imagefile unpack - generate report and dump all tree items in one dir." << std::endl
+        << "       UEFIExtract imagefile dump   - only generate dump, no report needed." << std::endl
+        << "       UEFIExtract imagefile report - only generate report, no dump needed." << std::endl
+        << "       UEFIExtract imagefile GUID_1 ... [ -o FILE_1 ... ] [ -m MODE_1 ... ] [ -t TYPE_1 ... ] -" << std::endl
+        << "         Dump only FFS file(s) with specific GUID(s), without report." << std::endl
+        << "         Type is section type or FF to ignore. Mode is one of: all, body, header, info, file." << std::endl
+        << "Return value is a bit mask where 0 at position N means that file with GUID_N was found and unpacked, 1 otherwise." << std::endl;
     return 1;
 }

UEFIFind/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.22)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0 FATAL_ERROR)
 
 PROJECT(UEFIFind)
 
@@ -11,13 +11,14 @@ SET(PROJECT_SOURCES
  uefifind.cpp
  ../common/guiddatabase.cpp
  ../common/types.cpp
- ../common/filesystem.cpp
  ../common/descriptor.cpp
  ../common/ffs.cpp
  ../common/nvram.cpp
  ../common/nvramparser.cpp
  ../common/ffsparser.cpp
  ../common/fitparser.cpp
+ ../common/ffsreport.cpp
+ ../common/ffsutils.cpp
  ../common/peimage.cpp
  ../common/treeitem.cpp
  ../common/treemodel.cpp
@@ -31,18 +32,6 @@ SET(PROJECT_SOURCES
  ../common/ustring.cpp
  ../common/bstrlib/bstrlib.c
  ../common/bstrlib/bstrwrap.cpp
- ../common/generated/ami_nvar.cpp
- ../common/generated/apple_sysf.cpp
- ../common/generated/dell_dvar.cpp
- ../common/generated/edk2_vss.cpp
- ../common/generated/edk2_vss2.cpp
- ../common/generated/edk2_ftw.cpp
- ../common/generated/insyde_fdc.cpp
- ../common/generated/insyde_fdm.cpp
- ../common/generated/ms_slic_marker.cpp
- ../common/generated/ms_slic_pubkey.cpp
- ../common/generated/phoenix_flm.cpp
- ../common/generated/phoenix_evsa.cpp
  ../common/generated/intel_acbp_v1.cpp
  ../common/generated/intel_acbp_v2.cpp
  ../common/generated/intel_keym_v1.cpp
@@ -70,13 +59,7 @@ SET(PROJECT_SOURCES
  ../common/zlib/zutil.c
 )
 
-ADD_EXECUTABLE(UEFIFind ${PROJECT_SOURCES} uefifind.manifest)
+ADD_DEFINITIONS(-DU_ENABLE_NVRAM_PARSING_SUPPORT -DU_ENABLE_FIT_PARSING_SUPPORT -DU_ENABLE_GUID_DATABASE_SUPPORT)
 
-IF(UNIX)
+ADD_EXECUTABLE(UEFIFind ${PROJECT_SOURCES})
- SET_TARGET_PROPERTIES(UEFIFind PROPERTIES OUTPUT_NAME uefifind)
-ENDIF()
 
-INSTALL(
- TARGETS UEFIFind
- RUNTIME DESTINATION bin
-)

UEFIFind/uefifind.cpp

@@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 */
 
 #include "uefifind.h"
-#include <fstream>
+#include "../common/ffsutils.h"
-#include <set>
 
+#include <fstream>
 
 UEFIFind::UEFIFind()
 {
@@ -32,11 +32,13 @@ UEFIFind::~UEFIFind()
 
 USTATUS UEFIFind::init(const UString & path)
 {
+    USTATUS result;
     UByteArray buffer;
-    if (false == readFileIntoBuffer(path, buffer))
+    result = readFileIntoBuffer(path, buffer);
-        return U_FILE_OPEN;
+    if (result)
+        return result;
 
-    USTATUS result = ffsParser->parse(buffer);
+    result = ffsParser->parse(buffer);
     if (result)
         return result;
 
@@ -44,74 +46,6 @@ USTATUS UEFIFind::init(const UString & path)
     return U_SUCCESS;
 }
 
-USTATUS UEFIFind::findFileRecursive(const UModelIndex index, const UString & hexPattern, const UINT8 mode, std::set<std::pair<UModelIndex, UModelIndex> > & files)
-{
-    if (!index.isValid())
-        return U_SUCCESS;
-
-    if (hexPattern.isEmpty())
-        return U_INVALID_PARAMETER;
-
-    const char *hexPatternRaw = hexPattern.toLocal8Bit();
-    std::vector<UINT8> pattern, patternMask;
-    if (!makePattern(hexPatternRaw, pattern, patternMask))
-        return U_INVALID_PARAMETER;
-
-    // Check for "all substrings" pattern
-    size_t count = 0;
-    for (size_t i = 0; i < patternMask.size(); i++)
-        if (patternMask[i] == 0)
-            count++;
-    if (count == patternMask.size())
-        return U_SUCCESS;
-
-    bool hasChildren = (model->rowCount(index) > 0);
-    for (int i = 0; i < model->rowCount(index); i++) {
-        findFileRecursive(index.model()->index(i, index.column(), index), hexPattern, mode, files);
-    }
-
-    // TODO: handle a case where an item has both compressed and uncompressed bodies
-    UByteArray data;
-    if (hasChildren) {
-        if (mode == SEARCH_MODE_HEADER)
-            data = model->header(index);
-        else if (mode == SEARCH_MODE_ALL)
-            data = model->header(index) + model->body(index);
-    }
-    else {
-        if (mode == SEARCH_MODE_HEADER)
-            data = model->header(index);
-        else if (mode == SEARCH_MODE_BODY)
-            data = model->body(index);
-        else
-            data = model->header(index) + model->body(index);
-    }
-
-    const UINT8 *rawData = reinterpret_cast<const UINT8 *>(data.constData());
-    INTN offset = findPattern(pattern.data(), patternMask.data(), pattern.size(), rawData, data.size(), 0);
-
-    // For patterns that cross header|body boundary, skip patterns entirely located in body, since
-    // children search above has already found them.
-    if (hasChildren && mode == SEARCH_MODE_ALL && offset >= model->header(index).size()) {
-        offset = -1;
-    }
-
-    if (offset >= 0) {
-        if (model->type(index) != Types::File) {
-            UModelIndex parentFile = model->findParentOfType(index, Types::File);
-            if (model->type(index) == Types::Section && model->subtype(index) == EFI_SECTION_FREEFORM_SUBTYPE_GUID)
-                files.insert(std::pair<UModelIndex, UModelIndex>(parentFile, index));
-            else
-                files.insert(std::pair<UModelIndex, UModelIndex>(parentFile, UModelIndex()));
-        }
-        else {
-            files.insert(std::pair<UModelIndex, UModelIndex>(index, UModelIndex()));
-        }
-    }
-
-    return U_SUCCESS;
-}
-
 USTATUS UEFIFind::find(const UINT8 mode, const bool count, const UString & hexPattern, UString & result)
 {
     UModelIndex root = model->index(0, 0);
@@ -119,7 +53,7 @@ USTATUS UEFIFind::find(const UINT8 mode, const bool count, const UString & hexPa
 
     result.clear();
 
-    USTATUS returned = findFileRecursive(root, hexPattern, mode, files);
+    USTATUS returned = FfsUtils::findFileRecursive(model, root, hexPattern, mode, files);
     if (returned)
         return returned;
     

UEFIFind/uefifind.h

@@ -34,8 +34,6 @@ public:
     USTATUS find(const UINT8 mode, const bool count, const UString & hexPattern, UString & result);
 
 private:
-    USTATUS findFileRecursive(const UModelIndex index, const UString & hexPattern, const UINT8 mode, std::set<std::pair<UModelIndex, UModelIndex> > & files);
-
     FfsParser* ffsParser;
     TreeModel* model;
     bool initDone;

UEFIFind/uefifind.manifest

@@ -1,8 +0,0 @@
-<assembly xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <asmv1:assemblyIdentity type='win32' name='me.coderush.UEFIFind' version='1.0.0.0' />
-    <asmv3:application>
-        <asmv3:windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
-            <ws2:longPathAware>true</ws2:longPathAware>
-        </asmv3:windowsSettings>
-    </asmv3:application>
-</assembly>

UEFIFind/uefifind_main.cpp

@@ -19,35 +19,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "../common/guiddatabase.h"
 #include "uefifind.h"
 
-void print_usage()
-{
-    std::cout << "UEFIFind " PROGRAM_VERSION << std::endl <<
-        "Usage: UEFIFind {-h | --help | -v | -version}" << std::endl <<
-        "       UEFIFind imagefile {header | body | all} {list | count} pattern" << std::endl <<
-        "       UEFIFind imagefile file patternsfile" << std::endl;
-}
-
 int main(int argc, char *argv[])
 {
     UEFIFind w;
     USTATUS result;
 
-    if (argc == 1) {
+    initGuidDatabase("guids.csv");
-        print_usage();
+
-        return U_SUCCESS;
+    if (argc == 5) {
-    }
-    else if (argc == 2) {
-        UString arg = argv[1];
-        if (arg == UString("-h") || arg == UString("--help")) {
-            print_usage();
-            return U_SUCCESS;
-        }
-        else if (arg == UString("-v") || arg == UString("--version")) {
-            std::cout << PROGRAM_VERSION << std::endl;
-            return U_SUCCESS;
-        }
-    }
-    else if (argc == 5) {
         UString inputArg = argv[1];
         UString modeArg = argv[2];
         UString subModeArg = argv[3];
@@ -186,7 +165,10 @@ int main(int argc, char *argv[])
 
         return U_SUCCESS;
     }
-
+    else {
-    print_usage();
+        std::cout << "UEFIFind " PROGRAM_VERSION << std::endl << std::endl <<
-    return U_INVALID_PARAMETER;
+            "Usage: UEFIFind imagefile {header | body | all} {list | count} pattern" << std::endl <<
+            "    or UEFIFind imagefile file patternsfile" << std::endl;
+        return U_INVALID_PARAMETER;
+    }
 }

UEFITool/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.22)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.16)
 
 PROJECT(UEFITool LANGUAGES C CXX)
 
@@ -7,6 +7,7 @@ SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)
 
 FIND_PACKAGE(Qt6 REQUIRED COMPONENTS Widgets)
+QT_STANDARD_PROJECT_SETUP()
 
 SET(PROJECT_FORMS
  uefitool.ui
@@ -32,74 +33,66 @@ SET(PROJECT_SOURCES
  uefitool.cpp
  searchdialog.cpp
  hexviewdialog.cpp
- hexlineedit.cpp
+ guidlineedit.cpp
  ffsfinder.cpp
  hexspinbox.cpp
- ../common/fitparser.cpp
+ qhexedit2/qhexedit.cpp
- ../common/guiddatabase.cpp
+ qhexedit2/chunks.cpp
- ../common/nvram.cpp
+ qhexedit2/commands.cpp
- ../common/nvramparser.cpp
+ ../common/fitparser.cpp 
- ../common/meparser.cpp
+ ../common/guiddatabase.cpp 
- ../common/ffsops.cpp
+ ../common/nvram.cpp 
- ../common/types.cpp
+ ../common/nvramparser.cpp 
- ../common/descriptor.cpp
+ ../common/meparser.cpp 
- ../common/ffs.cpp
+ ../common/ffsops.cpp 
- ../common/peimage.cpp
+ ../common/types.cpp 
- ../common/utility.cpp
+ ../common/descriptor.cpp 
- ../common/ffsbuilder.cpp
+ ../common/ffs.cpp 
- ../common/ffsparser.cpp
+ ../common/peimage.cpp 
- ../common/ffsreport.cpp
+ ../common/utility.cpp 
- ../common/treeitem.cpp
+ ../common/ffsbuilder.cpp 
- ../common/treemodel.cpp
+ ../common/ffsparser.cpp 
- ../common/LZMA/LzmaCompress.c
+ ../common/ffsreport.cpp 
- ../common/LZMA/LzmaDecompress.c
+ ../common/ffsutils.cpp 
- ../common/LZMA/SDK/C/CpuArch.c
+ ../common/treeitem.cpp 
- ../common/LZMA/SDK/C/Bra.c
+ ../common/treemodel.cpp 
- ../common/LZMA/SDK/C/Bra86.c
+ ../common/LZMA/LzmaCompress.c 
- ../common/LZMA/SDK/C/LzFind.c
+ ../common/LZMA/LzmaDecompress.c 
- ../common/LZMA/SDK/C/LzmaDec.c
+ ../common/LZMA/SDK/C/CpuArch.c 
- ../common/LZMA/SDK/C/LzmaEnc.c
+ ../common/LZMA/SDK/C/Bra.c 
- ../common/Tiano/EfiTianoDecompress.c
+ ../common/LZMA/SDK/C/Bra86.c 
- ../common/Tiano/EfiTianoCompress.c
+ ../common/LZMA/SDK/C/LzFind.c 
- ../common/Tiano/EfiTianoCompressLegacy.c
+ ../common/LZMA/SDK/C/LzmaDec.c 
- ../common/ustring.cpp
+ ../common/LZMA/SDK/C/LzmaEnc.c 
- ../common/digest/sha1.c
+ ../common/Tiano/EfiTianoDecompress.c 
- ../common/digest/sha256.c
+ ../common/Tiano/EfiTianoCompress.c 
- ../common/digest/sha512.c
+ ../common/Tiano/EfiTianoCompressLegacy.c 
- ../common/digest/sm3.c
+ ../common/ustring.cpp 
- ../common/generated/ami_nvar.cpp
+ ../common/digest/sha1.c 
- ../common/generated/apple_sysf.cpp
+ ../common/digest/sha256.c 
- ../common/generated/dell_dvar.cpp
+ ../common/digest/sha512.c 
- ../common/generated/edk2_vss.cpp
+ ../common/digest/sm3.c 
- ../common/generated/edk2_vss2.cpp
+ ../common/generated/intel_acbp_v1.cpp 
- ../common/generated/edk2_ftw.cpp
+ ../common/generated/intel_acbp_v2.cpp 
- ../common/generated/insyde_fdc.cpp
+ ../common/generated/intel_keym_v1.cpp 
- ../common/generated/insyde_fdm.cpp
+ ../common/generated/intel_keym_v2.cpp 
- ../common/generated/ms_slic_marker.cpp
+ ../common/generated/intel_acm.cpp 
- ../common/generated/ms_slic_pubkey.cpp
+ ../common/kaitai/kaitaistream.cpp 
- ../common/generated/phoenix_evsa.cpp
+ ../common/zlib/adler32.c 
- ../common/generated/phoenix_flm.cpp
+ ../common/zlib/compress.c 
- ../common/generated/intel_acbp_v1.cpp
+ ../common/zlib/crc32.c 
- ../common/generated/intel_acbp_v2.cpp
+ ../common/zlib/deflate.c 
- ../common/generated/intel_keym_v1.cpp
+ ../common/zlib/gzclose.c 
- ../common/generated/intel_keym_v2.cpp
+ ../common/zlib/gzlib.c 
- ../common/generated/intel_acm.cpp
+ ../common/zlib/gzread.c 
- ../common/kaitai/kaitaistream.cpp
+ ../common/zlib/gzwrite.c 
- ../common/zlib/adler32.c
+ ../common/zlib/inflate.c 
- ../common/zlib/compress.c
+ ../common/zlib/infback.c 
- ../common/zlib/crc32.c
+ ../common/zlib/inftrees.c 
- ../common/zlib/deflate.c
+ ../common/zlib/inffast.c 
- ../common/zlib/gzclose.c
+ ../common/zlib/trees.c 
- ../common/zlib/gzlib.c
+ ../common/zlib/uncompr.c 
- ../common/zlib/gzread.c
+ ../common/zlib/zutil.c 
- ../common/zlib/gzwrite.c
- ../common/zlib/inflate.c
- ../common/zlib/infback.c
- ../common/zlib/inftrees.c
- ../common/zlib/inffast.c
- ../common/zlib/trees.c
- ../common/zlib/uncompr.c
- ../common/zlib/zutil.c
 )
 
 QT_ADD_RESOURCES(PROJECT_SOURCES 
@@ -121,26 +114,8 @@ TARGET_INCLUDE_DIRECTORIES(UEFITool PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
 
 TARGET_LINK_LIBRARIES(UEFITool PRIVATE Qt6::Widgets)
 
-ADD_SUBDIRECTORY(QHexView)
-TARGET_LINK_LIBRARIES(UEFITool PRIVATE QHexView)
-
 SET_TARGET_PROPERTIES(UEFITool PROPERTIES
  WIN32_EXECUTABLE ON
  MACOSX_BUNDLE ON
  MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist"
- AUTOMOC ON
- AUTOUIC ON
 )
-
-IF(UNIX AND (NOT APPLE) AND (NOT CYGWIN))
- SET_TARGET_PROPERTIES(UEFITool PROPERTIES OUTPUT_NAME uefitool)
- INSTALL(FILES icons/uefitool_16x16.png   DESTINATION share/icons/hicolor/16x16/apps   RENAME uefitool.png)
- INSTALL(FILES icons/uefitool_32x32.png   DESTINATION share/icons/hicolor/32x32/apps   RENAME uefitool.png)
- INSTALL(FILES icons/uefitool_64x64.png   DESTINATION share/icons/hicolor/64x64/apps   RENAME uefitool.png)
- INSTALL(FILES icons/uefitool_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME uefitool.png)
- INSTALL(FILES icons/uefitool_256x256.png DESTINATION share/icons/hicolor/256x256/apps RENAME uefitool.png)
- INSTALL(FILES icons/uefitool_512x512.png DESTINATION share/icons/hicolor/512x512/apps RENAME uefitool.png)
- INSTALL(FILES uefitool.desktop DESTINATION share/applications)
-ENDIF()
-
-INSTALL(TARGETS UEFITool BUNDLE DESTINATION "/Applications" )

UEFITool/Info.plist

@@ -22,7 +22,7 @@
 	<key>CFBundleIconFile</key>
 	<string>uefitool</string>
 	<key>CFBundleIdentifier</key>
-	<string>me.coderush.UEFITool</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>

UEFITool/QHexView/CMakeLists.txt

@@ -1,91 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-
-project(QHexView)
-
-option(QHEXVIEW_BUILD_EXAMPLE "Build Example Application" OFF)
-option(QHEXVIEW_USE_QT5 "Enable Qt5 build" OFF)
-option(QHEXVIEW_ENABLE_DIALOGS "BuiltIn dialogs" OFF)
-
-if(QHEXVIEW_USE_QT5)
-    find_package(Qt5 REQUIRED COMPONENTS Widgets)
-else()
-    find_package(Qt6 COMPONENTS Widgets)
-
-    if(NOT Qt6_FOUND)
-        find_package(Qt5 REQUIRED COMPONENTS Widgets)
-    endif()
-endif()
-
-add_library(${PROJECT_NAME} STATIC)
-
-set_target_properties(${PROJECT_NAME}
-    PROPERTIES
-        CXX_STANDARD_REQUIRED YES
-        CXX_STANDARD 11
-        AUTOMOC ON
-)
-
-target_link_libraries(${PROJECT_NAME}
-    PUBLIC
-        Qt::Widgets
-)
-
-target_include_directories(${PROJECT_NAME}
-    PUBLIC
-        "${PROJECT_SOURCE_DIR}/include"
-)
-
-target_sources(${PROJECT_NAME}
-    PRIVATE 
-        include/QHexView/model/buffer/qdevicebuffer.h
-        include/QHexView/model/buffer/qhexbuffer.h
-        include/QHexView/model/buffer/qmappedfilebuffer.h
-        include/QHexView/model/buffer/qmemorybuffer.h
-        include/QHexView/model/buffer/qmemoryrefbuffer.h
-        include/QHexView/model/commands/hexcommand.h
-        include/QHexView/model/commands/insertcommand.h
-        include/QHexView/model/commands/removecommand.h
-        include/QHexView/model/commands/replacecommand.h
-        include/QHexView/model/commands/replacecommand.h
-        include/QHexView/model/qhexcursor.h
-        include/QHexView/model/qhexdelegate.h
-        include/QHexView/model/qhexdocument.h
-        include/QHexView/model/qhexmetadata.h
-        include/QHexView/model/qhexoptions.h
-        include/QHexView/model/qhexutils.h
-        include/QHexView/qhexview.h
-
-    PRIVATE 
-        src/model/commands/hexcommand.cpp
-        src/model/commands/insertcommand.cpp
-        src/model/commands/removecommand.cpp
-        src/model/commands/replacecommand.cpp
-        src/model/buffer/qdevicebuffer.cpp
-        src/model/buffer/qhexbuffer.cpp
-        src/model/buffer/qmemorybuffer.cpp
-        src/model/buffer/qmemoryrefbuffer.cpp
-        src/model/buffer/qmappedfilebuffer.cpp
-        src/model/qhexdelegate.cpp
-        src/model/qhexutils.cpp
-        src/model/qhexcursor.cpp
-        src/model/qhexmetadata.cpp
-        src/model/qhexdocument.cpp
-        src/qhexview.cpp
-)
-
-if(QHEXVIEW_ENABLE_DIALOGS)
-    target_sources(${PROJECT_NAME}
-        PRIVATE
-            include/QHexView/dialogs/hexfinddialog.h
-            src/dialogs/hexfinddialog.cpp
-    )
-
-    target_compile_definitions(${PROJECT_NAME} 
-        PUBLIC
-            QHEXVIEW_ENABLE_DIALOGS
-    )
-endif()
-
-if(QHEXVIEW_BUILD_EXAMPLE)
-    add_subdirectory(example)
-endif()

UEFITool/QHexView/LICENSE

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Dax89
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

UEFITool/QHexView/include/QHexView/dialogs/hexfinddialog.h

@@ -1,56 +0,0 @@
-#pragma once
-
-#include <QDialog>
-#include <QHexView/model/qhexutils.h>
-
-class QRegularExpressionValidator;
-class QDoubleValidator;
-class QIntValidator;
-class QHexView;
-
-class HexFindDialog: public QDialog {
-    Q_OBJECT
-
-public:
-    enum class Type { Find, Replace };
-
-public:
-    explicit HexFindDialog(HexFindDialog::Type type = Type::Find,
-                           QHexView* parent = nullptr);
-    QHexView* hexView() const;
-
-private Q_SLOTS:
-    void updateFindOptions(int);
-    void validateActions();
-    void replace();
-    void find();
-
-private:
-    bool prepareOptions(QString& q, QHexFindMode& mode, QHexFindDirection& fd);
-    bool validateIntRange(uint v) const;
-    void checkResult(const QString& q, qint64 offset, QHexFindDirection fd);
-    void prepareTextMode(QLayout* l);
-    void prepareHexMode(QLayout* l);
-    void prepareIntMode(QLayout* l);
-    void prepareFloatMode(QLayout* l);
-
-private:
-    QRegularExpressionValidator *m_hexvalidator, *m_hexpvalidator;
-    QDoubleValidator* m_dblvalidator;
-    QIntValidator* m_intvalidator;
-    int m_oldidxbits{-1}, m_oldidxendian{-1};
-    unsigned int m_findoptions{0};
-    qint64 m_startoffset{-1};
-    Type m_type;
-
-private:
-    static const QString BUTTONBOX;
-    static const QString CBFINDMODE;
-    static const QString LEFIND;
-    static const QString LEREPLACE;
-    static const QString HLAYOUT;
-    static const QString GBOPTIONS;
-    static const QString RBALL;
-    static const QString RBFORWARD;
-    static const QString RBBACKWARD;
-};

UEFITool/QHexView/include/QHexView/model/buffer/qdevicebuffer.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <QHexView/model/buffer/qhexbuffer.h>
-
-class QDeviceBuffer: public QHexBuffer {
-    Q_OBJECT
-
-public:
-    explicit QDeviceBuffer(QObject* parent = nullptr);
-    virtual ~QDeviceBuffer();
-    uchar at(qint64 idx) override;
-    qint64 length() const override;
-    void insert(qint64 offset, const QByteArray& data) override;
-    void replace(qint64 offset, const QByteArray& data) override;
-    void remove(qint64 offset, int length) override;
-    QByteArray read(qint64 offset, int length) override;
-    bool read(QIODevice* device) override;
-    void write(QIODevice* device) override;
-    qint64 indexOf(const QByteArray& ba, qint64 from) override;
-    qint64 lastIndexOf(const QByteArray& ba, qint64 from) override;
-
-protected:
-    QIODevice* m_device{nullptr};
-};

UEFITool/QHexView/include/QHexView/model/buffer/qhexbuffer.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <QIODevice>
-#include <QObject>
-
-class QHexBuffer: public QObject {
-    Q_OBJECT
-
-public:
-    explicit QHexBuffer(QObject* parent = nullptr);
-    bool isEmpty() const;
-
-public:
-    virtual uchar at(qint64 idx);
-    virtual bool accept(qint64 idx) const;
-    virtual void replace(qint64 offset, const QByteArray& data);
-    virtual void read(char* data, int size);
-    virtual void read(const QByteArray& ba);
-
-public:
-    virtual qint64 length() const = 0;
-    virtual void insert(qint64 offset, const QByteArray& data) = 0;
-    virtual void remove(qint64 offset, int length) = 0;
-    virtual QByteArray read(qint64 offset, int length) = 0;
-    virtual bool read(QIODevice* iodevice) = 0;
-    virtual void write(QIODevice* iodevice) = 0;
-    virtual qint64 indexOf(const QByteArray& ba, qint64 from) = 0;
-    virtual qint64 lastIndexOf(const QByteArray& ba, qint64 from) = 0;
-};

UEFITool/QHexView/include/QHexView/model/buffer/qmappedfilebuffer.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <QHexView/model/buffer/qdevicebuffer.h>
-
-class QMappedFileBuffer: public QDeviceBuffer {
-public:
-    explicit QMappedFileBuffer(QObject* parent = nullptr);
-    virtual ~QMappedFileBuffer();
-
-public:
-    QByteArray read(qint64 offset, int length) override;
-    bool read(QIODevice* iodevice) override;
-    void write(QIODevice* iodevice) override;
-
-private:
-    void remap();
-
-private:
-    uchar* m_mappeddata{nullptr};
-};

UEFITool/QHexView/include/QHexView/model/buffer/qmemorybuffer.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <QHexView/model/buffer/qhexbuffer.h>
-
-class QMemoryBuffer: public QHexBuffer {
-    Q_OBJECT
-
-public:
-    explicit QMemoryBuffer(QObject* parent = nullptr);
-    uchar at(qint64 idx) override;
-    qint64 length() const override;
-    void insert(qint64 offset, const QByteArray& data) override;
-    void remove(qint64 offset, int length) override;
-    QByteArray read(qint64 offset, int length) override;
-    bool read(QIODevice* device) override;
-    void write(QIODevice* device) override;
-    qint64 indexOf(const QByteArray& ba, qint64 from) override;
-    qint64 lastIndexOf(const QByteArray& ba, qint64 from) override;
-
-private:
-    QByteArray m_buffer;
-};

UEFITool/QHexView/include/QHexView/model/buffer/qmemoryrefbuffer.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <QHexView/model/buffer/qdevicebuffer.h>
-
-class QMemoryRefBuffer: public QDeviceBuffer {
-    Q_OBJECT
-
-public:
-    explicit QMemoryRefBuffer(QObject* parent = nullptr);
-    bool read(QIODevice* device) override;
-    void write(QIODevice* device) override;
-};

UEFITool/QHexView/include/QHexView/model/commands/hexcommand.h

@@ -1,19 +0,0 @@
-#pragma once
-
-#include <QHexView/model/buffer/qhexbuffer.h>
-#include <QUndoCommand>
-
-class QHexDocument;
-
-class HexCommand: public QUndoCommand {
-public:
-    HexCommand(QHexBuffer* buffer, QHexDocument* document,
-               QUndoCommand* parent = nullptr);
-
-protected:
-    QHexDocument* m_hexdocument;
-    QHexBuffer* m_buffer;
-    qint64 m_offset;
-    int m_length;
-    QByteArray m_data;
-};

UEFITool/QHexView/include/QHexView/model/commands/insertcommand.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include <QHexView/model/commands/hexcommand.h>
-
-class InsertCommand: public HexCommand {
-public:
-    InsertCommand(QHexBuffer* buffer, QHexDocument* document, qint64 offset,
-                  const QByteArray& data, QUndoCommand* parent = nullptr);
-    void undo() override;
-    void redo() override;
-};

UEFITool/QHexView/include/QHexView/model/commands/removecommand.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include <QHexView/model/commands/hexcommand.h>
-
-class RemoveCommand: public HexCommand {
-public:
-    RemoveCommand(QHexBuffer* buffer, QHexDocument* document, qint64 offset,
-                  int length, QUndoCommand* parent = nullptr);
-    void undo() override;
-    void redo() override;
-};

UEFITool/QHexView/include/QHexView/model/commands/replacecommand.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <QHexView/model/commands/hexcommand.h>
-
-class ReplaceCommand: public HexCommand {
-public:
-    ReplaceCommand(QHexBuffer* buffer, QHexDocument* document, qint64 offset,
-                   const QByteArray& data, QUndoCommand* parent = nullptr);
-    void undo() override;
-    void redo() override;
-
-private:
-    QByteArray m_olddata;
-};

UEFITool/QHexView/include/QHexView/model/qhexcursor.h

@@ -1,73 +0,0 @@
-#pragma once
-
-#include <QHexView/model/qhexoptions.h>
-#include <QHexView/model/qhexutils.h>
-#include <QObject>
-
-class QHexView;
-
-class QHexCursor: public QObject {
-    Q_OBJECT
-
-public:
-    enum class Mode { Overwrite, Insert };
-
-private:
-    explicit QHexCursor(const QHexOptions* options, QHexView* parent = nullptr);
-
-public:
-    QHexView* hexView() const;
-    Mode mode() const;
-    qint64 line() const;
-    qint64 column() const;
-    qint64 offset() const;
-    qint64 address() const;
-    quint64 lineAddress() const;
-    qint64 selectionStartOffset() const;
-    qint64 selectionEndOffset() const;
-    qint64 selectionLength() const;
-    QHexPosition position() const;
-    QHexPosition selectionStart() const;
-    QHexPosition selectionEnd() const;
-    QByteArray selectedBytes() const;
-    bool hasSelection() const;
-    bool isSelected(qint64 line, qint64 column) const;
-    void setMode(Mode m);
-    void move(qint64 offset);
-    void move(qint64 line, qint64 column);
-    void move(QHexPosition pos);
-    void select(qint64 offset);
-    void select(qint64 line, qint64 column);
-    void select(QHexPosition pos);
-    void selectSize(qint64 length);
-    qint64 replace(const QVariant& oldvalue, const QVariant& newvalue,
-                   qint64 offset, QHexFindMode mode = QHexFindMode::Text,
-                   unsigned int options = QHexFindOptions::None,
-                   QHexFindDirection fd = QHexFindDirection::Forward) const;
-    qint64 find(const QVariant& value, qint64 offset,
-                QHexFindMode mode = QHexFindMode::Text,
-                unsigned int options = QHexFindOptions::None,
-                QHexFindDirection fd = QHexFindDirection::Forward) const;
-    qint64 positionToOffset(QHexPosition pos) const;
-    QHexPosition offsetToPosition(qint64 offset) const;
-
-public Q_SLOTS:
-    void cut(bool hex = false);
-    void copy(bool hex = false) const;
-    void paste(bool hex = false);
-    void selectAll();
-    void removeSelection();
-    void clearSelection();
-    void switchMode();
-
-Q_SIGNALS:
-    void positionChanged();
-    void modeChanged();
-
-private:
-    const QHexOptions* m_options;
-    Mode m_mode{Mode::Overwrite};
-    QHexPosition m_position{}, m_selection{};
-
-    friend class QHexView;
-};

UEFITool/QHexView/include/QHexView/model/qhexdelegate.h

@@ -1,30 +0,0 @@
-#pragma once
-
-#include <QHexView/model/qhexutils.h>
-#include <QObject>
-#include <QTextCharFormat>
-
-class QHexView;
-
-class QHexDelegate: public QObject {
-    Q_OBJECT
-
-public:
-    explicit QHexDelegate(QObject* parent = nullptr);
-    virtual ~QHexDelegate() = default;
-    virtual QString addressHeader(const QHexView* hexview) const;
-    virtual QString hexHeader(const QHexView* hexview) const;
-    virtual QString asciiHeader(const QHexView* hexview) const;
-    virtual void renderAddress(quint64 address, QTextCharFormat& cf,
-                               const QHexView* hexview) const;
-    virtual void renderHeader(QTextBlockFormat& bf,
-                              const QHexView* hexview) const;
-    virtual void renderHeaderPart(const QString& s, QHexArea area,
-                                  QTextCharFormat& cf,
-                                  const QHexView* hexview) const;
-    virtual bool render(quint64 offset, quint8 b, QTextCharFormat& outcf,
-                        const QHexView* hexview) const;
-    virtual bool paintSeparator(QPainter* painter, QLineF line,
-                                const QHexView* hexview) const;
-    virtual void paint(QPainter* painter, const QHexView* hexview) const;
-};

UEFITool/QHexView/include/QHexView/model/qhexdocument.h

@@ -1,102 +0,0 @@
-#pragma once
-
-#include <QHexView/model/buffer/qhexbuffer.h>
-#include <QHexView/model/qhexmetadata.h>
-#include <QUndoStack>
-
-class QHexCursor;
-
-class QHexDocument: public QObject {
-    Q_OBJECT
-
-public:
-    enum class ChangeReason { Insert, Remove, Replace };
-    enum class FindDirection { Forward, Backward };
-    Q_ENUM(ChangeReason);
-    Q_ENUM(FindDirection);
-
-private:
-    explicit QHexDocument(QHexBuffer* buffer, QObject* parent = nullptr);
-    bool accept(qint64 idx) const;
-
-public:
-    bool isEmpty() const;
-    bool isModified() const;
-    bool canUndo() const;
-    bool canRedo() const;
-    void setData(const QByteArray& ba);
-    void setData(QHexBuffer* buffer);
-    qint64 length() const;
-    qint64 indexOf(const QByteArray& ba, qint64 from = 0);
-    qint64 lastIndexOf(const QByteArray& ba, qint64 from = 0);
-    QByteArray read(qint64 offset, int len = 0) const;
-    uchar at(int offset) const;
-
-public Q_SLOTS:
-    void clearModified();
-    void undo();
-    void redo();
-    void insert(qint64 offset, uchar b);
-    void replace(qint64 offset, uchar b);
-    void insert(qint64 offset, const QByteArray& data);
-    void replace(qint64 offset, const QByteArray& data);
-    void remove(qint64 offset, int len);
-    bool saveTo(QIODevice* device);
-
-public:
-    template<typename T, bool Owned = true>
-    static QHexDocument* fromDevice(QIODevice* iodevice,
-                                    QObject* parent = nullptr);
-    template<typename T>
-    static QHexDocument* fromMemory(char* data, int size,
-                                    QObject* parent = nullptr);
-    template<typename T>
-    static QHexDocument* fromMemory(const QByteArray& ba,
-                                    QObject* parent = nullptr);
-    static QHexDocument* fromBuffer(QHexBuffer* buffer,
-                                    QObject* parent = nullptr);
-    static QHexDocument* fromLargeFile(QString filename,
-                                       QObject* parent = nullptr);
-    static QHexDocument* fromMappedFile(QString filename,
-                                        QObject* parent = nullptr);
-    static QHexDocument* fromFile(QString filename, QObject* parent = nullptr);
-    static QHexDocument* create(QObject* parent = nullptr);
-
-Q_SIGNALS:
-    void modifiedChanged(bool modified);
-    void canUndoChanged(bool canundo);
-    void canRedoChanged(bool canredo);
-    void dataChanged(const QByteArray& data, quint64 offset,
-                     QHexDocument::ChangeReason reason);
-    void changed();
-    void reset();
-
-private:
-    QHexBuffer* m_buffer;
-    QUndoStack m_undostack;
-
-    friend class QHexView;
-};
-
-template<typename T, bool Owned>
-QHexDocument* QHexDocument::fromDevice(QIODevice* iodevice, QObject* parent) {
-    QHexBuffer* hexbuffer = new T(parent);
-    if(Owned)
-        iodevice->setParent(hexbuffer);
-    return hexbuffer->read(iodevice) ? new QHexDocument(hexbuffer, parent)
-                                     : nullptr;
-}
-
-template<typename T>
-QHexDocument* QHexDocument::fromMemory(char* data, int size, QObject* parent) {
-    QHexBuffer* hexbuffer = new T();
-    hexbuffer->read(data, size);
-    return new QHexDocument(hexbuffer, parent);
-}
-
-template<typename T>
-QHexDocument* QHexDocument::fromMemory(const QByteArray& ba, QObject* parent) {
-    QHexBuffer* hexbuffer = new T();
-    hexbuffer->read(ba);
-    return new QHexDocument(hexbuffer, parent);
-}

UEFITool/QHexView/include/QHexView/model/qhexmetadata.h

@@ -1,92 +0,0 @@
-#pragma once
-
-#include <QColor>
-#include <QHash>
-#include <QHexView/model/qhexoptions.h>
-#include <QList>
-#include <QObject>
-#include <functional>
-
-struct QHexMetadataItem {
-    qint64 begin, end;
-    QColor foreground, background;
-    QString comment;
-};
-
-using QHexMetadataLine = QList<QHexMetadataItem>;
-
-class QHexMetadata: public QObject {
-    Q_OBJECT
-
-private:
-    using ClearMetadataCallback = std::function<bool(QHexMetadataItem&)>;
-
-private:
-    explicit QHexMetadata(const QHexOptions* options,
-                          QObject* parent = nullptr);
-
-public:
-    const QHexMetadataLine* find(qint64 line) const;
-    QString getComment(qint64 line, qint64 column) const;
-    void removeMetadata(qint64 line);
-    void removeBackground(qint64 line);
-    void removeForeground(qint64 line);
-    void removeComments(qint64 line);
-    void unhighlight(qint64 line);
-    void clear();
-
-public:
-    inline void setMetadata(qint64 begin, qint64 end, const QColor& fgcolor,
-                            const QColor& bgcolor, const QString& comment) {
-        this->setMetadata({begin, end, fgcolor, bgcolor, comment});
-    }
-
-    inline void setForeground(qint64 begin, qint64 end, const QColor& fgcolor) {
-        this->setMetadata(begin, end, fgcolor, QColor(), QString());
-    }
-
-    inline void setBackground(qint64 begin, qint64 end, const QColor& bgcolor) {
-        this->setMetadata(begin, end, QColor(), bgcolor, QString());
-    }
-
-    inline void setComment(qint64 begin, qint64 end, const QString& comment) {
-        this->setMetadata(begin, end, QColor(), QColor(), comment);
-    };
-
-    inline void setMetadataSize(qint64 begin, qint64 length,
-                                const QColor& fgcolor, const QColor& bgcolor,
-                                const QString& comment) {
-        this->setMetadata({begin, begin + length, fgcolor, bgcolor, comment});
-    }
-
-    inline void setForegroundSize(qint64 begin, qint64 length,
-                                  const QColor& fgcolor) {
-        this->setForeground(begin, begin + length, fgcolor);
-    }
-
-    inline void setBackgroundSize(qint64 begin, qint64 length,
-                                  const QColor& bgcolor) {
-        this->setBackground(begin, begin + length, bgcolor);
-    }
-
-    inline void setCommentSize(qint64 begin, qint64 length,
-                               const QString& comment) {
-        this->setComment(begin, begin + length, comment);
-    };
-
-private:
-    void copy(const QHexMetadata* metadata);
-    void clearMetadata(qint64 line, ClearMetadataCallback&& cb);
-    void setMetadata(const QHexMetadataItem& mi);
-    void invalidate();
-
-Q_SIGNALS:
-    void changed();
-    void cleared();
-
-private:
-    QHash<qint64, QHexMetadataLine> m_metadata;
-    const QHexOptions* m_options;
-
-    friend class QHexView;
-};

UEFITool/QHexView/include/QHexView/model/qhexoptions.h

@@ -1,56 +0,0 @@
-#pragma once
-
-#include <QChar>
-#include <QColor>
-#include <QHash>
-
-namespace QHexFlags {
-
-enum : unsigned int {
-    None = (1 << 0),
-    HSeparator = (1 << 1),
-    VSeparator = (1 << 2),
-    StyledHeader = (1 << 3),
-    StyledAddress = (1 << 4),
-    NoHeader = (1 << 5),
-    HighlightAddress = (1 << 6),
-    HighlightColumn = (1 << 7),
-
-    Separators = HSeparator | VSeparator,
-    Styled = StyledHeader | StyledAddress,
-};
-
-}
-
-struct QHexColor {
-    QColor foreground;
-    QColor background;
-};
-
-struct QHexOptions {
-    // Appearance
-    QChar unprintablechar{'.'};
-    QChar invalidchar{'?'};
-    QString addresslabel{""};
-    QString hexlabel;
-    QString asciilabel;
-    quint64 baseaddress{0};
-    unsigned int flags{QHexFlags::None};
-    unsigned int linelength{0x10};
-    unsigned int addresswidth{0};
-    unsigned int grouplength{1};
-    int scrollsteps{1};
-
-    // Colors & Styles
-    QHash<quint8, QHexColor> bytecolors;
-    QColor linealternatebackground;
-    QColor linebackground;
-    QColor headercolor;
-    QColor commentcolor;
-    QColor separatorcolor;
-
-    // Misc
-    bool copybreak{true};
-
-    inline bool hasFlag(unsigned int flag) const { return flags & flag; }
-};

UEFITool/QHexView/include/QHexView/model/qhexutils.h

@@ -1,66 +0,0 @@
-#pragma once
-
-#include <QByteArray>
-#include <QPair>
-#include <QString>
-#include <QVariant>
-
-struct QHexOptions;
-class QHexView;
-
-namespace QHexFindOptions {
-
-enum : unsigned int {
-    None = (1 << 0),
-    CaseSensitive = (1 << 1),
-    Int8 = (1 << 2),
-    Int16 = (1 << 3),
-    Int32 = (1 << 4),
-    Int64 = (1 << 5),
-    Float = (1 << 6),
-    Double = (1 << 7),
-
-    BigEndian = (1 << 11),
-};
-
-}
-
-enum class QHexFindMode { Text, Hex, Int, Float };
-enum class QHexFindDirection { All, Forward, Backward };
-enum class QHexArea { Header, Address, Hex, Ascii, Extra };
-
-struct QHexPosition {
-    qint64 line;
-    qint64 column;
-    static inline QHexPosition invalid() { return {-1, -1}; }
-    inline bool isValid() const { return line >= 0 && column >= 0; }
-    inline bool operator==(const QHexPosition& rhs) const {
-        return (line == rhs.line) && (column == rhs.column);
-    }
-    inline bool operator!=(const QHexPosition& rhs) const {
-        return (line != rhs.line) || (column != rhs.column);
-    }
-};
-
-namespace QHexUtils {
-
-bool isHex(char ch);
-QByteArray toHex(const QByteArray& ba, char sep);
-QByteArray toHex(const QByteArray& ba);
-qint64 positionToOffset(const QHexOptions* options, QHexPosition pos);
-QHexPosition offsetToPosition(const QHexOptions* options, qint64 offset);
-bool checkPattern(QString pattern);
-
-QPair<qint64, qint64> find(const QHexView* hexview, QVariant value,
-                           qint64 startoffset = 0,
-                           QHexFindMode mode = QHexFindMode::Text,
-                           unsigned int options = QHexFindOptions::None,
-                           QHexFindDirection fd = QHexFindDirection::Forward);
-
-QPair<qint64, qint64>
-replace(const QHexView* hexview, QVariant oldvalue, QVariant newvalue,
-        qint64 startoffset = 0, QHexFindMode mode = QHexFindMode::Text,
-        unsigned int options = QHexFindOptions::None,
-        QHexFindDirection fd = QHexFindDirection::Forward);
-
-} // namespace QHexUtils

UEFITool/QHexView/include/QHexView/qhexview.h

@@ -1,184 +0,0 @@
-#pragma once
-
-#define QHEXVIEW_VERSION 5.0
-
-#include <QAbstractScrollArea>
-#include <QFontMetricsF>
-#include <QHexView/model/qhexcursor.h>
-#include <QHexView/model/qhexdelegate.h>
-#include <QHexView/model/qhexdocument.h>
-#include <QList>
-#include <QRectF>
-#include <QTextCharFormat>
-
-#if defined(QHEXVIEW_ENABLE_DIALOGS)
-class HexFindDialog;
-#endif
-
-class QHexView: public QAbstractScrollArea {
-    Q_OBJECT
-
-public:
-    enum class CopyMode { Visual, HexArraySquare, HexArrayCurly, HexArrayChar };
-    Q_ENUM(CopyMode);
-
-public:
-    explicit QHexView(QWidget* parent = nullptr);
-    QRectF headerRect() const;
-    QRectF addressRect() const;
-    QRectF hexRect() const;
-    QRectF asciiRect() const;
-    QHexDocument* hexDocument() const;
-    QHexCursor* hexCursor() const;
-    const QHexMetadata* hexMetadata() const;
-    QHexOptions options() const;
-    QColor getReadableColor(QColor c) const;
-    QByteArray selectedBytes() const;
-    QByteArray getLine(qint64 line) const;
-    unsigned int addressWidth() const;
-    unsigned int lineLength() const;
-    bool isModified() const;
-    bool canUndo() const;
-    bool canRedo() const;
-    quint64 offset() const;
-    quint64 address() const;
-    QHexPosition positionFromOffset(quint64 offset) const;
-    QHexPosition positionFromAddress(quint64 address) const;
-    QHexPosition position() const;
-    QHexPosition selectionStart() const;
-    QHexPosition selectionEnd() const;
-    quint64 selectionStartOffset() const;
-    quint64 selectionEndOffset() const;
-    quint64 baseAddress() const;
-    quint64 lines() const;
-    qint64 replace(const QVariant& oldvalue, const QVariant& newvalue,
-                   qint64 offset, QHexFindMode mode = QHexFindMode::Text,
-                   unsigned int options = QHexFindOptions::None,
-                   QHexFindDirection fd = QHexFindDirection::Forward) const;
-    qint64 find(const QVariant& value, qint64 offset,
-                QHexFindMode mode = QHexFindMode::Text,
-                unsigned int options = QHexFindOptions::None,
-                QHexFindDirection fd = QHexFindDirection::Forward) const;
-    void setOptions(const QHexOptions& options);
-    void setBaseAddress(quint64 baseaddress);
-    void setDelegate(QHexDelegate* rd);
-    void setDocument(QHexDocument* doc);
-    void setData(const QByteArray& ba);
-    void setData(QHexBuffer* buffer);
-    void setCursorMode(QHexCursor::Mode mode);
-    void setByteColor(quint8 b, QHexColor c);
-    void setByteForeground(quint8 b, QColor c);
-    void setByteBackground(quint8 b, QColor c);
-    void setMetadata(qint64 begin, qint64 end, const QColor& fgcolor,
-                     const QColor& bgcolor, const QString& comment);
-    void setForeground(qint64 begin, qint64 end, const QColor& fgcolor);
-    void setBackground(qint64 begin, qint64 end, const QColor& bgcolor);
-    void setComment(qint64 begin, qint64 end, const QString& comment);
-    void setMetadataSize(qint64 begin, qint64 length, const QColor& fgcolor,
-                         const QColor& bgcolor, const QString& comment);
-    void setForegroundSize(qint64 begin, qint64 length, const QColor& fgcolor);
-    void setBackgroundSize(qint64 begin, qint64 length, const QColor& bgcolor);
-    void setCommentSize(qint64 begin, qint64 length, const QString& comment);
-    void removeMetadata(qint64 line);
-    void removeBackground(qint64 line);
-    void removeForeground(qint64 line);
-    void removeComments(qint64 line);
-    void unhighlight(qint64 line);
-    void clearMetadata();
-
-public Q_SLOTS:
-#if defined(QHEXVIEW_ENABLE_DIALOGS)
-    void showFind();
-    void showReplace();
-#endif
-    void undo();
-    void redo();
-    void cut(bool hex = false);
-    void copyAs(CopyMode mode = CopyMode::Visual) const;
-    void copy(bool hex = false) const;
-    void paste(bool hex = false);
-    void clearModified();
-    void selectAll();
-    void removeSelection();
-    void switchMode();
-    void setAddressWidth(unsigned int w);
-    void setLineLength(unsigned int l);
-    void setGroupLength(unsigned int l);
-    void setScrollSteps(int scrollsteps);
-    void setReadOnly(bool r);
-    void setAutoWidth(bool r);
-
-private:
-    void paint(QPainter* painter) const;
-    void checkOptions();
-    void checkState();
-    void checkAndUpdate(bool calccolumns = false);
-    void calcColumns();
-    void ensureVisible();
-    void drawSeparators(QPainter* p) const;
-    void drawHeader(QTextCursor& c) const;
-    void drawDocument(QTextCursor& c) const;
-    QTextCharFormat drawFormat(QTextCursor& c, quint8 b, const QString& s,
-                               QHexArea area, qint64 line, qint64 column,
-                               bool applyformat) const;
-    unsigned int calcAddressWidth() const;
-    int visibleLines(bool absolute = false) const;
-    qint64 getLastColumn(qint64 line) const;
-    qint64 lastLine() const;
-    qreal getNCellsWidth(int n) const;
-    qreal hexColumnWidth() const;
-    qreal hexColumnX() const;
-    qreal asciiColumnX() const;
-    qreal endColumnX() const;
-    qreal cellWidth() const;
-    qreal lineHeight() const;
-    qint64 positionFromLineCol(qint64 line, qint64 col) const;
-    QHexPosition positionFromPoint(QPoint pt) const;
-    QPoint absolutePoint(QPoint pt) const;
-    QHexArea areaFromPoint(QPoint pt) const;
-    void moveNext(bool select = false);
-    void movePrevious(bool select = false);
-    bool keyPressMove(QKeyEvent* e);
-    bool keyPressTextInput(QKeyEvent* e);
-    bool keyPressAction(QKeyEvent* e);
-
-protected:
-    bool event(QEvent* e) override;
-    void showEvent(QShowEvent* e) override;
-    void paintEvent(QPaintEvent*) override;
-    void resizeEvent(QResizeEvent* e) override;
-    void focusInEvent(QFocusEvent* e) override;
-    void focusOutEvent(QFocusEvent* e) override;
-    void mousePressEvent(QMouseEvent* e) override;
-    void mouseMoveEvent(QMouseEvent* e) override;
-    void wheelEvent(QWheelEvent* e) override;
-    void keyPressEvent(QKeyEvent* e) override;
-
-private:
-    static QString reduced(const QString& s, int maxlen);
-    static bool isColorLight(QColor c);
-
-Q_SIGNALS:
-    void dataChanged(const QByteArray& data, quint64 offset,
-                     QHexDocument::ChangeReason reason);
-    void modifiedChanged(bool modified);
-    void positionChanged();
-    void modeChanged();
-
-private:
-    bool m_readonly{false}, m_writing{false}, m_autowidth{false};
-    QHexArea m_currentarea{QHexArea::Ascii};
-    QList<QRectF> m_hexcolumns;
-    QFontMetricsF m_fontmetrics;
-    QHexOptions m_options;
-    QHexCursor* m_hexcursor{nullptr};
-    QHexDocument* m_hexdocument{nullptr};
-    QHexMetadata* m_hexmetadata{nullptr};
-    QHexDelegate* m_hexdelegate{nullptr};
-#if defined(QHEXVIEW_ENABLE_DIALOGS)
-    HexFindDialog *m_hexdlgfind{nullptr}, *m_hexdlgreplace{nullptr};
-#endif
-
-    friend class QHexDelegate;
-    friend class QHexCursor;
-};

UEFITool/QHexView/src/dialogs/hexfinddialog.cpp

@@ -1,418 +0,0 @@
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QHexView/dialogs/hexfinddialog.h>
-#include <QHexView/qhexview.h>
-#include <QLabel>
-#include <QLineEdit>
-#include <QList>
-#include <QMessageBox>
-#include <QPair>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QRegularExpression>
-#include <QRegularExpressionValidator>
-#include <QSpacerItem>
-#include <QStackedLayout>
-#include <QVBoxLayout>
-#include <limits>
-
-const QString HexFindDialog::BUTTONBOX = "qhexview_buttonbox";
-const QString HexFindDialog::CBFINDMODE = "qhexview_cbfindmode";
-const QString HexFindDialog::LEFIND = "qhexview_lefind";
-const QString HexFindDialog::LEREPLACE = "qhexview_lereplace";
-const QString HexFindDialog::HLAYOUT = "qhexview_hlayout";
-const QString HexFindDialog::GBOPTIONS = "qhexview_gboptions";
-const QString HexFindDialog::RBALL = "qhexview_rball";
-const QString HexFindDialog::RBFORWARD = "qhexview_rbforward";
-const QString HexFindDialog::RBBACKWARD = "qhexview_rbbackward";
-
-HexFindDialog::HexFindDialog(Type type, QHexView* parent)
-    : QDialog{parent}, m_type{type} {
-    m_hexvalidator = new QRegularExpressionValidator(
-        QRegularExpression{"[0-9A-Fa-f ]+"}, this);
-    m_hexpvalidator = new QRegularExpressionValidator(
-        QRegularExpression{"[0-9A-Fa-f \\?]+"}, this);
-    m_dblvalidator = new QDoubleValidator(this);
-    m_intvalidator = new QIntValidator(this);
-
-    this->setWindowTitle(type == Type::Replace ? tr("Replace...")
-                                               : tr("Find..."));
-
-    auto* vlayout = new QVBoxLayout(this);
-    auto* gridlayout = new QGridLayout();
-
-    auto* cbfindmode = new QComboBox(this);
-    cbfindmode->setObjectName(HexFindDialog::CBFINDMODE);
-    cbfindmode->addItem("Text", static_cast<int>(QHexFindMode::Text));
-    cbfindmode->addItem("Hex", static_cast<int>(QHexFindMode::Hex));
-    cbfindmode->addItem("Int", static_cast<int>(QHexFindMode::Int));
-    cbfindmode->addItem("Float", static_cast<int>(QHexFindMode::Float));
-
-    QLineEdit *lereplace = nullptr, *lefind = new QLineEdit(this);
-    lefind->setObjectName(HexFindDialog::LEFIND);
-
-    gridlayout->addWidget(new QLabel(tr("Mode:"), this), 0, 0, Qt::AlignRight);
-    gridlayout->addWidget(cbfindmode, 0, 1);
-    gridlayout->addWidget(new QLabel(tr("Find:"), this), 1, 0, Qt::AlignRight);
-    gridlayout->addWidget(lefind, 1, 1);
-
-    if(type == Type::Replace) {
-        lereplace = new QLineEdit(this);
-        lereplace->setObjectName(HexFindDialog::LEREPLACE);
-
-        gridlayout->addWidget(new QLabel(tr("Replace:"), this), 2, 0,
-                              Qt::AlignRight);
-        gridlayout->addWidget(lereplace, 2, 1);
-    }
-
-    vlayout->addLayout(gridlayout);
-
-    auto* gboptions = new QGroupBox(this);
-    gboptions->setObjectName(HexFindDialog::GBOPTIONS);
-    gboptions->setTitle(tr("Options"));
-    gboptions->setLayout(new QStackedLayout());
-
-    QGroupBox* gbdirection = new QGroupBox(this);
-    gbdirection->setTitle(tr("Find direction"));
-    auto* gbvlayout = new QVBoxLayout(gbdirection);
-
-    auto* rball = new QRadioButton("All", gbdirection);
-    rball->setObjectName(HexFindDialog::RBALL);
-    auto* rbforward = new QRadioButton("Forward", gbdirection);
-    rbforward->setObjectName(HexFindDialog::RBFORWARD);
-    rbforward->setChecked(true);
-    auto* rbbackward = new QRadioButton("Backward", gbdirection);
-    rbbackward->setObjectName(HexFindDialog::RBBACKWARD);
-
-    gbvlayout->addWidget(rball);
-    gbvlayout->addWidget(rbforward);
-    gbvlayout->addWidget(rbbackward);
-    gbvlayout->addSpacerItem(
-        new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding));
-
-    auto* hlayout = new QHBoxLayout();
-    hlayout->setObjectName(HexFindDialog::HLAYOUT);
-    hlayout->addWidget(gboptions, 1);
-    hlayout->addWidget(gbdirection);
-    vlayout->addLayout(hlayout, 1);
-
-    auto* buttonbox = new QDialogButtonBox(this);
-    buttonbox->setOrientation(Qt::Horizontal);
-
-    if(type == Type::Replace)
-        buttonbox->setStandardButtons(QDialogButtonBox::Ok |
-                                      QDialogButtonBox::Apply |
-                                      QDialogButtonBox::Cancel);
-    else
-        buttonbox->setStandardButtons(QDialogButtonBox::Ok |
-                                      QDialogButtonBox::Cancel);
-
-    buttonbox->setObjectName(HexFindDialog::BUTTONBOX);
-    buttonbox->button(QDialogButtonBox::Ok)->setEnabled(false);
-    buttonbox->button(QDialogButtonBox::Ok)->setText(tr("Find"));
-
-    if(type == Type::Replace) {
-        buttonbox->button(QDialogButtonBox::Apply)->setEnabled(false);
-        buttonbox->button(QDialogButtonBox::Apply)->setText(tr("Replace"));
-    }
-
-    vlayout->addWidget(buttonbox);
-
-    connect(lefind, &QLineEdit::textChanged, this,
-            &HexFindDialog::validateActions);
-    connect(cbfindmode, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            this, &HexFindDialog::updateFindOptions);
-    connect(buttonbox, &QDialogButtonBox::accepted, this, &HexFindDialog::find);
-    connect(buttonbox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-    connect(parent, &QHexView::positionChanged, this,
-            [this]() { m_startoffset = -1; });
-
-    if(lereplace) {
-        connect(buttonbox->button(QDialogButtonBox::Apply),
-                &QPushButton::clicked, this, &HexFindDialog::replace);
-        connect(lereplace, &QLineEdit::textChanged, this,
-                &HexFindDialog::validateActions);
-    }
-
-    this->prepareTextMode(gboptions->layout());
-    this->prepareHexMode(gboptions->layout());
-    this->prepareIntMode(gboptions->layout());
-    this->prepareFloatMode(gboptions->layout());
-    this->updateFindOptions(-1);
-}
-
-QHexView* HexFindDialog::hexView() const {
-    return qobject_cast<QHexView*>(this->parentWidget());
-}
-
-void HexFindDialog::updateFindOptions(int) {
-    QGroupBox* gboptions =
-        this->findChild<QGroupBox*>(HexFindDialog::GBOPTIONS);
-
-    QLineEdit* lefind = this->findChild<QLineEdit*>(HexFindDialog::LEFIND);
-    QLineEdit* lereplace =
-        this->findChild<QLineEdit*>(HexFindDialog::LEREPLACE);
-    lefind->clear();
-    if(lereplace)
-        lereplace->clear();
-
-    bool ok = false;
-    QHexFindMode mode = static_cast<QHexFindMode>(
-        this->findChild<QComboBox*>(HexFindDialog::CBFINDMODE)
-            ->currentData()
-            .toInt(&ok));
-    if(!ok)
-        return;
-
-    m_findoptions = QHexFindOptions::None;
-    m_oldidxbits = m_oldidxendian = -1;
-
-    auto* stack = qobject_cast<QStackedLayout*>(gboptions->layout());
-
-    switch(mode) {
-        case QHexFindMode::Text: {
-            lefind->setValidator(nullptr);
-            if(lereplace)
-                lereplace->setValidator(nullptr);
-
-            stack->setCurrentIndex(0);
-            gboptions->setVisible(true);
-            break;
-        }
-
-        case QHexFindMode::Hex: {
-            lefind->setValidator(m_hexpvalidator);
-            if(lereplace)
-                lereplace->setValidator(m_hexvalidator);
-            stack->setCurrentIndex(1);
-            gboptions->setVisible(false);
-            break;
-        }
-
-        case QHexFindMode::Int: {
-            lefind->setValidator(m_intvalidator);
-            if(lereplace)
-                lereplace->setValidator(m_intvalidator);
-
-            stack->setCurrentIndex(2);
-            gboptions->setVisible(true);
-            break;
-        }
-
-        case QHexFindMode::Float: {
-            lefind->setValidator(m_dblvalidator);
-            if(lereplace)
-                lereplace->setValidator(m_dblvalidator);
-
-            stack->setCurrentIndex(3);
-            gboptions->setVisible(true);
-            break;
-        }
-    }
-}
-
-bool HexFindDialog::validateIntRange(uint v) const {
-    if(m_findoptions & QHexFindOptions::Int8)
-        return !(v > std::numeric_limits<quint8>::max());
-    if(m_findoptions & QHexFindOptions::Int16)
-        return !(v > std::numeric_limits<quint16>::max());
-    if(m_findoptions & QHexFindOptions::Int32)
-        return !(v > std::numeric_limits<quint32>::max());
-    return true;
-}
-
-void HexFindDialog::checkResult(const QString& q, qint64 offset,
-                                QHexFindDirection fd) {
-    if(offset == -1) {
-        QMessageBox::information(this, tr("Not found"),
-                                 tr("Cannot find '%1'").arg(q));
-        return;
-    }
-
-    if(fd == QHexFindDirection::Backward)
-        m_startoffset = this->hexView()->selectionStartOffset() - 1;
-    else
-        m_startoffset = this->hexView()->selectionEndOffset() + 1;
-}
-
-void HexFindDialog::validateActions() {
-    auto mode = static_cast<QHexFindMode>(
-        this->findChild<QComboBox*>(HexFindDialog::CBFINDMODE)
-            ->currentData()
-            .toUInt());
-    auto* lefind = this->findChild<QLineEdit*>(HexFindDialog::LEFIND);
-    auto* lereplace = this->findChild<QLineEdit*>(HexFindDialog::LEREPLACE);
-    auto* buttonbox =
-        this->findChild<QDialogButtonBox*>(HexFindDialog::BUTTONBOX);
-
-    bool findenable = false, replaceenable = false;
-
-    switch(mode) {
-        case QHexFindMode::Hex:
-            findenable = QHexUtils::checkPattern(lefind->text());
-            replaceenable = findenable;
-            break;
-
-        case QHexFindMode::Float: {
-            lefind->text().toFloat(&findenable);
-            if(lereplace && findenable)
-                lereplace->text().toFloat(&replaceenable);
-            break;
-        }
-
-        case QHexFindMode::Int: {
-            auto v = lefind->text().toUInt(&findenable);
-            if(findenable && !this->validateIntRange(v))
-                findenable = false;
-            if(lereplace && findenable)
-                lereplace->text().toUInt(&replaceenable);
-            break;
-        }
-
-        default:
-            findenable = !lefind->text().isEmpty();
-            replaceenable = findenable;
-            break;
-    }
-
-    if(lereplace)
-        buttonbox->button(QDialogButtonBox::Apply)->setEnabled(replaceenable);
-    buttonbox->button(QDialogButtonBox::Ok)->setEnabled(findenable);
-}
-
-void HexFindDialog::replace() {
-    QString q1;
-    QHexFindMode mode;
-    QHexFindDirection fd;
-
-    if(!this->prepareOptions(q1, mode, fd))
-        return;
-
-    QString q2 = this->findChild<QLineEdit*>(HexFindDialog::LEREPLACE)->text();
-    auto offset = this->hexView()->hexCursor()->replace(
-        q1, q2, m_startoffset > -1 ? m_startoffset : this->hexView()->offset(),
-        mode, m_findoptions, fd);
-    this->checkResult(q1, offset, fd);
-}
-
-void HexFindDialog::find() {
-    QString q;
-    QHexFindMode mode;
-    QHexFindDirection fd;
-
-    if(!this->prepareOptions(q, mode, fd))
-        return;
-
-    auto offset = this->hexView()->hexCursor()->find(
-        q, m_startoffset > -1 ? m_startoffset : this->hexView()->offset(), mode,
-        m_findoptions, fd);
-    this->checkResult(q, offset, fd);
-}
-
-bool HexFindDialog::prepareOptions(QString& q, QHexFindMode& mode,
-                                   QHexFindDirection& fd) {
-    q = this->findChild<QLineEdit*>(HexFindDialog::LEFIND)->text();
-    mode = static_cast<QHexFindMode>(
-        this->findChild<QComboBox*>(HexFindDialog::CBFINDMODE)
-            ->currentData()
-            .toUInt());
-
-    if(mode == QHexFindMode::Hex && !QHexUtils::checkPattern(q)) {
-        QMessageBox::warning(this, tr("Pattern Error"),
-                             tr("Hex pattern '%1' is not valid").arg(q));
-        return false;
-    }
-
-    if(this->findChild<QRadioButton*>(HexFindDialog::RBBACKWARD)->isChecked())
-        fd = QHexFindDirection::Backward;
-    else if(this->findChild<QRadioButton*>(HexFindDialog::RBFORWARD)
-                ->isChecked())
-        fd = QHexFindDirection::Forward;
-    else
-        fd = QHexFindDirection::All;
-    return true;
-}
-
-void HexFindDialog::prepareTextMode(QLayout* l) {
-    auto* cbcasesensitive = new QCheckBox("Case sensitive");
-
-    connect(cbcasesensitive, &QCheckBox::stateChanged, this, [this](int state) {
-        if(state == Qt::Checked)
-            m_findoptions |= QHexFindOptions::CaseSensitive;
-        else
-            m_findoptions &= ~QHexFindOptions::CaseSensitive;
-    });
-
-    auto* vlayout = new QVBoxLayout(new QWidget());
-    vlayout->addWidget(cbcasesensitive);
-    l->addWidget(vlayout->parentWidget());
-}
-
-void HexFindDialog::prepareHexMode(QLayout* l) { l->addWidget(new QWidget()); }
-
-void HexFindDialog::prepareIntMode(QLayout* l) {
-    static const QList<QPair<QString, unsigned int>> INT_TYPES = {
-        qMakePair<QString, unsigned int>("(any)", 0),
-        qMakePair<QString, unsigned int>("8", QHexFindOptions::Int8),
-        qMakePair<QString, unsigned int>("16", QHexFindOptions::Int16),
-        qMakePair<QString, unsigned int>("32", QHexFindOptions::Int32),
-        qMakePair<QString, unsigned int>("64", QHexFindOptions::Int64)};
-
-    auto* cbbits = new QComboBox();
-    for(const auto& it : INT_TYPES)
-        cbbits->addItem(it.first, it.second);
-
-    connect(cbbits, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            [this, cbbits](int index) {
-                if(m_oldidxbits > -1)
-                    m_findoptions &= ~cbbits->itemData(m_oldidxbits).toUInt();
-                m_findoptions |= cbbits->itemData(index).toUInt();
-                m_oldidxbits = index;
-            });
-
-    auto* cbendian = new QComboBox();
-    cbendian->addItem("Little Endian", 0);
-    cbendian->addItem("Big Endian", QHexFindOptions::BigEndian);
-
-    connect(cbendian, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            [this, cbendian](int index) {
-                if(m_oldidxendian > -1)
-                    m_findoptions &=
-                        ~cbendian->itemData(m_oldidxendian).toUInt();
-                m_findoptions |= cbendian->itemData(index).toUInt();
-                m_oldidxendian = index;
-            });
-
-    auto* vlayout = new QVBoxLayout(new QWidget());
-
-    QGridLayout* gl = new QGridLayout();
-    gl->addWidget(new QLabel("Type:"), 0, 0, Qt::AlignRight);
-    gl->addWidget(cbbits, 0, 1);
-    gl->addWidget(new QLabel("Endian:"), 1, 0, Qt::AlignRight);
-    gl->addWidget(cbendian, 1, 1);
-    vlayout->addLayout(gl);
-
-    l->addWidget(vlayout->parentWidget());
-}
-
-void HexFindDialog::prepareFloatMode(QLayout* l) {
-    static const QList<QPair<QString, unsigned int>> FLOAT_TYPES = {
-        qMakePair<QString, unsigned int>("float", QHexFindOptions::Float),
-        qMakePair<QString, unsigned int>("double", QHexFindOptions::Double)};
-
-    bool first = true;
-    auto* vlayout = new QVBoxLayout(new QWidget());
-
-    for(const auto& ft : FLOAT_TYPES) {
-        auto* rb = new QRadioButton(ft.first);
-        rb->setChecked(first);
-        vlayout->addWidget(rb);
-        first = false;
-    }
-
-    l->addWidget(vlayout->parentWidget());
-}

UEFITool/QHexView/src/model/buffer/qdevicebuffer.cpp

@@ -1,118 +0,0 @@
-#include <QHexView/model/buffer/qdevicebuffer.h>
-#include <QIODevice>
-#include <limits>
-
-QDeviceBuffer::QDeviceBuffer(QObject* parent): QHexBuffer{parent} {}
-
-QDeviceBuffer::~QDeviceBuffer() {
-    if(!m_device)
-        return;
-
-    if(m_device->parent() == this) {
-        if(m_device->isOpen())
-            m_device->close();
-        m_device->deleteLater();
-    }
-
-    m_device = nullptr;
-}
-
-uchar QDeviceBuffer::at(qint64 idx) {
-    m_device->seek(idx);
-
-    char c = '\0';
-    m_device->getChar(&c);
-    return static_cast<uchar>(c);
-}
-
-qint64 QDeviceBuffer::length() const { return m_device->size(); }
-
-void QDeviceBuffer::insert(qint64 offset, const QByteArray& data) {
-    Q_UNUSED(offset)
-    Q_UNUSED(data)
-    // Not implemented
-}
-
-void QDeviceBuffer::replace(qint64 offset, const QByteArray& data) {
-    m_device->seek(offset);
-    m_device->write(data);
-}
-
-void QDeviceBuffer::remove(qint64 offset, int length) {
-    Q_UNUSED(offset)
-    Q_UNUSED(length)
-    // Not implemented
-}
-
-QByteArray QDeviceBuffer::read(qint64 offset, int length) {
-    m_device->seek(offset);
-    return m_device->read(length);
-}
-
-bool QDeviceBuffer::read(QIODevice* device) {
-    m_device = device;
-    if(!m_device)
-        return false;
-    if(!m_device->isOpen())
-        m_device->open(QIODevice::ReadWrite);
-    return m_device->isOpen();
-}
-
-void QDeviceBuffer::write(QIODevice* device) {
-    Q_UNUSED(device)
-    // Not implemented
-}
-
-qint64 QDeviceBuffer::indexOf(const QByteArray& ba, qint64 from) {
-    const auto MAX = std::numeric_limits<int>::max();
-    qint64 idx = -1;
-
-    if(from < m_device->size()) {
-        idx = from;
-        m_device->seek(from);
-
-        while(idx < m_device->size()) {
-            QByteArray data = m_device->read(MAX);
-            int sidx = data.indexOf(ba);
-
-            if(sidx >= 0) {
-                idx += sidx;
-                break;
-            }
-
-            if(idx + data.size() >= m_device->size())
-                return -1;
-            m_device->seek(m_device->pos() + data.size() - ba.size());
-        }
-    }
-
-    return idx;
-}
-
-qint64 QDeviceBuffer::lastIndexOf(const QByteArray& ba, qint64 from) {
-    const auto MAX = std::numeric_limits<int>::max();
-    qint64 idx = -1;
-
-    if(from >= 0 && ba.size() < MAX) {
-        qint64 currpos = from;
-
-        while(currpos >= 0) {
-            qint64 readpos = (currpos < MAX) ? 0 : currpos - MAX;
-            m_device->seek(readpos);
-
-            QByteArray data = m_device->read(currpos - readpos);
-            int lidx = data.lastIndexOf(ba, from);
-
-            if(lidx >= 0) {
-                idx = readpos + lidx;
-                break;
-            }
-
-            if(readpos <= 0)
-                break;
-            currpos = readpos + ba.size();
-        }
-    }
-
-    return idx;
-}

UEFITool/QHexView/src/model/buffer/qhexbuffer.cpp

@@ -1,36 +0,0 @@
-#include <QBuffer>
-#include <QHexView/model/buffer/qhexbuffer.h>
-
-QHexBuffer::QHexBuffer(QObject* parent): QObject{parent} {}
-uchar QHexBuffer::at(qint64 idx) { return this->read(idx, 1).at(0); }
-bool QHexBuffer::isEmpty() const { return this->length() <= 0; }
-
-void QHexBuffer::replace(qint64 offset, const QByteArray& data) {
-    this->remove(offset, data.length());
-    this->insert(offset, data);
-}
-
-bool QHexBuffer::accept(qint64 idx) const {
-    Q_UNUSED(idx);
-    return true;
-}
-
-void QHexBuffer::read(char* data, int size) {
-    QBuffer* buffer = new QBuffer(this);
-    buffer->setData(data, size);
-
-    if(!buffer->isOpen())
-        buffer->open(QBuffer::ReadWrite);
-
-    this->read(buffer);
-}
-
-void QHexBuffer::read(const QByteArray& ba) {
-    QBuffer* buffer = new QBuffer(this);
-
-    buffer->setData(ba);
-    if(!buffer->isOpen())
-        buffer->open(QBuffer::ReadWrite);
-
-    this->read(buffer);
-}

UEFITool/QHexView/src/model/buffer/qmappedfilebuffer.cpp

@@ -1,51 +0,0 @@
-#include <QFile>
-#include <QHexView/model/buffer/qmappedfilebuffer.h>
-
-QMappedFileBuffer::QMappedFileBuffer(QObject* parent): QDeviceBuffer{parent} {}
-
-QMappedFileBuffer::~QMappedFileBuffer() {
-    if((m_device && (m_device->parent() == this)) && m_mappeddata) {
-        QFile* f = qobject_cast<QFile*>(m_device);
-        f->unmap(m_mappeddata);
-    }
-
-    m_mappeddata = nullptr;
-}
-
-QByteArray QMappedFileBuffer::read(qint64 offset, int length) {
-    if(offset >= this->length())
-        return {};
-
-    if(offset + length >= this->length())
-        length = this->length() - offset;
-
-    return QByteArray::fromRawData(
-        reinterpret_cast<const char*>(m_mappeddata + offset), length);
-}
-
-bool QMappedFileBuffer::read(QIODevice* iodevice) {
-    m_device = qobject_cast<QFile*>(iodevice);
-    if(!m_device || !QDeviceBuffer::read(iodevice))
-        return false;
-
-    this->remap();
-    return m_mappeddata;
-}
-
-void QMappedFileBuffer::write(QIODevice* iodevice) {
-    if(iodevice == m_device)
-        this->remap();
-    else
-        iodevice->write(reinterpret_cast<const char*>(m_mappeddata),
-                        m_device->size());
-}
-
-void QMappedFileBuffer::remap() {
-    QFile* f = qobject_cast<QFile*>(m_device);
-    if(!f)
-        return;
-
-    if(m_mappeddata)
-        f->unmap(m_mappeddata);
-    m_mappeddata = f->map(0, f->size());
-}

UEFITool/QHexView/src/model/buffer/qmemorybuffer.cpp

@@ -1,39 +0,0 @@
-#include <QHexView/model/buffer/qmemorybuffer.h>
-#include <QIODevice>
-
-QMemoryBuffer::QMemoryBuffer(QObject* parent): QHexBuffer{parent} {}
-
-uchar QMemoryBuffer::at(qint64 idx) {
-    return static_cast<uchar>(m_buffer.at(idx));
-}
-
-qint64 QMemoryBuffer::length() const {
-    return static_cast<qint64>(m_buffer.length());
-}
-
-void QMemoryBuffer::insert(qint64 offset, const QByteArray& data) {
-    m_buffer.insert(static_cast<int>(offset), data);
-}
-
-void QMemoryBuffer::remove(qint64 offset, int length) {
-    m_buffer.remove(static_cast<int>(offset), length);
-}
-
-QByteArray QMemoryBuffer::read(qint64 offset, int length) {
-    return m_buffer.mid(static_cast<int>(offset), length);
-}
-
-bool QMemoryBuffer::read(QIODevice* device) {
-    m_buffer = device->readAll();
-    return true;
-}
-
-void QMemoryBuffer::write(QIODevice* device) { device->write(m_buffer); }
-
-qint64 QMemoryBuffer::indexOf(const QByteArray& ba, qint64 from) {
-    return m_buffer.indexOf(ba, static_cast<int>(from));
-}
-
-qint64 QMemoryBuffer::lastIndexOf(const QByteArray& ba, qint64 from) {
-    return m_buffer.lastIndexOf(ba, static_cast<int>(from));
-}

UEFITool/QHexView/src/model/buffer/qmemoryrefbuffer.cpp

@@ -1,26 +0,0 @@
-#include <QBuffer>
-#include <QHexView/model/buffer/qmemoryrefbuffer.h>
-
-QMemoryRefBuffer::QMemoryRefBuffer(QObject* parent): QDeviceBuffer{parent} {}
-
-bool QMemoryRefBuffer::read(QIODevice* device) {
-    m_device = qobject_cast<QBuffer*>(device);
-
-    if(m_device) {
-        m_device->setParent(this);
-        return QDeviceBuffer::read(device);
-    }
-
-    return false;
-}
-
-void QMemoryRefBuffer::write(QIODevice* device) {
-    if(!m_device || m_device == device)
-        return;
-
-    static const int CHUNK_SIZE = 4096;
-    m_device->seek(0);
-
-    while(!m_device->atEnd())
-        device->write(m_device->read(CHUNK_SIZE));
-}

UEFITool/QHexView/src/model/commands/hexcommand.cpp

@@ -1,6 +0,0 @@
-#include <QHexView/model/commands/hexcommand.h>
-
-HexCommand::HexCommand(QHexBuffer* buffer, QHexDocument* document,
-                       QUndoCommand* parent)
-    : QUndoCommand(parent), m_hexdocument(document), m_buffer(buffer),
-      m_offset(0), m_length(0) {}

UEFITool/QHexView/src/model/commands/insertcommand.cpp

@@ -1,18 +0,0 @@
-#include <QHexView/model/commands/insertcommand.h>
-#include <QHexView/model/qhexdocument.h>
-
-InsertCommand::InsertCommand(QHexBuffer* buffer, QHexDocument* document,
-                             qint64 offset, const QByteArray& data,
-                             QUndoCommand* parent)
-    : HexCommand(buffer, document, parent) {
-    m_offset = offset;
-    m_data = data;
-}
-
-void InsertCommand::undo() {
-    m_buffer->remove(m_offset, m_data.length());
-    Q_EMIT m_hexdocument->dataChanged(m_data, m_offset,
-                                      QHexDocument::ChangeReason::Remove);
-}
-
-void InsertCommand::redo() { m_buffer->insert(m_offset, m_data); }

UEFITool/QHexView/src/model/commands/removecommand.cpp

@@ -1,20 +0,0 @@
-#include <QHexView/model/commands/removecommand.h>
-#include <QHexView/model/qhexdocument.h>
-
-RemoveCommand::RemoveCommand(QHexBuffer* buffer, QHexDocument* document,
-                             qint64 offset, int length, QUndoCommand* parent)
-    : HexCommand(buffer, document, parent) {
-    m_offset = offset;
-    m_length = length;
-}
-
-void RemoveCommand::undo() {
-    m_buffer->insert(m_offset, m_data);
-    Q_EMIT m_hexdocument->dataChanged(m_data, m_offset,
-                                      QHexDocument::ChangeReason::Insert);
-}
-
-void RemoveCommand::redo() {
-    m_data = m_buffer->read(m_offset, m_length); // Backup data
-    m_buffer->remove(m_offset, m_length);
-}

UEFITool/QHexView/src/model/commands/replacecommand.cpp

@@ -1,21 +0,0 @@
-#include <QHexView/model/commands/replacecommand.h>
-#include <QHexView/model/qhexdocument.h>
-
-ReplaceCommand::ReplaceCommand(QHexBuffer* buffer, QHexDocument* document,
-                               qint64 offset, const QByteArray& data,
-                               QUndoCommand* parent)
-    : HexCommand(buffer, document, parent) {
-    m_offset = offset;
-    m_data = data;
-}
-
-void ReplaceCommand::undo() {
-    m_buffer->replace(m_offset, m_olddata);
-    Q_EMIT m_hexdocument->dataChanged(m_olddata, m_offset,
-                                      QHexDocument::ChangeReason::Replace);
-}
-
-void ReplaceCommand::redo() {
-    m_olddata = m_buffer->read(m_offset, m_data.length());
-    m_buffer->replace(m_offset, m_data);
-}

UEFITool/QHexView/src/model/qhexcursor.cpp

@@ -1,182 +0,0 @@
-#include <QHexView/model/qhexcursor.h>
-#include <QHexView/model/qhexdocument.h>
-#include <QHexView/qhexview.h>
-
-/*
- * https://stackoverflow.com/questions/10803043/inverse-column-row-major-order-transformation
- *
- *  If the index is calculated as:
- *      offset = row + column*NUMROWS
- *  then the inverse would be:
- *      row = offset % NUMROWS
- *      column = offset / NUMROWS
- *  where % is modulus, and / is integer division.
- */
-
-QHexCursor::QHexCursor(const QHexOptions* options, QHexView* parent)
-    : QObject(parent), m_options(options) {}
-
-QHexView* QHexCursor::hexView() const {
-    return qobject_cast<QHexView*>(this->parent());
-}
-
-QHexCursor::Mode QHexCursor::mode() const { return m_mode; }
-qint64 QHexCursor::offset() const { return this->positionToOffset(m_position); }
-
-qint64 QHexCursor::address() const {
-    return m_options->baseaddress + this->offset();
-}
-
-quint64 QHexCursor::lineAddress() const {
-    return m_options->baseaddress + (m_position.line * m_options->linelength);
-}
-
-qint64 QHexCursor::selectionStartOffset() const {
-    return this->positionToOffset(this->selectionStart());
-}
-
-qint64 QHexCursor::selectionEndOffset() const {
-    return this->positionToOffset(this->selectionEnd());
-}
-
-qint64 QHexCursor::line() const { return m_position.line; }
-qint64 QHexCursor::column() const { return m_position.column; }
-
-QHexPosition QHexCursor::selectionStart() const {
-    if(m_position.line < m_selection.line)
-        return m_position;
-
-    if(m_position.line == m_selection.line) {
-        if(m_position.column < m_selection.column)
-            return m_position;
-    }
-
-    return m_selection;
-}
-
-QHexPosition QHexCursor::selectionEnd() const {
-    if(m_position.line > m_selection.line)
-        return m_position;
-
-    if(m_position.line == m_selection.line) {
-        if(m_position.column > m_selection.column)
-            return m_position;
-    }
-
-    return m_selection;
-}
-
-qint64 QHexCursor::selectionLength() const {
-    auto selstart = this->selectionStartOffset(),
-         selend = this->selectionEndOffset();
-    return selstart == selend ? 0 : selend - selstart + 1;
-}
-
-QHexPosition QHexCursor::position() const { return m_position; }
-
-QByteArray QHexCursor::selectedBytes() const {
-    return this->hexView()->selectedBytes();
-}
-
-bool QHexCursor::hasSelection() const { return m_position != m_selection; }
-
-bool QHexCursor::isSelected(qint64 line, qint64 column) const {
-    if(!this->hasSelection())
-        return false;
-
-    auto selstart = this->selectionStart(), selend = this->selectionEnd();
-    if(line > selstart.line && line < selend.line)
-        return true;
-    if(line == selstart.line && line == selend.line)
-        return column >= selstart.column && column <= selend.column;
-    if(line == selstart.line)
-        return column >= selstart.column;
-    if(line == selend.line)
-        return column <= selend.column;
-    return false;
-}
-
-void QHexCursor::setMode(Mode m) {
-    if(m_mode == m)
-        return;
-    m_mode = m;
-    Q_EMIT modeChanged();
-}
-
-void QHexCursor::switchMode() {
-    switch(m_mode) {
-        case Mode::Insert: this->setMode(Mode::Overwrite); break;
-        case Mode::Overwrite: this->setMode(Mode::Insert); break;
-    }
-}
-
-void QHexCursor::move(qint64 offset) {
-    this->move(this->offsetToPosition(offset));
-}
-
-void QHexCursor::move(qint64 line, qint64 column) {
-    return this->move({line, column});
-}
-
-void QHexCursor::move(QHexPosition pos) {
-    if(pos.line >= 0)
-        m_selection.line = pos.line;
-    if(pos.column >= 0)
-        m_selection.column = pos.column;
-    this->select(pos);
-}
-
-void QHexCursor::select(qint64 offset) {
-    this->select(this->offsetToPosition(offset));
-}
-
-void QHexCursor::select(qint64 line, qint64 column) {
-    this->select({line, column});
-}
-
-void QHexCursor::select(QHexPosition pos) {
-    if(pos.line >= 0)
-        m_position.line = pos.line;
-    if(pos.column >= 0)
-        m_position.column = pos.column;
-    Q_EMIT positionChanged();
-}
-
-void QHexCursor::selectSize(qint64 length) {
-    if(length > 0)
-        length--;
-    else if(length < 0)
-        length++;
-    if(length)
-        this->select(this->offset() + length);
-}
-
-qint64 QHexCursor::replace(const QVariant& oldvalue, const QVariant& newvalue,
-                           qint64 offset, QHexFindMode mode,
-                           unsigned int options, QHexFindDirection fd) const {
-    return this->hexView()->replace(oldvalue, newvalue, offset, mode, options,
-                                    fd);
-}
-qint64 QHexCursor::find(const QVariant& value, qint64 offset, QHexFindMode mode,
-                        unsigned int options, QHexFindDirection fd) const {
-    return this->hexView()->find(value, offset, mode, options, fd);
-}
-
-void QHexCursor::cut(bool hex) { this->hexView()->cut(hex); }
-void QHexCursor::copy(bool hex) const { this->hexView()->copy(hex); }
-void QHexCursor::paste(bool hex) { this->hexView()->paste(hex); }
-void QHexCursor::selectAll() { this->hexView()->selectAll(); }
-void QHexCursor::removeSelection() { this->hexView()->removeSelection(); }
-
-void QHexCursor::clearSelection() {
-    m_position = m_selection;
-    Q_EMIT positionChanged();
-}
-
-qint64 QHexCursor::positionToOffset(QHexPosition pos) const {
-    return QHexUtils::positionToOffset(m_options, pos);
-}
-
-QHexPosition QHexCursor::offsetToPosition(qint64 offset) const {
-    return QHexUtils::offsetToPosition(m_options, offset);
-}

UEFITool/QHexView/src/model/qhexdelegate.cpp

@@ -1,65 +0,0 @@
-#include <QHexView/model/qhexdelegate.h>
-#include <QHexView/qhexview.h>
-
-QHexDelegate::QHexDelegate(QObject* parent): QObject{parent} {}
-
-QString QHexDelegate::addressHeader(const QHexView* hexview) const {
-    Q_UNUSED(hexview);
-    return QString();
-}
-
-QString QHexDelegate::hexHeader(const QHexView* hexview) const {
-    Q_UNUSED(hexview);
-    return QString();
-}
-
-QString QHexDelegate::asciiHeader(const QHexView* hexview) const {
-    Q_UNUSED(hexview);
-    return QString();
-}
-
-void QHexDelegate::renderAddress(quint64 address, QTextCharFormat& cf,
-                                 const QHexView* hexview) const {
-    Q_UNUSED(address);
-    Q_UNUSED(hexview);
-    Q_UNUSED(cf);
-    Q_UNUSED(hexview);
-}
-
-void QHexDelegate::renderHeader(QTextBlockFormat& bf,
-                                const QHexView* hexview) const {
-    Q_UNUSED(bf);
-    Q_UNUSED(hexview);
-}
-
-void QHexDelegate::renderHeaderPart(const QString& s, QHexArea area,
-                                    QTextCharFormat& cf,
-                                    const QHexView* hexview) const {
-    Q_UNUSED(s);
-    Q_UNUSED(area);
-    Q_UNUSED(cf);
-    Q_UNUSED(hexview);
-}
-
-bool QHexDelegate::render(quint64 offset, quint8 b, QTextCharFormat& outcf,
-                          const QHexView* hexview) const {
-    Q_UNUSED(offset);
-    Q_UNUSED(b);
-    Q_UNUSED(outcf);
-    Q_UNUSED(hexview);
-
-    return false;
-}
-
-bool QHexDelegate::paintSeparator(QPainter* painter, QLineF line,
-                                  const QHexView* hexview) const {
-    Q_UNUSED(painter);
-    Q_UNUSED(line);
-    Q_UNUSED(hexview);
-    return false;
-}
-
-void QHexDelegate::paint(QPainter* painter, const QHexView* hexview) const {
-    Q_UNUSED(hexview);
-    hexview->paint(painter);
-}

UEFITool/QHexView/src/model/qhexdocument.cpp

@@ -1,142 +0,0 @@
-#include <QBuffer>
-#include <QFile>
-#include <QHexView/model/buffer/qdevicebuffer.h>
-#include <QHexView/model/buffer/qmappedfilebuffer.h>
-#include <QHexView/model/buffer/qmemorybuffer.h>
-#include <QHexView/model/commands/insertcommand.h>
-#include <QHexView/model/commands/removecommand.h>
-#include <QHexView/model/commands/replacecommand.h>
-#include <QHexView/model/qhexdocument.h>
-#include <cmath>
-
-QHexDocument::QHexDocument(QHexBuffer* buffer, QObject* parent)
-    : QObject(parent) {
-    m_buffer = buffer;
-    m_buffer->setParent(this); // Take Ownership
-
-    connect(&m_undostack, &QUndoStack::canUndoChanged, this,
-            &QHexDocument::canUndoChanged);
-    connect(&m_undostack, &QUndoStack::canRedoChanged, this,
-            &QHexDocument::canRedoChanged);
-    connect(&m_undostack, &QUndoStack::cleanChanged, this,
-            [&](bool clean) { Q_EMIT modifiedChanged(!clean); });
-}
-
-qint64 QHexDocument::indexOf(const QByteArray& ba, qint64 from) {
-    return m_buffer->indexOf(ba, from);
-}
-
-qint64 QHexDocument::lastIndexOf(const QByteArray& ba, qint64 from) {
-    return m_buffer->lastIndexOf(ba, from);
-}
-
-bool QHexDocument::accept(qint64 idx) const { return m_buffer->accept(idx); }
-bool QHexDocument::isEmpty() const { return m_buffer->isEmpty(); }
-bool QHexDocument::isModified() const { return !m_undostack.isClean(); }
-bool QHexDocument::canUndo() const { return m_undostack.canUndo(); }
-bool QHexDocument::canRedo() const { return m_undostack.canRedo(); }
-
-void QHexDocument::setData(const QByteArray& ba) {
-    QHexBuffer* mb = new QMemoryBuffer();
-    mb->read(ba);
-    this->setData(mb);
-}
-
-void QHexDocument::setData(QHexBuffer* buffer) {
-    if(!buffer)
-        return;
-
-    m_undostack.clear();
-    buffer->setParent(this);
-
-    auto* oldbuffer = m_buffer;
-    m_buffer = buffer;
-    if(oldbuffer)
-        oldbuffer->deleteLater();
-
-    Q_EMIT canUndoChanged(false);
-    Q_EMIT canRedoChanged(false);
-    Q_EMIT changed();
-    Q_EMIT reset();
-}
-
-void QHexDocument::clearModified() { m_undostack.setClean(); }
-
-qint64 QHexDocument::length() const {
-    return m_buffer ? m_buffer->length() : 0;
-}
-
-uchar QHexDocument::at(int offset) const { return m_buffer->at(offset); }
-
-QHexDocument* QHexDocument::fromFile(QString filename, QObject* parent) {
-    QFile f(filename);
-    f.open(QFile::ReadOnly);
-    return QHexDocument::fromMemory<QMemoryBuffer>(f.readAll(), parent);
-}
-
-void QHexDocument::undo() {
-    m_undostack.undo();
-    Q_EMIT changed();
-}
-
-void QHexDocument::redo() {
-    m_undostack.redo();
-    Q_EMIT changed();
-}
-
-void QHexDocument::insert(qint64 offset, uchar b) {
-    this->insert(offset, QByteArray(1, b));
-}
-
-void QHexDocument::replace(qint64 offset, uchar b) {
-    this->replace(offset, QByteArray(1, b));
-}
-
-void QHexDocument::insert(qint64 offset, const QByteArray& data) {
-    m_undostack.push(new InsertCommand(m_buffer, this, offset, data));
-
-    Q_EMIT changed();
-    Q_EMIT dataChanged(data, offset, ChangeReason::Insert);
-}
-
-void QHexDocument::replace(qint64 offset, const QByteArray& data) {
-    m_undostack.push(new ReplaceCommand(m_buffer, this, offset, data));
-    Q_EMIT changed();
-    Q_EMIT dataChanged(data, offset, ChangeReason::Replace);
-}
-
-void QHexDocument::remove(qint64 offset, int len) {
-    QByteArray data = m_buffer->read(offset, len);
-
-    m_undostack.push(new RemoveCommand(m_buffer, this, offset, len));
-    Q_EMIT changed();
-    Q_EMIT dataChanged(data, offset, ChangeReason::Remove);
-}
-
-QByteArray QHexDocument::read(qint64 offset, int len) const {
-    return m_buffer->read(offset, len);
-}
-
-bool QHexDocument::saveTo(QIODevice* device) {
-    if(!device->isWritable())
-        return false;
-    m_buffer->write(device);
-    return true;
-}
-
-QHexDocument* QHexDocument::fromBuffer(QHexBuffer* buffer, QObject* parent) {
-    return new QHexDocument(buffer, parent);
-}
-
-QHexDocument* QHexDocument::fromLargeFile(QString filename, QObject* parent) {
-    return QHexDocument::fromDevice<QDeviceBuffer>(new QFile(filename), parent);
-}
-
-QHexDocument* QHexDocument::fromMappedFile(QString filename, QObject* parent) {
-    return QHexDocument::fromDevice<QMappedFileBuffer>(new QFile(filename),
-                                                       parent);
-}
-
-QHexDocument* QHexDocument::create(QObject* parent) {
-    return QHexDocument::fromMemory<QMemoryBuffer>({}, parent);
-}

UEFITool/QHexView/src/model/qhexmetadata.cpp

@@ -1,158 +0,0 @@
-#include <QHexView/model/qhexcursor.h>
-#include <QHexView/model/qhexmetadata.h>
-
-QHexMetadata::QHexMetadata(const QHexOptions* options, QObject* parent)
-    : QObject(parent), m_options(options) {}
-
-const QHexMetadataLine* QHexMetadata::find(qint64 line) const {
-    auto it = m_metadata.find(line);
-    return it != m_metadata.end() ? std::addressof(it.value()) : nullptr;
-}
-
-QString QHexMetadata::getComment(qint64 line, qint64 column) const {
-    auto* metadataline = this->find(line);
-    if(!metadataline)
-        return QString();
-
-    auto offset = QHexUtils::positionToOffset(m_options, {line, column});
-    QStringList comments;
-
-    for(auto& mi : *metadataline) {
-        if((offset < mi.begin || offset > mi.end) || mi.comment.isEmpty())
-            continue;
-        comments.push_back(mi.comment);
-    }
-
-    return comments.join("\n");
-}
-
-void QHexMetadata::removeMetadata(qint64 line) {
-    auto it = m_metadata.find(line);
-    if(it == m_metadata.end())
-        return;
-
-    m_metadata.erase(it);
-    Q_EMIT changed();
-}
-
-void QHexMetadata::removeBackground(qint64 line) {
-    this->clearMetadata(line, [](QHexMetadataItem& mi) -> bool {
-        if(!mi.background.isValid())
-            return false;
-
-        if(mi.foreground.isValid() || !mi.comment.isEmpty()) {
-            mi.background = QColor();
-            return false;
-        }
-
-        return true;
-    });
-}
-
-void QHexMetadata::removeForeground(qint64 line) {
-    this->clearMetadata(line, [](QHexMetadataItem& mi) -> bool {
-        if(!mi.foreground.isValid())
-            return false;
-
-        if(mi.background.isValid() || !mi.comment.isEmpty()) {
-            mi.foreground = QColor();
-            return false;
-        }
-
-        return true;
-    });
-}
-
-void QHexMetadata::removeComments(qint64 line) {
-    this->clearMetadata(line, [](QHexMetadataItem& mi) -> bool {
-        if(mi.comment.isEmpty())
-            return false;
-
-        if(mi.foreground.isValid() || mi.background.isValid()) {
-            mi.comment.clear();
-            return false;
-        }
-
-        return true;
-    });
-}
-
-void QHexMetadata::unhighlight(qint64 line) {
-    this->clearMetadata(line, [](QHexMetadataItem& mi) -> bool {
-        if(!mi.foreground.isValid() && !mi.background.isValid())
-            return false;
-
-        if(!mi.comment.isEmpty()) {
-            mi.foreground = QColor();
-            mi.background = QColor();
-            return false;
-        }
-
-        return true;
-    });
-}
-
-void QHexMetadata::clear() {
-    m_metadata.clear();
-    Q_EMIT changed();
-}
-
-void QHexMetadata::copy(const QHexMetadata* metadata) {
-    m_metadata = metadata->m_metadata;
-}
-
-void QHexMetadata::clearMetadata(qint64 line, ClearMetadataCallback&& cb) {
-    auto iit = m_metadata.find(line);
-    if(iit == m_metadata.end())
-        return;
-
-    auto oldsize = iit->size();
-
-    for(auto it = iit->begin(); it != iit->end();) {
-        if(cb(*it))
-            it = iit->erase(it);
-        else
-            it++;
-    }
-
-    if(iit->empty()) {
-        this->removeMetadata(line);
-        return;
-    }
-
-    if(oldsize != iit->size())
-        Q_EMIT changed();
-}
-
-void QHexMetadata::setMetadata(const QHexMetadataItem& mi) {
-    if(!m_options->linelength)
-        return;
-
-    const qint64 firstline = mi.begin / m_options->linelength;
-    const qint64 lastline = mi.end / m_options->linelength;
-    bool notify = false;
-
-    for(auto line = firstline; line <= lastline; line++) {
-        auto start = line == firstline ? mi.begin % m_options->linelength : 0;
-        auto length = line == lastline
-                          ? (mi.end % m_options->linelength) - start
-                          : m_options->linelength;
-        if(length <= 0)
-            continue;
-
-        notify = true;
-        m_metadata[line].push_back(mi);
-    }
-
-    if(notify)
-        Q_EMIT changed();
-}
-
-void QHexMetadata::invalidate() {
-    auto oldmetadata = m_metadata;
-    m_metadata.clear();
-
-    for(const QHexMetadataLine& line : oldmetadata)
-        for(const QHexMetadataItem& mi : line)
-            this->setMetadata(mi);
-}

UEFITool/QHexView/src/model/qhexutils.cpp

@@ -1,384 +0,0 @@
-#include <QDataStream>
-#include <QGlobalStatic>
-#include <QHash>
-#include <QHexView/model/qhexoptions.h>
-#include <QHexView/model/qhexutils.h>
-#include <QHexView/qhexview.h>
-#include <QList>
-#include <QtEndian>
-#include <limits>
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-#define QHEXVIEW_VARIANT_EQ(x, t) ((x).metaType().id() == QMetaType::Q##t)
-#else
-#define QHEXVIEW_VARIANT_EQ(x, t) ((x).type() == QVariant::t)
-#endif
-
-#if defined(_WIN32) && _MSC_VER <= 1916 // v141_xp
-#include <ctype.h>
-namespace std {
-using ::tolower;
-}
-#else
-#include <cctype>
-#endif
-
-namespace QHexUtils {
-
-Q_GLOBAL_STATIC_WITH_ARGS(QList<char>, HEXMAP,
-                          ({'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-                            'a', 'b', 'c', 'd', 'e', 'f'}));
-
-bool isHex(char ch) {
-    return (ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'F') ||
-           (ch >= 'a' && ch <= 'f');
-}
-
-namespace PatternUtils {
-
-Q_GLOBAL_STATIC_WITH_ARGS(QString, WILDCARD_BYTE, ("??"))
-
-bool check(QString& p, qint64& len) {
-    static QHash<QString, QPair<QString, size_t>>
-        processed; // Cache processed patterns
-
-    auto it = processed.find(p);
-
-    if(it != processed.end()) {
-        p = it.value().first;
-        len = it.value().second;
-        return true;
-    }
-
-    QString op = p; // Store unprocessed pattern
-    p = p.simplified().replace(" ", "");
-    if(p.isEmpty() || (p.size() % 2))
-        return false;
-
-    int wccount = 0;
-
-    for(auto i = 0; i < p.size() - 2; i += 2) {
-        const auto& hexb = p.mid(i, 2);
-
-        if(hexb == *WILDCARD_BYTE) {
-            wccount++;
-            continue;
-        }
-
-        if(!QHexUtils::isHex(hexb.at(0).toLatin1()) ||
-           !QHexUtils::isHex(hexb.at(1).toLatin1()))
-            return false;
-    }
-
-    if(wccount >= p.size())
-        return false;
-    len = p.size() / 2;
-    processed[op] = qMakePair(p, len); // Cache processed pattern
-    return true;
-}
-
-bool match(const QByteArray& data, const QString& pattern) {
-    for(qint64 i = 0, idx = 0; (i <= (pattern.size() - 2)); i += 2, idx++) {
-        if(idx >= data.size())
-            return false;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        QStringView hexb = QStringView{pattern}.mid(i, 2);
-#else
-        const QStringRef& hexb = pattern.midRef(i, 2);
-#endif
-
-        if(hexb == *WILDCARD_BYTE)
-            continue;
-
-        bool ok = false;
-        auto b = static_cast<char>(hexb.toUInt(&ok, 16));
-        if(!ok || (b != data.at(idx)))
-            return false;
-    }
-
-    return true;
-}
-
-} // namespace PatternUtils
-
-namespace {
-
-unsigned int countBits(uint val) {
-    if(val <= std::numeric_limits<quint8>::max())
-        return QHexFindOptions::Int8;
-    if(val <= std::numeric_limits<quint16>::max())
-        return QHexFindOptions::Int16;
-    if(val <= std::numeric_limits<quint32>::max())
-        return QHexFindOptions::Int32;
-
-    return QHexFindOptions::Int64;
-}
-
-template<typename Function>
-qint64 findIter(qint64 startoffset, QHexFindDirection fd,
-                const QHexView* hexview, Function&& f) {
-    QHexDocument* hexdocument = hexview->hexDocument();
-    qint64 offset = -1;
-
-    QHexFindDirection cfd = fd;
-    if(cfd == QHexFindDirection::All)
-        cfd = QHexFindDirection::Forward;
-
-    qint64 i = startoffset;
-
-    bool restartLoopOnce = true;
-
-    while(offset == -1 &&
-          (cfd == QHexFindDirection::Backward ? (i >= 0)
-                                              : (i < hexdocument->length()))) {
-        if(!f(i, offset))
-            break;
-
-        if(cfd == QHexFindDirection::Backward)
-            i--;
-        else
-            i++;
-
-        if(fd == QHexFindDirection::All && i >= hexdocument->length() &&
-           restartLoopOnce) {
-            i = 0;
-            restartLoopOnce = false;
-        }
-    }
-
-    return offset;
-}
-
-qint64 findDefault(const QByteArray& value, qint64 startoffset,
-                   const QHexView* hexview, unsigned int options,
-                   QHexFindDirection fd) {
-    QHexDocument* hexdocument = hexview->hexDocument();
-    if(value.size() > hexdocument->length())
-        return -1;
-
-    return findIter(
-        startoffset, fd, hexview,
-        [options, value, hexdocument](qint64 idx, qint64& offset) -> bool {
-            for(auto i = 0; i < value.size(); i++) {
-                qint64 curroffset = idx + i;
-
-                if(curroffset >= hexdocument->length()) {
-                    offset = -1;
-                    return false;
-                }
-
-                uchar ch1 = hexdocument->at(curroffset);
-                uchar ch2 = value.at(i);
-
-                if(!(options & QHexFindOptions::CaseSensitive)) {
-                    ch1 = std::tolower(ch1);
-                    ch2 = std::tolower(ch2);
-                }
-
-                if(ch1 != ch2)
-                    break;
-                if(i == value.size() - 1)
-                    offset = idx;
-            }
-
-            return true;
-        });
-}
-
-qint64 findWildcard(QString pattern, qint64 startoffset,
-                    const QHexView* hexview, QHexFindDirection fd,
-                    qint64& patternlen) {
-    QHexDocument* hexdocument = hexview->hexDocument();
-    if(!PatternUtils::check(pattern, patternlen) ||
-       (patternlen >= hexdocument->length()))
-        return -1;
-
-    return findIter(
-        startoffset, fd, hexview,
-        [hexdocument, pattern, patternlen](qint64 idx, qint64& offset) -> bool {
-            if(PatternUtils::match(hexdocument->read(idx, patternlen), pattern))
-                offset = idx;
-            return true;
-        });
-}
-
-QByteArray variantToByteArray(QVariant value, QHexFindMode mode,
-                              unsigned int options) {
-    QByteArray v;
-
-    switch(mode) {
-        case QHexFindMode::Text:
-            if(QHEXVIEW_VARIANT_EQ(value, String))
-                v = value.toString().toUtf8();
-            else if(QHEXVIEW_VARIANT_EQ(value, ByteArray))
-                v = value.toByteArray();
-            break;
-
-        case QHexFindMode::Hex: {
-            if(QHEXVIEW_VARIANT_EQ(value, String)) {
-                qint64 len = 0;
-                auto s = value.toString();
-                if(!PatternUtils::check(s, len))
-                    return {};
-
-                bool ok = true;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-                for(auto i = 0; ok && i < s.size(); i += 2)
-                    v.push_back(static_cast<char>(
-                        QStringView{s}.mid(i, 2).toUInt(&ok, 16)));
-#else
-                for(auto i = 0; ok && i < s.size(); i += 2)
-                    v.push_back(
-                        static_cast<char>(s.midRef(i, 2).toUInt(&ok, 16)));
-#endif
-
-                if(!ok)
-                    return {};
-            }
-            else if(QHEXVIEW_VARIANT_EQ(value, ByteArray))
-                v = value.toByteArray();
-            break;
-        }
-
-        case QHexFindMode::Int: {
-            bool ok = false;
-            uint val = value.toUInt(&ok);
-            if(!ok)
-                return QByteArray{};
-
-            QDataStream ds(&v, QIODevice::WriteOnly);
-
-            if(options & QHexFindOptions::BigEndian) {
-                if(options & QHexFindOptions::Int8)
-                    ds << qToBigEndian<quint8>(val);
-                else if(options & QHexFindOptions::Int16)
-                    ds << qToBigEndian<quint16>(val);
-                else if(options & QHexFindOptions::Int32)
-                    ds << qToBigEndian<quint32>(val);
-                else if(options & QHexFindOptions::Int64)
-                    ds << qToBigEndian<quint64>(val);
-                else
-                    return variantToByteArray(value, mode,
-                                              options | countBits(val));
-            }
-            else {
-                if(options & QHexFindOptions::Int8)
-                    ds << static_cast<quint8>(val);
-                else if(options & QHexFindOptions::Int16)
-                    ds << static_cast<quint16>(val);
-                else if(options & QHexFindOptions::Int32)
-                    ds << static_cast<quint32>(val);
-                else if(options & QHexFindOptions::Int64)
-                    ds << static_cast<quint64>(val);
-                else
-                    return variantToByteArray(value, mode,
-                                              options | countBits(val));
-            }
-
-            break;
-        }
-
-        case QHexFindMode::Float: {
-            bool ok = false;
-            QDataStream ds(&v, QIODevice::WriteOnly);
-            if(options & QHexFindOptions::Float)
-                ds << value.toFloat(&ok);
-            else if(options & QHexFindOptions::Double)
-                ds << value.toDouble(&ok);
-            if(!ok)
-                return {};
-        }
-
-        default: break;
-    }
-
-    return v;
-}
-
-} // namespace
-
-QByteArray toHex(const QByteArray& ba, char sep) {
-    if(ba.isEmpty()) {
-        return QByteArray();
-    }
-
-    QByteArray hex(sep ? (ba.size() * 3 - 1) : (ba.size() * 2),
-                   Qt::Uninitialized);
-
-    for(auto i = 0, o = 0; i < ba.size(); i++) {
-        if(sep && i)
-            hex[o++] = static_cast<uchar>(sep);
-        hex[o++] = HEXMAP->at((ba.at(i) & 0xf0) >> 4);
-        hex[o++] = HEXMAP->at(ba.at(i) & 0x0f);
-    }
-
-    return hex;
-}
-
-QByteArray toHex(const QByteArray& ba) { return QHexUtils::toHex(ba, '\0'); }
-qint64 positionToOffset(const QHexOptions* options, QHexPosition pos) {
-    return options->linelength * pos.line + pos.column;
-}
-QHexPosition offsetToPosition(const QHexOptions* options, qint64 offset) {
-    return {offset / options->linelength, offset % options->linelength};
-}
-
-QPair<qint64, qint64> find(const QHexView* hexview, QVariant value,
-                           qint64 startoffset, QHexFindMode mode,
-                           unsigned int options, QHexFindDirection fd) {
-    qint64 offset = -1, size = 0;
-    if(startoffset == -1)
-        startoffset = static_cast<qint64>(hexview->offset());
-
-    if(mode == QHexFindMode::Hex && QHEXVIEW_VARIANT_EQ(value, String)) {
-        offset = QHexUtils::findWildcard(value.toString(), startoffset, hexview,
-                                         fd, size);
-    }
-    else {
-        auto ba = variantToByteArray(value, mode, options);
-
-        if(!ba.isEmpty()) {
-            offset =
-                QHexUtils::findDefault(ba, startoffset, hexview, options, fd);
-            size = ba.size();
-        }
-        else
-            offset = -1;
-    }
-
-    return {offset, offset > -1 ? size : 0};
-}
-
-bool checkPattern(QString pattern) {
-    qint64 len = 0;
-    return PatternUtils::check(pattern, len);
-}
-
-QPair<qint64, qint64> replace(const QHexView* hexview, QVariant oldvalue,
-                              QVariant newvalue, qint64 startoffset,
-                              QHexFindMode mode, unsigned int options,
-                              QHexFindDirection fd) {
-    auto res =
-        QHexUtils::find(hexview, oldvalue, startoffset, mode, options, fd);
-
-    if(res.first != -1 && res.second > 0) {
-        QHexDocument* hexdocument = hexview->hexDocument();
-        auto ba = variantToByteArray(newvalue, mode, options);
-
-        if(!ba.isEmpty()) {
-            hexdocument->remove(res.first, res.second);
-            hexdocument->insert(res.first, ba);
-            res.second = ba.size();
-        }
-        else {
-            res.first = -1;
-            res.second = 0;
-        }
-    }
-
-    return res;
-}
-
-} // namespace QHexUtils

UEFITool/ffsfinder.cpp

@@ -1,5 +1,5 @@
-/* ffsfinder.cpp
+/* fssfinder.cpp
-
+ 
  Copyright (c) 2015, Nikolaj Schlej. All rights reserved.
  This program and the accompanying materials
  are licensed and made available under the terms and conditions of the BSD License
@@ -19,16 +19,10 @@
 #include <QRegExp>
 #endif
 
-USTATUS FfsFinder::findHexPattern(const UByteArray & hexPattern, const UINT8 mode) {
-    const UModelIndex rootIndex = model->index(0, 0);
-    USTATUS ret = findHexPattern(rootIndex, hexPattern, mode);
-    if (ret != U_SUCCESS)
-        msg(UString("Hex pattern \"") + UString(hexPattern) + UString("\" could not be found"), rootIndex);
-    return ret;
-}
-
 USTATUS FfsFinder::findHexPattern(const UModelIndex & index, const UByteArray & hexPattern, const UINT8 mode)
 {
+    // TODO: use FfsUtils.
+    
     if (!index.isValid())
         return U_SUCCESS;
     
@@ -39,11 +33,9 @@ USTATUS FfsFinder::findHexPattern(const UModelIndex & index, const UByteArray &
     if (hexPattern.count('.') == hexPattern.length())
         return U_SUCCESS;
     
-    USTATUS ret = U_ITEM_NOT_FOUND;
     bool hasChildren = (model->rowCount(index) > 0);
     for (int i = 0; i < model->rowCount(index); i++) {
-        if (U_SUCCESS == findHexPattern(index.model()->index(i, index.column(), index), hexPattern, mode))
+        findHexPattern(index.model()->index(i, index.column(), index), hexPattern, mode);
-            ret = U_SUCCESS;
     }
     
     UByteArray data;
@@ -65,212 +57,173 @@ USTATUS FfsFinder::findHexPattern(const UModelIndex & index, const UByteArray &
     UString hexBody = UString(data.toHex());
 #if QT_VERSION_MAJOR >= 6
     QRegularExpression regexp = QRegularExpression(UString(hexPattern));
-    regexp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
+    regexp.setPatternOptions((QRegularExpression::PatternOptions)0x1);
     QRegularExpressionMatch regexpmatch;
     
-    INT32 offset = (INT32)hexBody.indexOf(regexp, 0, &regexpmatch);
+    INT32 offset = 0;
+    while ((offset = (INT32)hexBody.indexOf(regexp, (qsizetype)offset, &regexpmatch)) != -1)
+    {
 #else
-    QRegExp regexp = QRegExp(UString(hexPattern), Qt::CaseInsensitive);
+        QRegExp regexp = QRegExp(UString(hexPattern), Qt::CaseInsensitive);
-
+        
-    INT32 offset = regexp.indexIn(hexBody);
+        INT32 offset = regexp.indexIn(hexBody);
+        
+        while (offset >= 0) {
 #endif
-    while (offset >= 0) {
+            
-        if (offset % 2 == 0) {
+            if (offset % 2 == 0) {
-            // For patterns that cross header|body boundary, skip patterns entirely located in body, since
+                // For patterns that cross header|body boundary, skip patterns entirely located in body, since
-            // children search above has already found them.
+                // children search above has already found them.
-            if (!(hasChildren && mode == SEARCH_MODE_ALL && offset/2 >= model->header(index).size())) {
+                if (!(hasChildren && mode == SEARCH_MODE_ALL && offset/2 >= model->header(index).size())) {
-                UModelIndex parentFileIndex = model->findParentOfType(index, Types::File);
+                    msg(UString("Hex pattern \"") + UString(hexPattern)
-                UString name = model->name(index);
+                        + UString("\" found as \"") + hexBody.mid(offset, hexPattern.length()).toUpper()
-                if (model->parent(index) == parentFileIndex) {
+                        + UString("\" in ") + model->name(model->parent(index))
-                    name = model->name(parentFileIndex) + UString("/") + name;
+                        + UString("/") + model->name(index)
+                        + usprintf(" at %s-offset %02Xh", mode == SEARCH_MODE_BODY ? "body" : "header", offset / 2),
+                        index);
                 }
-                else if (parentFileIndex.isValid()) {
+            }
-                    name = model->name(parentFileIndex) + UString("/.../") + name;
+            
-                }
+#if QT_VERSION_MAJOR >= 6
-
+            offset += 1;
-                msg(UString("Hex pattern \"") + UString(hexPattern)
+#else
+            offset = regexp.indexIn(hexBody, offset + 1);
+#endif
+        }
+        
+        return U_SUCCESS;
+    }
+    
+    USTATUS FfsFinder::findGuidPattern(const UModelIndex & index, const UByteArray & guidPattern, const UINT8 mode)
+    {
+        if (guidPattern.isEmpty())
+            return U_INVALID_PARAMETER;
+        
+        if (!index.isValid())
+            return U_SUCCESS;
+        
+        bool hasChildren = (model->rowCount(index) > 0);
+        for (int i = 0; i < model->rowCount(index); i++) {
+            findGuidPattern(index.model()->index(i, index.column(), index), guidPattern, mode);
+        }
+        
+        UByteArray data;
+        if (hasChildren) {
+            if (mode != SEARCH_MODE_BODY)
+                data = model->header(index);
+        }
+        else {
+            if (mode == SEARCH_MODE_HEADER)
+                data.append(model->header(index));
+            else if (mode == SEARCH_MODE_BODY)
+                data.append(model->body(index));
+            else
+                data.append(model->header(index)).append(model->body(index));
+        }
+        
+        UString hexBody = UString(data.toHex());
+        QList<UByteArray> list = guidPattern.split('-');
+        if (list.count() != 5)
+            return U_INVALID_PARAMETER;
+        
+        UByteArray hexPattern;
+        // Reverse first GUID block
+        hexPattern.append(list.at(0).mid(6, 2));
+        hexPattern.append(list.at(0).mid(4, 2));
+        hexPattern.append(list.at(0).mid(2, 2));
+        hexPattern.append(list.at(0).mid(0, 2));
+        // Reverse second GUID block
+        hexPattern.append(list.at(1).mid(2, 2));
+        hexPattern.append(list.at(1).mid(0, 2));
+        // Reverse third GUID block
+        hexPattern.append(list.at(2).mid(2, 2));
+        hexPattern.append(list.at(2).mid(0, 2));
+        // Append fourth and fifth GUID blocks as is
+        hexPattern.append(list.at(3)).append(list.at(4));
+        
+        // Check for "all substrings" pattern
+        if (hexPattern.count('.') == hexPattern.length())
+            return U_SUCCESS;
+        
+#if QT_VERSION_MAJOR >= 6
+        QRegularExpression regexp((QString)UString(hexPattern));
+        regexp.setPatternOptions((QRegularExpression::PatternOptions)0x1);
+        QRegularExpressionMatch regexpmatch;
+        
+        INT32 offset = 0;
+        offset = (INT32)hexBody.indexOf(regexp, (qsizetype)offset, &regexpmatch);
+#else
+        QRegExp regexp(UString(hexPattern), Qt::CaseInsensitive);
+        
+        INT32 offset = regexp.indexIn(hexBody);
+#endif
+        
+        while (offset >= 0) {
+            if (offset % 2 == 0) {
+                msg(UString("GUID pattern \"") + UString(guidPattern)
                     + UString("\" found as \"") + hexBody.mid(offset, hexPattern.length()).toUpper()
-                    + UString("\" in ") + name
+                    + UString("\" in ") + model->name(model->parent(index))
+                    + UString("/") + model->name(index)
                     + usprintf(" at %s-offset %02Xh", mode == SEARCH_MODE_BODY ? "body" : "header", offset / 2),
                     index);
-                ret = U_SUCCESS;
             }
+            
+#if QT_VERSION_MAJOR >= 6
+            offset = (INT32)hexBody.indexOf(regexp, (qsizetype)offset + 1, &regexpmatch);
+#else
+            offset = regexp.indexIn(hexBody, offset + 1);
+#endif
         }
-
+        
-#if QT_VERSION_MAJOR >= 6
-        offset = (INT32)hexBody.indexOf(regexp, (qsizetype)offset + 1, &regexpmatch);
-#else
-        offset = regexp.indexIn(hexBody, offset + 1);
-#endif
-    }
-
-    return ret;
-}
-
-USTATUS FfsFinder::findGuidPattern(const UByteArray & guidPattern, const UINT8 mode) {
-    const UModelIndex rootIndex = model->index(0, 0);
-    USTATUS ret = findGuidPattern(rootIndex, guidPattern, mode);
-    if (ret != U_SUCCESS)
-        msg(UString("GUID pattern \"") + UString(guidPattern) + UString("\" could not be found"), rootIndex);
-    return ret;
-}
-
-USTATUS FfsFinder::findGuidPattern(const UModelIndex & index, const UByteArray & guidPattern, const UINT8 mode)
-{
-    if (guidPattern.isEmpty())
-        return U_INVALID_PARAMETER;
-
-    if (!index.isValid())
         return U_SUCCESS;
-
-    USTATUS ret = U_ITEM_NOT_FOUND;
-    bool hasChildren = (model->rowCount(index) > 0);
-    for (int i = 0; i < model->rowCount(index); i++) {
-        if (U_SUCCESS == findGuidPattern(index.model()->index(i, index.column(), index), guidPattern, mode))
-            ret = U_SUCCESS;
     }
-
+    
-    UByteArray data;
+    USTATUS FfsFinder::findTextPattern(const UModelIndex & index, const UString & pattern, const UINT8 mode, const bool unicode, const Qt::CaseSensitivity caseSensitive)
-    if (hasChildren) {
+    {
-        if (mode != SEARCH_MODE_BODY)
+        if (pattern.isEmpty())
-            data = model->header(index);
+            return U_INVALID_PARAMETER;
-    }
+        
-    else {
+        if (!index.isValid())
-        if (mode == SEARCH_MODE_HEADER)
+            return U_SUCCESS;
-            data.append(model->header(index));
+        
-        else if (mode == SEARCH_MODE_BODY)
+        bool hasChildren = (model->rowCount(index) > 0);
-            data.append(model->body(index));
+        for (int i = 0; i < model->rowCount(index); i++) {
+            findTextPattern(index.model()->index(i, index.column(), index), pattern, mode, unicode, caseSensitive);
+        }
+        
+        UByteArray body;
+        if (hasChildren) {
+            if (mode != SEARCH_MODE_BODY)
+                body = model->header(index);
+        }
+        else {
+            if (mode == SEARCH_MODE_HEADER)
+                body.append(model->header(index));
+            else if (mode == SEARCH_MODE_BODY)
+                body.append(model->body(index));
+            else
+                body.append(model->header(index)).append(model->body(index));
+        }
+        
+        UString data;
+        if (unicode)
+#if QT_VERSION_MAJOR >= 6
+            data = UString::fromUtf16((const char16_t*)body.constData(), (int)(body.length() / 2));
+#else
+        data = UString::fromUtf16((const ushort*)body.constData(), (int)(body.length() / 2));
+#endif
         else
-            data.append(model->header(index)).append(model->body(index));
+            data = UString::fromLatin1((const char*)body.constData(), body.length());
-    }
+        
-
+        int offset = -1;
-    UString hexBody = UString(data.toHex());
+        while ((offset = (int)data.indexOf(pattern, (int)(offset + 1), caseSensitive)) >= 0) {
-    QList<UByteArray> list = guidPattern.split('-');
+            
-    if (list.count() != 5)
+            msg((unicode ? UString("Unicode") : UString("ASCII")) + UString(" text \"") + UString(pattern)
-        return U_INVALID_PARAMETER;
+                + UString("\" in ") + model->name(model->parent(index))
-
+                + UString("/") + model->name(index)
-    UByteArray hexPattern;
+                + usprintf(" at %s-offset %02Xh", mode == SEARCH_MODE_BODY ? "body" : "header", (unicode ? offset * 2 : offset)),
-    // Reverse first GUID block
-    hexPattern.append(list.at(0).mid(6, 2));
-    hexPattern.append(list.at(0).mid(4, 2));
-    hexPattern.append(list.at(0).mid(2, 2));
-    hexPattern.append(list.at(0).mid(0, 2));
-    // Reverse second GUID block
-    hexPattern.append(list.at(1).mid(2, 2));
-    hexPattern.append(list.at(1).mid(0, 2));
-    // Reverse third GUID block
-    hexPattern.append(list.at(2).mid(2, 2));
-    hexPattern.append(list.at(2).mid(0, 2));
-    // Append fourth and fifth GUID blocks as is
-    hexPattern.append(list.at(3)).append(list.at(4));
-
-    // Check for "all substrings" pattern
-    if (hexPattern.count('.') == hexPattern.length())
-        return U_SUCCESS;
-
-#if QT_VERSION_MAJOR >= 6
-    QRegularExpression regexp((QString)UString(hexPattern));
-    regexp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
-    QRegularExpressionMatch regexpmatch;
-
-    INT32 offset = (INT32)hexBody.indexOf(regexp, 0, &regexpmatch);
-#else
-    QRegExp regexp(UString(hexPattern), Qt::CaseInsensitive);
-
-    INT32 offset = regexp.indexIn(hexBody);
-#endif
-    while (offset >= 0) {
-        if (offset % 2 == 0) {
-            UModelIndex parentFileIndex = model->findParentOfType(index, Types::File);
-            UString name = model->name(index);
-            if (model->parent(index) == parentFileIndex) {
-                name = model->name(parentFileIndex) + UString("/") + name;
-            }
-            else if (parentFileIndex.isValid()) {
-                name = model->name(parentFileIndex) + UString("/.../") + name;
-            }
-
-            msg(UString("GUID pattern \"") + UString(guidPattern)
-                + UString("\" found as \"") + hexBody.mid(offset, hexPattern.length()).toUpper()
-                + UString("\" in ") + name
-                + usprintf(" at %s-offset %02Xh", mode == SEARCH_MODE_BODY ? "body" : "header", offset / 2),
                 index);
-            ret = U_SUCCESS;
         }
-
+        
-#if QT_VERSION_MAJOR >= 6
-        offset = (INT32)hexBody.indexOf(regexp, (qsizetype)offset + 1, &regexpmatch);
-#else
-        offset = regexp.indexIn(hexBody, offset + 1);
-#endif
-    }
-
-    return ret;
-}
-
-USTATUS FfsFinder::findTextPattern(const UString & pattern, const UINT8 mode, const bool unicode, const Qt::CaseSensitivity caseSensitive) {
-    const UModelIndex rootIndex = model->index(0, 0);
-    USTATUS ret = findTextPattern(rootIndex, pattern, mode, unicode, caseSensitive);
-    if (ret != U_SUCCESS)
-        msg((unicode ? UString("Unicode") : UString("ASCII")) + UString(" text \"")
-            + UString(pattern) + UString("\" could not be found"), rootIndex);
-    return ret;
-}
-
-USTATUS FfsFinder::findTextPattern(const UModelIndex & index, const UString & pattern, const UINT8 mode, const bool unicode, const Qt::CaseSensitivity caseSensitive)
-{
-    if (pattern.isEmpty())
-        return U_INVALID_PARAMETER;
-
-    if (!index.isValid())
         return U_SUCCESS;
-
-    USTATUS ret = U_ITEM_NOT_FOUND;
-    bool hasChildren = (model->rowCount(index) > 0);
-    for (int i = 0; i < model->rowCount(index); i++) {
-        if (U_SUCCESS == findTextPattern(index.model()->index(i, index.column(), index), pattern, mode, unicode, caseSensitive))
-            ret = U_SUCCESS;
     }
-
-    UByteArray body;
-    if (hasChildren) {
-        if (mode != SEARCH_MODE_BODY)
-            body = model->header(index);
-    }
-    else {
-        if (mode == SEARCH_MODE_HEADER)
-            body.append(model->header(index));
-        else if (mode == SEARCH_MODE_BODY)
-            body.append(model->body(index));
-        else
-            body.append(model->header(index)).append(model->body(index));
-    }
-
-    UString data = UString::fromLatin1((const char*)body.constData(), body.length());
-
-    UString searchPattern;
-    if (unicode)
-        searchPattern = UString::fromLatin1((const char*)pattern.utf16(), pattern.length() * 2);
-    else
-        searchPattern = pattern;
-
-    int offset = -1;
-    while ((offset = (int)data.indexOf(searchPattern, (int)(offset + 1), caseSensitive)) >= 0) {
-        UModelIndex parentFileIndex = model->findParentOfType(index, Types::File);
-        UString name = model->name(index);
-        if (model->parent(index) == parentFileIndex) {
-            name = model->name(parentFileIndex) + UString("/") + name;
-        }
-        else if (parentFileIndex.isValid()) {
-            name = model->name(parentFileIndex) + UString("/.../") + name;
-        }
-
-        msg((unicode ? UString("Unicode") : UString("ASCII")) + UString(" text \"") + UString(pattern)
-            + UString("\" found in ") + name
-            + usprintf(" at %s-offset %02Xh", mode == SEARCH_MODE_BODY ? "body" : "header", offset),
-            index);
-        ret = U_SUCCESS;
-    }
-
-    return ret;
-}

UEFITool/ffsfinder.h

@@ -30,9 +30,9 @@ public:
     std::vector<std::pair<UString, UModelIndex> > getMessages() const { return messagesVector; }
     void clearMessages() { messagesVector.clear(); }
 
-    USTATUS findHexPattern(const UByteArray & hexPattern, const UINT8 mode);
+    USTATUS findHexPattern(const UModelIndex & index, const UByteArray & hexPattern, const UINT8 mode);
-    USTATUS findGuidPattern(const UByteArray & guidPattern, const UINT8 mode);
+    USTATUS findGuidPattern(const UModelIndex & index, const UByteArray & guidPattern, const UINT8 mode);
-    USTATUS findTextPattern(const UString & pattern, const UINT8 mode, const bool unicode, const Qt::CaseSensitivity caseSensitive);
+    USTATUS findTextPattern(const UModelIndex & index, const UString & pattern, const UINT8 mode, const bool unicode, const Qt::CaseSensitivity caseSensitive);
 
 private:
     const TreeModel* model;
@@ -41,10 +41,6 @@ private:
     void msg(const UString & message, const UModelIndex &index = UModelIndex()) {
         messagesVector.push_back(std::pair<UString, UModelIndex>(message, index));
     }
-
-    USTATUS findHexPattern(const UModelIndex & index, const UByteArray & hexPattern, const UINT8 mode);
-    USTATUS findGuidPattern(const UModelIndex & index, const UByteArray & guidPattern, const UINT8 mode);
-    USTATUS findTextPattern(const UModelIndex & index, const UString & pattern, const UINT8 mode, const bool unicode, const Qt::CaseSensitivity caseSensitive);
 };
 
 #endif // FFSFINDER_H

UEFITool/gotoaddressdialog.h

@@ -1,16 +1,3 @@
-/* gotoaddressdialog.h
-
-  Copyright (c) 2018, Nikolaj Schlej. All rights reserved.
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  */
-
 #ifndef GOTOADDRESSDIALOG_H
 #define GOTOADDRESSDIALOG_H
 

UEFITool/gotobasedialog.h

@@ -1,16 +1,3 @@
-/* gotobasedialog.h
-
-  Copyright (c) 2018, Nikolaj Schlej. All rights reserved.
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  */
-
 #ifndef GOTOBASEDIALOG_H
 #define GOTOBASEDIALOG_H
 

UEFITool/guidlineedit.cpp

@@ -1,4 +1,4 @@
-/* hexlineedit.cpp
+/* guidlineedit.cpp
  
  Copyright (c) 2014, Nikolaj Schlej. All rights reserved.
  This program and the accompanying materials
@@ -11,36 +11,25 @@
  
  */
 
-#include "hexlineedit.h"
+#include "guidlineedit.h"
 
-#if QT_VERSION_MAJOR >= 6
+GuidLineEdit::GuidLineEdit(QWidget * parent)
-#include <QRegularExpression>
-#else
-#include <QRegExp>
-#endif
-
-HexLineEdit::HexLineEdit(QWidget * parent)
 :QLineEdit(parent)
 {
-    m_editAsGuid = false;
 }
 
-HexLineEdit::HexLineEdit(const QString & contents, QWidget * parent)
+GuidLineEdit::GuidLineEdit(const QString & contents, QWidget * parent)
 :QLineEdit(contents, parent)
 {
-    m_editAsGuid = false;
 }
 
-HexLineEdit::~HexLineEdit()
+GuidLineEdit::~GuidLineEdit()
 {
 }
 
-void HexLineEdit::keyPressEvent(QKeyEvent * event)
+void GuidLineEdit::keyPressEvent(QKeyEvent * event)
 {
-    QClipboard *clipboard;
+    if (event == QKeySequence::Delete || event->key() == Qt::Key_Backspace)
-    QString originalText;
-
-    if (m_editAsGuid && (event == QKeySequence::Delete || event->key() == Qt::Key_Backspace))
     {
         int pos = cursorPosition();
         if (event->key() == Qt::Key_Backspace && pos > 0) {
@@ -67,19 +56,6 @@ void HexLineEdit::keyPressEvent(QKeyEvent * event)
         
         return;
     }
-
-    if (event == QKeySequence::Paste)
-    {
-        clipboard = QApplication::clipboard();
-        originalText = clipboard->text();
-        QString cleanedHex = QString(originalText).replace(QString("0x"), QString(""), Qt::CaseInsensitive);
-#if QT_VERSION_MAJOR >= 6
-        cleanedHex.remove(QRegularExpression("[^a-fA-F\\d]+"));
-#else
-        cleanedHex.remove(QRegExp("[^a-fA-F\\d]+"));
-#endif
-        clipboard->setText(cleanedHex);
-    }
     
     // Call original event handler
     QLineEdit::keyPressEvent(event);

UEFITool/guidlineedit.h

@@ -1,4 +1,4 @@
-/* hexlineedit.h
+/* guidlineedit.h
 
   Copyright (c) 2014, Nikolaj Schlej. All rights reserved.
   This program and the accompanying materials
@@ -11,11 +11,9 @@
 
   */
 
-#ifndef HEXLINEEDIT_H
+#ifndef GUIDLINEEDIT_H
-#define HEXLINEEDIT_H
+#define GUIDLINEEDIT_H
 
-#include <QApplication>
-#include <QClipboard>
 #include <QLineEdit>
 #include <QKeyEvent>
 #include <QKeySequence>
@@ -23,29 +21,16 @@
 
 #include "../common/basetypes.h"
 
-class HexLineEdit : public QLineEdit
+class GuidLineEdit : public QLineEdit
 {
-     Q_OBJECT
-     Q_PROPERTY(bool editAsGuid READ editAsGuid WRITE setEditAsGuid)
-
 public:
-    HexLineEdit(QWidget * parent = 0);
+    GuidLineEdit(QWidget * parent = 0);
-    HexLineEdit(const QString & contents, QWidget * parent = 0);
+    GuidLineEdit(const QString & contents, QWidget * parent = 0);
-    ~HexLineEdit();
+    ~GuidLineEdit();
-
-    void setEditAsGuid(bool editAsGuid)
-    {
-        m_editAsGuid = editAsGuid;
-    }
-    bool editAsGuid() const
-    { return m_editAsGuid; }
-
-private:
-    bool m_editAsGuid;
 
 protected:
     void keyPressEvent(QKeyEvent * event);
 
 };
 
-#endif // HEXLINEEDIT_H
+#endif // GUIDLINEEDIT_H

UEFITool/hexviewdialog.cpp

@@ -20,8 +20,9 @@ hexView(NULL)
 {
     // Create UI
     ui->setupUi(this);
-    hexView = new QHexView(this);
+    hexView = new QHexEdit(this);
     hexView->setReadOnly(true);
+    hexView->setUpperCase(true);
     ui->layout->addWidget(hexView);
 }
 
@@ -64,5 +65,4 @@ void HexViewDialog::setItem(const UModelIndex & index, HexViewType type)
     dialogTitle += itemText.isEmpty() ? itemName : itemName + " | " + itemText;
     setWindowTitle(dialogTitle);
     hexView->setData(hexdata);
-    hexView->setFont(QApplication::font());
 }

UEFITool/hexviewdialog.h

@@ -15,8 +15,8 @@
 #define HEXVIEWDIALOG_H
 
 #include <QDialog>
-#include <QHexView/qhexview.h>
 #include "../common/treemodel.h"
+#include "qhexedit2/qhexedit.h"
 #include "ui_hexviewdialog.h"
 
 class HexViewDialog : public QDialog
@@ -38,7 +38,7 @@ public:
     void setFont(const QFont &font);
     
 private:
-    QHexView * hexView;
+    QHexEdit * hexView;
 };
 
 #endif // HEXVIEWDIALOG_H

UEFITool/qhexedit2/chunks.cpp

@@ -0,0 +1,323 @@
+#include "chunks.h"
+#include <limits.h>
+
+#define NORMAL 0
+#define HIGHLIGHTED 1
+
+#define BUFFER_SIZE 0x10000
+#define CHUNK_SIZE 0x1000
+#define READ_CHUNK_MASK Q_INT64_C(0xfffffffffffff000)
+
+// ***************************************** Constructors and file settings
+
+Chunks::Chunks(QObject *parent): QObject(parent)
+{
+    QBuffer *buf = new QBuffer(this);
+    setIODevice(*buf);
+}
+
+Chunks::Chunks(QIODevice &ioDevice, QObject *parent): QObject(parent)
+{
+    setIODevice(ioDevice);
+}
+
+bool Chunks::setIODevice(QIODevice &ioDevice)
+{
+    _ioDevice = &ioDevice;
+    bool ok = _ioDevice->open(QIODevice::ReadOnly);
+    if (ok)   // Try to open IODevice
+    {
+        _size = _ioDevice->size();
+        _ioDevice->close();
+    }
+    else                                        // Fallback is an empty buffer
+    {
+        QBuffer *buf = new QBuffer(this);
+        _ioDevice = buf;
+        _size = 0;
+    }
+    _chunks.clear();
+    _pos = 0;
+    return ok;
+}
+
+
+// ***************************************** Getting data out of Chunks
+
+QByteArray Chunks::data(qint64 pos, qint64 maxSize, QByteArray *highlighted)
+{
+    qint64 ioDelta = 0;
+    int chunkIdx = 0;
+
+    Chunk chunk;
+    QByteArray buffer;
+
+    // Do some checks and some arrangements
+    if (highlighted)
+        highlighted->clear();
+
+    if (pos >= _size)
+        return buffer;
+
+    if (maxSize < 0)
+        maxSize = _size;
+    else
+        if ((pos + maxSize) > _size)
+            maxSize = _size - pos;
+
+    _ioDevice->open(QIODevice::ReadOnly);
+
+    while (maxSize > 0)
+    {
+        chunk.absPos = LLONG_MAX;
+        bool chunksLoopOngoing = true;
+        while ((chunkIdx < _chunks.count()) && chunksLoopOngoing)
+        {
+            // In this section, we track changes before our required data and
+            // we take the editdet data, if availible. ioDelta is a difference
+            // counter to justify the read pointer to the original data, if
+            // data in between was deleted or inserted.
+
+            chunk = _chunks[chunkIdx];
+            if (chunk.absPos > pos)
+                chunksLoopOngoing = false;
+            else
+            {
+                chunkIdx += 1;
+                qint64 count;
+                qint64 chunkOfs = pos - chunk.absPos;
+                if (maxSize > ((qint64)chunk.data.size() - chunkOfs))
+                {
+                    count = (qint64)chunk.data.size() - chunkOfs;
+                    ioDelta += CHUNK_SIZE - chunk.data.size();
+                }
+                else
+                    count = maxSize;
+                if (count > 0)
+                {
+                    buffer += chunk.data.mid((int)chunkOfs, (int)count);
+                    maxSize -= count;
+                    pos += count;
+                    if (highlighted)
+                        *highlighted += chunk.dataChanged.mid((int)chunkOfs, (int)count);
+                }
+            }
+        }
+
+        if ((maxSize > 0) && (pos < chunk.absPos))
+        {
+            // In this section, we read data from the original source. This only will
+            // happen, whe no copied data is available
+
+            qint64 byteCount;
+            QByteArray readBuffer;
+            if ((chunk.absPos - pos) > maxSize)
+                byteCount = maxSize;
+            else
+                byteCount = chunk.absPos - pos;
+
+            maxSize -= byteCount;
+            _ioDevice->seek(pos + ioDelta);
+            readBuffer = _ioDevice->read(byteCount);
+            buffer += readBuffer;
+            if (highlighted)
+                *highlighted += QByteArray(readBuffer.size(), NORMAL);
+            pos += readBuffer.size();
+        }
+    }
+    _ioDevice->close();
+    return buffer;
+}
+
+bool Chunks::write(QIODevice &iODevice, qint64 pos, qint64 count)
+{
+    if (count == -1)
+        count = _size;
+    bool ok = iODevice.open(QIODevice::WriteOnly);
+    if (ok)
+    {
+        for (qint64 idx=pos; idx < count; idx += BUFFER_SIZE)
+        {
+            QByteArray ba = data(idx, BUFFER_SIZE);
+            iODevice.write(ba);
+        }
+        iODevice.close();
+    }
+    return ok;
+}
+
+
+// ***************************************** Set and get highlighting infos
+
+void Chunks::setDataChanged(qint64 pos, bool dataChanged)
+{
+    if ((pos < 0) || (pos >= _size))
+        return;
+    int chunkIdx = getChunkIndex(pos);
+    qint64 posInBa = pos - _chunks[chunkIdx].absPos;
+    _chunks[chunkIdx].dataChanged[(int)posInBa] = char(dataChanged);
+}
+
+bool Chunks::dataChanged(qint64 pos)
+{
+    QByteArray highlighted;
+    data(pos, 1, &highlighted);
+    return bool(highlighted.at(0));
+}
+
+
+// ***************************************** Search API
+
+qint64 Chunks::indexOf(const QByteArray &ba, qint64 from)
+{
+    qint64 result = -1;
+    QByteArray buffer;
+
+    for (qint64 pos=from; (pos < _size) && (result < 0); pos += BUFFER_SIZE)
+    {
+        buffer = data(pos, BUFFER_SIZE + ba.size() - 1);
+        int findPos = (int)buffer.indexOf(ba);
+        if (findPos >= 0)
+            result = pos + (qint64)findPos;
+    }
+    return result;
+}
+
+qint64 Chunks::lastIndexOf(const QByteArray &ba, qint64 from)
+{
+    qint64 result = -1;
+    QByteArray buffer;
+
+    for (qint64 pos=from; (pos > 0) && (result < 0); pos -= BUFFER_SIZE)
+    {
+        qint64 sPos = pos - BUFFER_SIZE - (qint64)ba.size() + 1;
+        if (sPos < 0)
+            sPos = 0;
+        buffer = data(sPos, pos - sPos);
+        int findPos = (int)buffer.lastIndexOf(ba);
+        if (findPos >= 0)
+            result = sPos + (qint64)findPos;
+    }
+    return result;
+}
+
+
+// ***************************************** Char manipulations
+
+bool Chunks::insert(qint64 pos, char b)
+{
+    if ((pos < 0) || (pos > _size))
+        return false;
+    int chunkIdx;
+    if (pos == _size)
+        chunkIdx = getChunkIndex(pos-1);
+    else
+        chunkIdx = getChunkIndex(pos);
+    qint64 posInBa = pos - _chunks[chunkIdx].absPos;
+    _chunks[chunkIdx].data.insert((int)posInBa, b);
+    _chunks[chunkIdx].dataChanged.insert((int)posInBa, char(1));
+    for (int idx=chunkIdx+1; idx < _chunks.size(); idx++)
+        _chunks[idx].absPos += 1;
+    _size += 1;
+    _pos = pos;
+    return true;
+}
+
+bool Chunks::overwrite(qint64 pos, char b)
+{
+    if ((pos < 0) || (pos >= _size))
+        return false;
+    int chunkIdx = getChunkIndex(pos);
+    qint64 posInBa = pos - _chunks[chunkIdx].absPos;
+    _chunks[chunkIdx].data[(int)posInBa] = b;
+    _chunks[chunkIdx].dataChanged[(int)posInBa] = char(1);
+    _pos = pos;
+    return true;
+}
+
+bool Chunks::removeAt(qint64 pos)
+{
+    if ((pos < 0) || (pos >= _size))
+        return false;
+    int chunkIdx = getChunkIndex(pos);
+    qint64 posInBa = pos - _chunks[chunkIdx].absPos;
+    _chunks[chunkIdx].data.remove((int)posInBa, 1);
+    _chunks[chunkIdx].dataChanged.remove((int)posInBa, 1);
+    for (int idx=chunkIdx+1; idx < _chunks.size(); idx++)
+        _chunks[idx].absPos -= 1;
+    _size -= 1;
+    _pos = pos;
+    return true;
+}
+
+
+// ***************************************** Utility functions
+
+char Chunks::operator[](qint64 pos)
+{
+    return data(pos, 1)[0];
+}
+
+qint64 Chunks::pos()
+{
+    return _pos;
+}
+
+qint64 Chunks::size()
+{
+    return _size;
+}
+
+int Chunks::getChunkIndex(qint64 absPos)
+{
+    // This routine checks, if there is already a copied chunk available. If os, it
+    // returns a reference to it. If there is no copied chunk available, original
+    // data will be copied into a new chunk.
+
+    int foundIdx = -1;
+    int insertIdx = 0;
+    qint64 ioDelta = 0;
+
+
+    for (int idx=0; idx < _chunks.size(); idx++)
+    {
+        Chunk chunk = _chunks[idx];
+        if ((absPos >= chunk.absPos) && (absPos < (chunk.absPos + chunk.data.size())))
+        {
+            foundIdx = idx;
+            break;
+        }
+        if (absPos < chunk.absPos)
+        {
+            insertIdx = idx;
+            break;
+        }
+        ioDelta += chunk.data.size() - CHUNK_SIZE;
+        insertIdx = idx + 1;
+    }
+
+    if (foundIdx == -1)
+    {
+        Chunk newChunk;
+        qint64 readAbsPos = absPos - ioDelta;
+        qint64 readPos = (readAbsPos & READ_CHUNK_MASK);
+        _ioDevice->open(QIODevice::ReadOnly);
+        _ioDevice->seek(readPos);
+        newChunk.data = _ioDevice->read(CHUNK_SIZE);
+        _ioDevice->close();
+        newChunk.absPos = absPos - (readAbsPos - readPos);
+        newChunk.dataChanged = QByteArray(newChunk.data.size(), char(0));
+        _chunks.insert(insertIdx, newChunk);
+        foundIdx = insertIdx;
+    }
+    return foundIdx;
+}
+
+
+#ifdef MODUL_TEST
+int Chunks::chunkSize()
+{
+    return _chunks.size();
+}
+
+#endif

UEFITool/qhexedit2/chunks.h

@@ -0,0 +1,77 @@
+#ifndef CHUNKS_H
+#define CHUNKS_H
+
+/** \cond docNever */
+
+/*! The Chunks class is the storage backend for QHexEdit.
+ *
+ * When QHexEdit loads data, Chunks access them using a QIODevice interface. When the app uses
+ * a QByteArray interface, QBuffer is used to provide again a QIODevice like interface. No data
+ * will be changed, therefore Chunks opens the QIODevice in QIODevice::ReadOnly mode. After every
+ * access Chunks closes the QIODevice, that's why external applications can overwrite files while
+ * QHexEdit shows them.
+ *
+ * When the the user starts to edit the data, Chunks creates a local copy of a chunk of data (4
+ * kilobytes) and notes all changes there. Parallel to that chunk, there is a second chunk,
+ * which keep track of which bytes are changed and which not.
+ *
+ */
+
+#include <QtCore>
+
+struct Chunk
+{
+    QByteArray data;
+    QByteArray dataChanged;
+    qint64 absPos;
+};
+
+class Chunks: public QObject
+{
+Q_OBJECT
+public:
+    // Constructors and file settings
+    Chunks(QObject *parent);
+    Chunks(QIODevice &ioDevice, QObject *parent);
+    bool setIODevice(QIODevice &ioDevice);
+
+    // Getting data out of Chunks
+    QByteArray data(qint64 pos=0, qint64 count=-1, QByteArray *highlighted=0);
+    bool write(QIODevice &iODevice, qint64 pos=0, qint64 count=-1);
+
+    // Set and get highlighting infos
+    void setDataChanged(qint64 pos, bool dataChanged);
+    bool dataChanged(qint64 pos);
+
+    // Search API
+    qint64 indexOf(const QByteArray &ba, qint64 from);
+    qint64 lastIndexOf(const QByteArray &ba, qint64 from);
+
+    // Char manipulations
+    bool insert(qint64 pos, char b);
+    bool overwrite(qint64 pos, char b);
+    bool removeAt(qint64 pos);
+
+    // Utility functions
+    char operator[](qint64 pos);
+    qint64 pos();
+    qint64 size();
+
+
+private:
+    int getChunkIndex(qint64 absPos);
+
+    QIODevice * _ioDevice;
+    qint64 _pos;
+    qint64 _size;
+    QList<Chunk> _chunks;
+
+#ifdef MODUL_TEST
+public:
+    int chunkSize();
+#endif
+};
+
+/** \endcond docNever */
+
+#endif // CHUNKS_H

UEFITool/qhexedit2/commands.cpp

@@ -0,0 +1,167 @@
+#include "commands.h"
+#include <QUndoCommand>
+
+
+// Helper class to store single byte commands
+class CharCommand : public QUndoCommand
+{
+public:
+    enum CCmd {insert, removeAt, overwrite};
+
+    CharCommand(Chunks * chunks, CCmd cmd, qint64 charPos, char newChar,
+                       QUndoCommand *parent=0);
+
+    void undo();
+    void redo();
+    bool mergeWith(const QUndoCommand *command);
+    int id() const { return 1234; }
+
+private:
+    Chunks * _chunks;
+    qint64 _charPos;
+    bool _wasChanged;
+    char _newChar;
+    char _oldChar;
+    CCmd _cmd;
+};
+
+CharCommand::CharCommand(Chunks * chunks, CCmd cmd, qint64 charPos, char newChar, QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    _chunks = chunks;
+    _charPos = charPos;
+    _newChar = newChar;
+    _cmd = cmd;
+    _wasChanged = false;
+    _oldChar = ' ';
+}
+
+bool CharCommand::mergeWith(const QUndoCommand *command)
+{
+    const CharCommand *nextCommand = static_cast<const CharCommand *>(command);
+    bool result = false;
+
+    if (_cmd != CharCommand::removeAt)
+    {
+        if (nextCommand->_cmd == overwrite)
+            if (nextCommand->_charPos == _charPos)
+            {
+                _newChar = nextCommand->_newChar;
+                result = true;
+            }
+    }
+    return result;
+}
+
+void CharCommand::undo()
+{
+    switch (_cmd)
+    {
+        case insert:
+            _chunks->removeAt(_charPos);
+            break;
+        case overwrite:
+            _chunks->overwrite(_charPos, _oldChar);
+            _chunks->setDataChanged(_charPos, _wasChanged);
+            break;
+        case removeAt:
+            _chunks->insert(_charPos, _oldChar);
+            _chunks->setDataChanged(_charPos, _wasChanged);
+            break;
+    }
+}
+
+void CharCommand::redo()
+{
+    switch (_cmd)
+    {
+        case insert:
+            _chunks->insert(_charPos, _newChar);
+            break;
+        case overwrite:
+            _oldChar = (*_chunks)[_charPos];
+            _wasChanged = _chunks->dataChanged(_charPos);
+            _chunks->overwrite(_charPos, _newChar);
+            break;
+        case removeAt:
+            _oldChar = (*_chunks)[_charPos];
+            _wasChanged = _chunks->dataChanged(_charPos);
+            _chunks->removeAt(_charPos);
+            break;
+    }
+}
+
+UndoStack::UndoStack(Chunks * chunks, QObject * parent)
+    : QUndoStack(parent)
+{
+    _chunks = chunks;
+    _parent = parent;
+}
+
+void UndoStack::insert(qint64 pos, char c)
+{
+    if ((pos >= 0) && (pos <= _chunks->size()))
+    {
+        QUndoCommand *cc = new CharCommand(_chunks, CharCommand::insert, pos, c);
+        this->push(cc);
+    }
+}
+
+void UndoStack::insert(qint64 pos, const QByteArray &ba)
+{
+    if ((pos >= 0) && (pos <= _chunks->size()))
+    {
+        QString txt = QString(tr("Inserting %1 bytes")).arg(ba.size());
+        beginMacro(txt);
+        for (int idx=0; idx < ba.size(); idx++)
+        {
+            QUndoCommand *cc = new CharCommand(_chunks, CharCommand::insert, pos + idx, ba.at(idx));
+            this->push(cc);
+        }
+        endMacro();
+    }
+}
+
+void UndoStack::removeAt(qint64 pos, qint64 len)
+{
+    if ((pos >= 0) && (pos < _chunks->size()))
+    {
+        if (len==1)
+        {
+            QUndoCommand *cc = new CharCommand(_chunks, CharCommand::removeAt, pos, char(0));
+            this->push(cc);
+        }
+        else
+        {
+            QString txt = QString(tr("Delete %1 chars")).arg(len);
+            beginMacro(txt);
+            for (qint64 cnt=0; cnt<len; cnt++)
+            {
+                QUndoCommand *cc = new CharCommand(_chunks, CharCommand::removeAt, pos, char(0));
+                push(cc);
+            }
+            endMacro();
+        }
+    }
+}
+
+void UndoStack::overwrite(qint64 pos, char c)
+{
+    if ((pos >= 0) && (pos < _chunks->size()))
+    {
+        QUndoCommand *cc = new CharCommand(_chunks, CharCommand::overwrite, pos, c);
+        this->push(cc);
+    }
+}
+
+void UndoStack::overwrite(qint64 pos, int len, const QByteArray &ba)
+{
+    if ((pos >= 0) && (pos < _chunks->size()))
+    {
+        QString txt = QString(tr("Overwrite %1 chars")).arg(len);
+        beginMacro(txt);
+        removeAt(pos, len);
+        insert(pos, ba);
+        endMacro();
+    }
+}

UEFITool/qhexedit2/commands.h

@@ -0,0 +1,47 @@
+#ifndef COMMANDS_H
+#define COMMANDS_H
+
+/** \cond docNever */
+
+#include <QUndoStack>
+
+#include "chunks.h"
+
+/*! CharCommand is a class to provid undo/redo functionality in QHexEdit.
+A QUndoCommand represents a single editing action on a document. CharCommand
+is responsable for manipulations on single chars. It can insert. overwrite and
+remove characters. A manipulation stores allways two actions
+1. redo (or do) action
+2. undo action.
+
+CharCommand also supports command compression via mergeWidht(). This allows
+the user to execute a undo command contation e.g. 3 steps in a single command.
+If you for example insert a new byt "34" this means for the editor doing 3
+steps: insert a "00", overwrite it with "03" and the overwrite it with "34". These
+3 steps are combined into a single step, insert a "34".
+
+The byte array oriented commands are just put into a set of single byte commands,
+which are pooled together with the macroBegin() and macroEnd() functionality of
+Qt's QUndoStack.
+*/
+
+class UndoStack : public QUndoStack
+{
+    Q_OBJECT
+
+public:
+    UndoStack(Chunks *chunks, QObject * parent=0);
+    void insert(qint64 pos, char c);
+    void insert(qint64 pos, const QByteArray &ba);
+    void removeAt(qint64 pos, qint64 len=1);
+    void overwrite(qint64 pos, char c);
+    void overwrite(qint64 pos, int len, const QByteArray &ba);
+
+private:
+    Chunks * _chunks;
+    QObject * _parent;
+};
+
+/** \endcond docNever */
+
+#endif // COMMANDS_H

UEFITool/qhexedit2/license.txt

@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

UEFITool/qhexedit2/qhexedit.h

@@ -0,0 +1,411 @@
+#ifndef QHEXEDIT_H
+#define QHEXEDIT_H
+
+#include <QAbstractScrollArea>
+#include <QPen>
+#include <QBrush>
+
+#include "chunks.h"
+#include "commands.h"
+
+#ifdef QHEXEDIT_EXPORTS
+#define QHEXEDIT_API Q_DECL_EXPORT
+#elif QHEXEDIT_IMPORTS
+#define QHEXEDIT_API Q_DECL_IMPORT
+#else
+#define QHEXEDIT_API
+#endif
+
+/** \mainpage
+QHexEdit is a binary editor widget for Qt.
+
+\version Version 0.8.2
+\image html qhexedit.png
+*/
+
+
+/** QHexEdit is a hex editor widget written in C++ for the Qt (Qt4, Qt5) framework.
+It is a simple editor for binary data, just like QPlainTextEdit is for text
+data. There are sip configuration files included, so it is easy to create
+bindings for PyQt and you can use this widget also in python 2 and 3.
+
+QHexEdit takes the data of a QByteArray (setData()) and shows it. You can use
+the mouse or the keyboard to navigate inside the widget. If you hit the keys
+(0..9, a..f) you will change the data. Changed data is highlighted and can be
+accessed via data().
+
+Normaly QHexEdit works in the overwrite Mode. You can set overwriteMode(false)
+and insert data. In this case the size of data() increases. It is also possible
+to delete bytes (del or backspace), here the size of data decreases.
+
+You can select data with keyboard hits or mouse movements. The copy-key will
+copy the selected data into the clipboard. The cut-key copies also but delets
+it afterwards. In overwrite mode, the paste function overwrites the content of
+the (does not change the length) data. In insert mode, clipboard data will be
+inserted. The clipboard content is expected in ASCII Hex notation. Unknown
+characters will be ignored.
+
+QHexEdit comes with undo/redo functionality. All changes can be undone, by
+pressing the undo-key (usually ctr-z). They can also be redone afterwards.
+The undo/redo framework is cleared, when setData() sets up a new
+content for the editor. You can search data inside the content with indexOf()
+and lastIndexOf(). The replace() function is to change located subdata. This
+'replaced' data can also be undone by the undo/redo framework.
+
+QHexEdit is based on QIODevice, that's why QHexEdit can handle big amounts of
+data. The size of edited data can be more then two gigabytes without any
+restrictions.
+*/
+class QHEXEDIT_API QHexEdit : public QAbstractScrollArea
+{
+    Q_OBJECT
+
+    /*! Property address area switch the address area on or off. Set addressArea true
+    (show it), false (hide it).
+    */
+    Q_PROPERTY(bool addressArea READ addressArea WRITE setAddressArea)
+
+    /*! Property address area color sets (setAddressAreaColor()) the backgorund
+    color of address areas. You can also read the color (addressaAreaColor()).
+    */
+    Q_PROPERTY(QColor addressAreaColor READ addressAreaColor WRITE setAddressAreaColor)
+
+    /*! Property addressOffset is added to the Numbers of the Address Area.
+    A offset in the address area (left side) is sometimes usefull, whe you show
+    only a segment of a complete memory picture. With setAddressOffset() you set
+    this property - with addressOffset() you get the current value.
+    */
+    Q_PROPERTY(qint64 addressOffset READ addressOffset WRITE setAddressOffset)
+
+    /*! Set and get the minimum width of the address area, width in characters.
+    */
+    Q_PROPERTY(int addressWidth READ addressWidth WRITE setAddressWidth)
+
+    /*! Switch the ascii area on (true, show it) or off (false, hide it).
+    */
+    Q_PROPERTY(bool asciiArea READ asciiArea WRITE setAsciiArea)
+
+    /*! Set and get bytes number per line.*/
+    Q_PROPERTY(int bytesPerLine READ bytesPerLine WRITE setBytesPerLine)
+
+    /*! Porperty cursorPosition sets or gets the position of the editor cursor
+    in QHexEdit. Every byte in data has to cursor positions: the lower and upper
+    Nibble. Maximum cursor position is factor two of data.size().
+    */
+    Q_PROPERTY(qint64 cursorPosition READ cursorPosition WRITE setCursorPosition)
+
+    /*! Property data holds the content of QHexEdit. Call setData() to set the
+    content of QHexEdit, data() returns the actual content. When calling setData()
+    with a QByteArray as argument, QHexEdit creates a internal copy of the data
+    If you want to edit big files please use setData(), based on QIODevice.
+    */
+    Q_PROPERTY(QByteArray data READ data WRITE setData NOTIFY dataChanged)
+
+    /*! Switch the highlighting feature on or of: true (show it), false (hide it).
+    */
+    Q_PROPERTY(bool highlighting READ highlighting WRITE setHighlighting)
+
+    /*! Property highlighting color sets (setHighlightingColor()) the backgorund
+    color of highlighted text areas. You can also read the color
+    (highlightingColor()).
+    */
+    Q_PROPERTY(QColor highlightingColor READ highlightingColor WRITE setHighlightingColor)
+
+    /*! Porperty overwrite mode sets (setOverwriteMode()) or gets (overwriteMode()) the mode
+    in which the editor works. In overwrite mode the user will overwrite existing data. The
+    size of data will be constant. In insert mode the size will grow, when inserting
+    new data.
+    */
+    Q_PROPERTY(bool overwriteMode READ overwriteMode WRITE setOverwriteMode)
+
+    /*! Property selection color sets (setSelectionColor()) the backgorund
+    color of selected text areas. You can also read the color
+    (selectionColor()).
+    */
+    Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor)
+
+    /*! Property readOnly sets (setReadOnly()) or gets (isReadOnly) the mode
+    in which the editor works. In readonly mode the the user can only navigate
+    through the data and select data; modifying is not possible. This
+    property's default is false.
+    */
+    Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
+
+    /*! Property upperCase sets (setUpperCase()) or gets (isUpperCase) the case of hex
+    data. Default is lowercase.
+    */
+    Q_PROPERTY(bool upperCase READ isUpperCase WRITE setUpperCase)
+
+    /*! Set the font of the widget. Please use fixed width fonts like Mono or Courier.*/
+    Q_PROPERTY(QFont font READ font WRITE setFont)
+
+public:
+    /*! Creates an instance of QHexEdit.
+    \param parent Parent widget of QHexEdit.
+    */
+    QHexEdit(QWidget *parent=0);
+
+    // Access to data of qhexedit
+
+    /*! Sets the data of QHexEdit. The QIODevice will be opend just before reading
+    and closed immediately afterwards. This is to allow other programs to rewrite
+    the file while editing it.
+    */
+    bool setData(QIODevice &iODevice);
+
+    /*! Gives back the data as a QByteArray starting at position \param pos and
+    delivering \param count bytes.
+    */
+    QByteArray dataAt(qint64 pos, qint64 count=-1);
+
+    /*! Gives back the data into a \param iODevice starting at position \param pos
+    and delivering \param count bytes.
+    */
+    bool write(QIODevice &iODevice, qint64 pos=0, qint64 count=-1);
+
+
+    // Char handling
+
+    /*! Inserts a char.
+    \param pos Index position, where to insert
+    \param ch Char, which is to insert
+    The char will be inserted and size of data grows.
+    */
+    void insert(qint64 pos, char ch);
+
+    /*! Removes len bytes from the content.
+    \param pos Index position, where to remove
+    \param len Amount of bytes to remove
+    */
+    void remove(qint64 pos, qint64 len=1);
+
+    /*! Replaces a char.
+    \param pos Index position, where to overwrite
+    \param ch Char, which is to insert
+    The char will be overwritten and size remains constant.
+    */
+    void replace(qint64 pos, char ch);
+
+
+    // ByteArray handling
+
+    /*! Inserts a byte array.
+    \param pos Index position, where to insert
+    \param ba QByteArray, which is to insert
+    The QByteArray will be inserted and size of data grows.
+    */
+    void insert(qint64 pos, const QByteArray &ba);
+
+    /*! Replaces \param len bytes with a byte array \param ba
+    \param pos Index position, where to overwrite
+    \param ba QByteArray, which is inserted
+    \param len count of bytes to overwrite
+    The data is overwritten and size of data may change.
+    */
+    void replace(qint64 pos, qint64 len, const QByteArray &ba);
+
+
+    // Utility functioins
+    /*! Calc cursor position from graphics position
+     * \param point from where the cursor position should be calculated
+     * \return Cursor postioin
+     */
+    qint64 cursorPosition(QPoint point);
+
+    /*! Ensure the cursor to be visble
+     */
+    void ensureVisible();
+
+    /*! Find first occurence of ba in QHexEdit data
+     * \param ba Data to find
+     * \param from Point where the search starts
+     * \return pos if fond, else -1
+     */
+    qint64 indexOf(const QByteArray &ba, qint64 from);
+
+    /*! Returns if any changes where done on document
+     * \return true when document is modified else false
+     */
+    bool isModified();
+
+    /*! Find last occurence of ba in QHexEdit data
+     * \param ba Data to find
+     * \param from Point where the search starts
+     * \return pos if fond, else -1
+     */
+    qint64 lastIndexOf(const QByteArray &ba, qint64 from);
+
+    /*! Gives back a formatted image of the selected content of QHexEdit
+    */
+    QString selectionToReadableString();
+
+    /*! Set Font of QHexEdit
+     * \param font
+     */
+    void setFont(const QFont &font);
+
+    /*! Gives back a formatted image of the content of QHexEdit
+    */
+    QString toReadableString();
+
+
+public slots:
+    /*! Redoes the last operation. If there is no operation to redo, i.e.
+      there is no redo step in the undo/redo history, nothing happens.
+      */
+    void redo();
+
+    /*! Undoes the last operation. If there is no operation to undo, i.e.
+      there is no undo step in the undo/redo history, nothing happens.
+      */
+    void undo();
+
+signals:
+
+    /*! Contains the address, where the cursor is located. */
+    void currentAddressChanged(qint64 address);
+
+    /*! Contains the size of the data to edit. */
+    void currentSizeChanged(qint64 size);
+
+    /*! The signal is emitted every time, the data is changed. */
+    void dataChanged();
+
+    /*! The signal is emitted every time, the overwrite mode is changed. */
+    void overwriteModeChanged(bool state);
+
+
+/*! \cond docNever */
+public:
+    ~QHexEdit();
+
+    // Properties
+    bool addressArea();
+    void setAddressArea(bool addressArea);
+
+    QColor addressAreaColor();
+    void setAddressAreaColor(const QColor &color);
+
+    qint64 addressOffset();
+    void setAddressOffset(qint64 addressArea);
+
+    int addressWidth();
+    void setAddressWidth(int addressWidth);
+
+    bool asciiArea();
+    void setAsciiArea(bool asciiArea);
+
+    int bytesPerLine();
+    void setBytesPerLine(int count);
+
+    qint64 cursorPosition();
+    void setCursorPosition(qint64 position);
+
+    QByteArray data();
+    void setData(const QByteArray &ba);
+
+    bool highlighting();
+    void setHighlighting(bool mode);
+
+    QColor highlightingColor();
+    void setHighlightingColor(const QColor &color);
+
+    bool overwriteMode();
+    void setOverwriteMode(bool overwriteMode);
+
+    bool isReadOnly();
+    void setReadOnly(bool readOnly);
+
+    bool isUpperCase();
+    void setUpperCase(bool upperCase);
+
+    QColor selectionColor();
+    void setSelectionColor(const QColor &color);
+
+protected:
+    // Handle events
+    void keyPressEvent(QKeyEvent *event);
+    void mouseMoveEvent(QMouseEvent * event);
+    void mousePressEvent(QMouseEvent * event);
+    void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *);
+    virtual bool focusNextPrevChild(bool next);
+private:
+    // Handle selections
+    void resetSelection(qint64 pos);            // set selectionStart and selectionEnd to pos
+    void resetSelection();                      // set selectionEnd to selectionStart
+    void setSelection(qint64 pos);              // set min (if below init) or max (if greater init)
+    int getSelectionBegin();
+    int getSelectionEnd();
+
+    // Private utility functions
+    void init();
+    void readBuffers();
+    QString toReadable(const QByteArray &ba);
+
+private slots:
+    void adjust();                              // recalc pixel positions
+    void dataChangedPrivate(int idx=0);        // emit dataChanged() signal
+    void refresh();                             // ensureVisible() and readBuffers()
+    void updateCursor();                        // update blinking cursor
+
+private:
+    // Name convention: pixel positions start with _px
+    int _pxCharWidth, _pxCharHeight;            // char dimensions (dpendend on font)
+    int _pxPosHexX;                             // X-Pos of HeaxArea
+    int _pxPosAdrX;                             // X-Pos of Address Area
+    int _pxPosAsciiX;                           // X-Pos of Ascii Area
+    int _pxGapAdr;                              // gap left from AddressArea
+    int _pxGapAdrHex;                           // gap between AddressArea and HexAerea
+    int _pxGapHexAscii;                         // gap between HexArea and AsciiArea
+    int _pxCursorWidth;                         // cursor width
+    int _pxSelectionSub;                        // offset selection rect
+    int _pxCursorX;                             // current cursor pos
+    int _pxCursorY;                             // current cursor pos
+
+    // Name convention: absolute byte positions in chunks start with _b
+    qint64 _bSelectionBegin;                    // first position of Selection
+    qint64 _bSelectionEnd;                      // end of Selection
+    qint64 _bSelectionInit;                     // memory position of Selection
+    qint64 _bPosFirst;                          // position of first byte shown
+    qint64 _bPosLast;                           // position of last byte shown
+    qint64 _bPosCurrent;                        // current position
+
+    // variables to store the property values
+    bool _addressArea;                          // left area of QHexEdit
+    QColor _addressAreaColor;
+    int _addressWidth;
+    bool _asciiArea;
+    qint64 _addressOffset;
+    int _bytesPerLine;
+    int _hexCharsInLine;
+    bool _highlighting;
+    bool _overwriteMode;
+    QBrush _brushSelection;
+    QPen _penSelection;
+    QBrush _brushHighlighted;
+    QPen _penHighlighted;
+    bool _readOnly;
+    bool _upperCase;
+
+    // other variables
+    bool _editAreaIsAscii;                      // flag about the ascii mode edited
+    int _addrDigits;                            // real no of addressdigits, may be > addressWidth
+    bool _blink;                                // help get cursor blinking
+    QBuffer _bData;                             // buffer, when setup with QByteArray
+    Chunks *_chunks;                            // IODevice based access to data
+    QTimer _cursorTimer;                        // for blinking cursor
+    qint64 _cursorPosition;                     // absolute position of cursor, 1 Byte == 2 tics
+    QRect _cursorRect;                          // physical dimensions of cursor
+    QByteArray _data;                           // QHexEdit's data, when setup with QByteArray
+    QByteArray _dataShown;                      // data in the current View
+    QByteArray _hexDataShown;                   // data in view, transformed to hex
+    qint64 _lastEventSize;                      // size, which was emitted last time
+    QByteArray _markedShown;                    // marked data in view
+    bool _modified;                             // Is any data in editor modified?
+    int _rowsShown;                             // lines of text shown
+    UndoStack * _undoStack;                     // Stack to store edit actions for undo/redo
+    /*! \endcond docNever */
+};
+
+#endif // QHEXEDIT_H

UEFITool/searchdialog.ui

@@ -35,10 +35,7 @@
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="HexLineEdit" name="hexEdit">
+        <widget class="QLineEdit" name="hexEdit">
-         <property name="editAsGuid">
-          <bool>false</bool>
-         </property>
          <property name="inputMask">
           <string/>
          </property>
@@ -92,10 +89,7 @@
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="HexLineEdit" name="guidEdit">
+        <widget class="GuidLineEdit" name="guidEdit">
-         <property name="editAsGuid">
-          <bool>true</bool>
-         </property>
          <property name="inputMask">
           <string>xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</string>
          </property>
@@ -247,9 +241,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>HexLineEdit</class>
+   <class>GuidLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>hexlineedit.h</header>
+   <header>guidlineedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

UEFITool/uefitool.cpp

@@ -1,6 +1,6 @@
 /* uefitool.cpp
  
- Copyright (c) 2022, Nikolaj Schlej. All rights reserved.
+ Copyright (c) 2016, Nikolaj Schlej. All rights reserved.
  This program and the accompanying materials
  are licensed and made available under the terms and conditions of the BSD License
  which accompanies this distribution.  The full text of the license may be found at
@@ -15,10 +15,6 @@
 #include "uefitool.h"
 #include "ui_uefitool.h"
 
-#if QT_VERSION_MAJOR >= 6
-#include <QStyleHints>
-#endif
-
 UEFITool::UEFITool(QWidget *parent) :
 QMainWindow(parent),
 ui(new Ui::UEFITool),
@@ -152,7 +148,7 @@ void UEFITool::init()
     model->setMarkingEnabled(markingEnabled);
     ui->actionToggleBootGuardMarking->setChecked(markingEnabled);
     
-    // Connect signals to slots
+    // Connect
     connect(ui->structureTreeView->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
             this, SLOT(populateUi(const QModelIndex &)));
     connect(ui->structureTreeView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
@@ -166,51 +162,12 @@ void UEFITool::init()
     connect(ui->fitTableWidget, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(scrollTreeView(QTableWidgetItem*)));
     connect(ui->messagesTabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
     
-    // Allow enter/return pressing to scroll tree view
+    // allow enter/return pressing to scroll tree view
     ui->parserMessagesListWidget->installEventFilter(this);
     ui->finderMessagesListWidget->installEventFilter(this);
     ui->builderMessagesListWidget->installEventFilter(this);
-
-    // Detect and set UI light or dark mode
-#if QT_VERSION_MAJOR >= 6
-#if QT_VERSION_MINOR < 5
-#if defined Q_OS_WIN
-    QSettings settings("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", QSettings::NativeFormat);
-    if (settings.value("AppsUseLightTheme", 1).toInt() == 0) {
-        model->setMarkingDarkMode(true);
-        QApplication::setStyle(QStyleFactory::create("Fusion"));
-        QApplication::setPalette(QApplication::style()->standardPalette());
-    }
-#else
-    const QPalette palette = QApplication::palette();
-    const QColor& color = palette.color(QPalette::Active, QPalette::Base);
-    if (color.lightness() < 127) { // TreeView has dark background
-        model->setMarkingDarkMode(true);
-    }
-#endif // defined Q_OS_WIN
-#else // QT_VERSION_MINOR >= 5
-    // Qt 6.5.0 added proper support for dark UI mode, including detection and notification on mode change
-    // It also supposed to work in all OSes, but still requires changing the default style on Windows from Vista to Fusion
-    auto styleHints = QGuiApplication::styleHints();
-    model->setMarkingDarkMode(styleHints->colorScheme() == Qt::ColorScheme::Dark);
-    connect(styleHints, SIGNAL(colorSchemeChanged(Qt::ColorScheme)), this, SLOT(updateUiForNewColorScheme(Qt::ColorScheme)));
-
-#if defined Q_OS_WIN
-    QApplication::setStyle(QStyleFactory::create("Fusion"));
-    QApplication::setPalette(QApplication::style()->standardPalette());
-#endif
-#endif // QT_VERSION_MINOR
-#endif // QT_VERSION_MAJOR
 }
 
-#if QT_VERSION_MAJOR >= 6 && QT_VERSION_MINOR >= 5
-void UEFITool::updateUiForNewColorScheme(Qt::ColorScheme scheme)
-{
-    model->setMarkingDarkMode(scheme == Qt::ColorScheme::Dark);
-    QApplication::setPalette(QApplication::style()->standardPalette());
-}
-#endif
-
 void UEFITool::populateUi(const QItemSelection &selected)
 {
     if (selected.isEmpty()) {
@@ -245,11 +202,9 @@ void UEFITool::populateUi(const QModelIndex &current)
                                      || type == Types::SlicData
                                      || type == Types::NvarEntry
                                      || type == Types::VssEntry
-                                     || type == Types::SysFEntry
+                                     || type == Types::FsysEntry
                                      || type == Types::EvsaEntry
-                                     || type == Types::PhoenixFlashMapEntry
+                                     || type == Types::FlashMapEntry
-                                     || type == Types::InsydeFlashDeviceMapEntry
-                                     || type == Types::DellDvarEntry
                                      || type == Types::IfwiHeader
                                      || type == Types::IfwiPartition
                                      || type == Types::FptPartition
@@ -260,18 +215,14 @@ void UEFITool::populateUi(const QModelIndex &current)
                                      || type == Types::CpdEntry
                                      || type == Types::CpdExtension
                                      || type == Types::CpdSpiEntry
-                                     || type == Types::StartupApDataEntry
                                      );
     ui->menuStoreActions->setEnabled(type == Types::VssStore
                                      || type == Types::Vss2Store
                                      || type == Types::FdcStore
-                                     || type == Types::SysFStore
+                                     || type == Types::FsysStore
                                      || type == Types::EvsaStore
                                      || type == Types::FtwStore
-                                     || type == Types::PhoenixFlashMapStore
+                                     || type == Types::FlashMapStore
-                                     || type == Types::InsydeFlashDeviceMapStore
-                                     || type == Types::DellDvarStore
-                                     || type == Types::NvarGuidStore
                                      || type == Types::CmdbStore
                                      || type == Types::FptStore
                                      || type == Types::BpdtStore
@@ -309,6 +260,8 @@ void UEFITool::search()
     if (searchDialog->exec() != QDialog::Accepted)
         return;
     
+    QModelIndex rootIndex = model->index(0, 0);
+    
     int index = searchDialog->ui->tabWidget->currentIndex();
     if (index == 0) { // Hex pattern
         searchDialog->ui->hexEdit->setFocus();
@@ -322,7 +275,7 @@ void UEFITool::search()
             mode = SEARCH_MODE_BODY;
         else
             mode = SEARCH_MODE_ALL;
-        ffsFinder->findHexPattern(pattern, mode);
+        ffsFinder->findHexPattern(rootIndex, pattern, mode);
         showFinderMessages();
     }
     else if (index == 1) { // GUID
@@ -338,7 +291,7 @@ void UEFITool::search()
             mode = SEARCH_MODE_BODY;
         else
             mode = SEARCH_MODE_ALL;
-        ffsFinder->findGuidPattern(pattern, mode);
+        ffsFinder->findGuidPattern(rootIndex, pattern, mode);
         showFinderMessages();
     }
     else if (index == 2) { // Text string
@@ -353,7 +306,7 @@ void UEFITool::search()
             mode = SEARCH_MODE_BODY;
         else
             mode = SEARCH_MODE_ALL;
-        ffsFinder->findTextPattern(pattern, mode, searchDialog->ui->textUnicodeCheckBox->isChecked(),
+        ffsFinder->findTextPattern(rootIndex, pattern, mode, searchDialog->ui->textUnicodeCheckBox->isChecked(),
                                    (Qt::CaseSensitivity) searchDialog->ui->textCaseSensitiveCheckBox->isChecked());
         showFinderMessages();
     }
@@ -434,8 +387,9 @@ void UEFITool::goToData()
         
         UByteArray rdata = model->parsingData(index);
         const NVAR_ENTRY_PARSING_DATA* pdata = (const NVAR_ENTRY_PARSING_DATA*)rdata.constData();
+        UINT32 lastVariableFlag = pdata->emptyByte ? 0xFFFFFF : 0;
         UINT32 offset = model->offset(index);
-        if (pdata->next == 0xFFFFFF) {
+        if (pdata->next == lastVariableFlag) {
             ui->structureTreeView->scrollTo(index, QAbstractItemView::PositionAtCenter);
             ui->structureTreeView->selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows | QItemSelectionModel::Clear);
         }
@@ -487,6 +441,7 @@ void UEFITool::replaceBody()
 void UEFITool::replace(const UINT8 mode)
 {
     U_UNUSED_PARAMETER(mode);
+    
 }
 
 void UEFITool::extractAsIs()
@@ -527,34 +482,75 @@ void UEFITool::extract(const UINT8 mode)
     QString path;
     if (mode == EXTRACT_MODE_AS_IS) {
         switch (type) {
-            case Types::Capsule: path = QFileDialog::getSaveFileName(this, tr("Save capsule to file"), name + ".cap",  tr("Capsule files (*.cap *.bin);;All files (*)")); break;
+            case Types::Capsule:        path = QFileDialog::getSaveFileName(this, tr("Save capsule to file"),          name + ".cap",  tr("Capsule files (*.cap *.bin);;All files (*)"));          break;
-            case Types::Image:   path = QFileDialog::getSaveFileName(this, tr("Save image to file"), name + ".rom",  tr("Image files (*.rom *.bin);;All files (*)")); break;
+            case Types::Image:          path = QFileDialog::getSaveFileName(this, tr("Save image to file"),            name + ".rom",  tr("Image files (*.rom *.bin);;All files (*)"));            break;
-            case Types::Region:  path = QFileDialog::getSaveFileName(this, tr("Save region to file"), name + ".rgn",  tr("Region files (*.rgn *.bin);;All files (*)")); break;
+            case Types::Region:         path = QFileDialog::getSaveFileName(this, tr("Save region to file"),           name + ".rgn",  tr("Region files (*.rgn *.bin);;All files (*)"));           break;
-            case Types::Padding: path = QFileDialog::getSaveFileName(this, tr("Save padding to file"), name + ".pad",  tr("Padding files (*.pad *.bin);;All files (*)")); break;
+            case Types::Padding:        path = QFileDialog::getSaveFileName(this, tr("Save padding to file"),          name + ".pad",  tr("Padding files (*.pad *.bin);;All files (*)"));          break;
-            case Types::Volume:  path = QFileDialog::getSaveFileName(this, tr("Save volume to file"), name + ".vol",  tr("Volume files (*.vol *.bin);;All files (*)")); break;
+            case Types::Volume:         path = QFileDialog::getSaveFileName(this, tr("Save volume to file"),           name + ".vol",  tr("Volume files (*.vol *.bin);;All files (*)"));           break;
-            case Types::File:    path = QFileDialog::getSaveFileName(this, tr("Save FFS file to file"), name + ".ffs",  tr("FFS files (*.ffs *.bin);;All files (*)")); break;
+            case Types::File:           path = QFileDialog::getSaveFileName(this, tr("Save FFS file to file"),         name + ".ffs",  tr("FFS files (*.ffs *.bin);;All files (*)"));              break;
-            case Types::Section: path = QFileDialog::getSaveFileName(this, tr("Save section to file"), name + ".sct",  tr("Section files (*.sct *.bin);;All files (*)")); break;
+            case Types::Section:        path = QFileDialog::getSaveFileName(this, tr("Save section to file"),          name + ".sct",  tr("Section files (*.sct *.bin);;All files (*)"));          break;
-            default:             path = QFileDialog::getSaveFileName(this, tr("Save object to file"), name + ".bin", tr("Binary files (*.bin);;All files (*)"));
+            case Types::NvarEntry:      path = QFileDialog::getSaveFileName(this, tr("Save NVAR entry to file"),       name + ".nvar", tr("NVAR entry files (*.nvar *.bin);;All files (*)"));      break;
+            case Types::VssEntry:       path = QFileDialog::getSaveFileName(this, tr("Save VSS entry to file"),        name + ".vss",  tr("VSS entry files (*.vss *.bin);;All files (*)"));        break;
+            case Types::FsysEntry:      path = QFileDialog::getSaveFileName(this, tr("Save Fsys entry to file"),       name + ".fse",  tr("Fsys entry files (*.fse *.bin);;All files (*)"));       break;
+            case Types::EvsaEntry:      path = QFileDialog::getSaveFileName(this, tr("Save EVSA entry to file"),       name + ".evse", tr("EVSA entry files (*.evse *.bin);;All files (*)"));      break;
+            case Types::FlashMapEntry:  path = QFileDialog::getSaveFileName(this, tr("Save FlashMap entry to file"),   name + ".fme",  tr("FlashMap entry files (*.fme *.bin);;All files (*)"));   break;
+            case Types::VssStore:       path = QFileDialog::getSaveFileName(this, tr("Save VSS store to file"),        name + ".vss",  tr("VSS store files (*.vss *.bin);;All files (*)"));        break;
+            case Types::Vss2Store:      path = QFileDialog::getSaveFileName(this, tr("Save VSS2 store to file"),       name + ".vss2", tr("VSS2 store files (*.vss2 *.bin);;All files (*)"));      break;
+            case Types::FdcStore:       path = QFileDialog::getSaveFileName(this, tr("Save FDC store to file"),        name + ".fdc",  tr("FDC store files (*.fdc *.bin);;All files (*)"));        break;
+            case Types::FsysStore:      path = QFileDialog::getSaveFileName(this, tr("Save Fsys store to file"),       name + ".fsys", tr("Fsys store files (*.fsys *.bin);;All files (*)"));      break;
+            case Types::EvsaStore:      path = QFileDialog::getSaveFileName(this, tr("Save EVSA store to file"),       name + ".evsa", tr("EVSA store files (*.evsa *.bin);;All files (*)"));      break;
+            case Types::FtwStore:       path = QFileDialog::getSaveFileName(this, tr("Save FTW store to file"),        name + ".ftw",  tr("FTW store files (*.ftw *.bin);;All files (*)"));        break;
+            case Types::FlashMapStore:  path = QFileDialog::getSaveFileName(this, tr("Save FlashMap store to file"),   name + ".fmap", tr("FlashMap store files (*.fmap *.bin);;All files (*)"));  break;
+            case Types::CmdbStore:      path = QFileDialog::getSaveFileName(this, tr("Save CMDB store to file"),       name + ".cmdb", tr("CMDB store files (*.cmdb *.bin);;All files (*)"));      break;
+            case Types::Microcode:      path = QFileDialog::getSaveFileName(this, tr("Save microcode binary to file"), name + ".ucd",  tr("Microcode binary files (*.ucd *.bin);;All files (*)")); break;
+            case Types::SlicData:
+                if (subtype == Subtypes::PubkeySlicData) path = QFileDialog::getSaveFileName(this, tr("Save SLIC pubkey to file"), name + ".spk", tr("SLIC pubkey files (*.spk *.bin);;All files (*)"));
+                else                                     path = QFileDialog::getSaveFileName(this, tr("Save SLIC marker to file"), name + ".smk", tr("SLIC marker files (*.smk *.bin);;All files (*)"));
+                break;
+            default:                    path = QFileDialog::getSaveFileName(this, tr("Save object to file"), name + ".bin", tr("Binary files (*.bin);;All files (*)"));
         }
     }
     else if (mode == EXTRACT_MODE_BODY || mode == EXTRACT_MODE_BODY_UNCOMPRESSED) {
         switch (type) {
-            case Types::Capsule: path = QFileDialog::getSaveFileName(this, tr("Save capsule body to image file"), name + ".rom", tr("Image files (*.rom *.bin);;All files (*)")); break;
+            case Types::Capsule:                         path = QFileDialog::getSaveFileName(this, tr("Save capsule body to image file"), name + ".rom", tr("Image files (*.rom *.bin);;All files (*)"));       break;
-            case Types::Volume:  path = QFileDialog::getSaveFileName(this, tr("Save volume body to file"), name + ".vbd", tr("Volume body files (*.vbd *.bin);;All files (*)")); break;
+            case Types::Volume:                          path = QFileDialog::getSaveFileName(this, tr("Save volume body to file"),        name + ".vbd", tr("Volume body files (*.vbd *.bin);;All files (*)")); break;
-            case Types::File:    path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to file"), name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)")); break;
+            case Types::File:
+                if (subtype    == EFI_FV_FILETYPE_ALL
+                    || subtype == EFI_FV_FILETYPE_RAW)   path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to raw file"),  name + ".raw", tr("Raw files (*.raw *.bin);;All files (*)"));
+                else                                     path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to file"),      name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)"));
+                break;
             case Types::Section:
-                if (subtype == EFI_SECTION_FIRMWARE_VOLUME_IMAGE) {
+                if (subtype    == EFI_SECTION_COMPRESSION
-                    path = QFileDialog::getSaveFileName(this, tr("Save section body to volume file"), name + ".vol", tr("Volume files (*.vol *.bin);;All files (*)")); break;
+                    || subtype == EFI_SECTION_GUID_DEFINED
-                }
+                    || subtype == EFI_SECTION_DISPOSABLE)              path = QFileDialog::getSaveFileName(this, tr("Save encapsulation section body to FFS body file"), name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)"));
+                else if (subtype == EFI_SECTION_FIRMWARE_VOLUME_IMAGE) path = QFileDialog::getSaveFileName(this, tr("Save section body to volume file"),                 name + ".vol", tr("Volume files (*.vol *.bin);;All files (*)"));
+                else if (subtype == EFI_SECTION_RAW)                   path = QFileDialog::getSaveFileName(this, tr("Save section body to raw file"),                    name + ".raw", tr("Raw files (*.raw *.bin);;All files (*)"));
                 else if (subtype == EFI_SECTION_PE32
                          || subtype == EFI_SECTION_TE
-                         || subtype == EFI_SECTION_PIC) {
+                         || subtype == EFI_SECTION_PIC)                     path = QFileDialog::getSaveFileName(this, tr("Save section body to EFI executable file"),         name + ".efi", tr("EFI executable files (*.efi *.bin);;All files (*)"));
-                    path = QFileDialog::getSaveFileName(this, tr("Save section body to EFI executable file"), name + ".efi", tr("EFI executable files (*.efi *.bin);;All files (*)")); break;
+                else                                                   path = QFileDialog::getSaveFileName(this, tr("Save section body to file"),                        name + ".bin", tr("Binary files (*.bin);;All files (*)"));
-                }
+                break;
-            default: path = QFileDialog::getSaveFileName(this, tr("Save object body to file"), name + ".bin", tr("Binary files (*.bin);;All files (*)"));
+            case Types::NvarEntry:
+            case Types::VssEntry:
+            case Types::EvsaEntry:
+            case Types::FlashMapEntry:
+            case Types::FsysEntry:                       path = QFileDialog::getSaveFileName(this, tr("Save entry body to file"),       name + ".bin", tr("Binary files (*.bin);;All files (*)")); break;
+            case Types::VssStore:
+            case Types::Vss2Store:
+            case Types::FtwStore:
+            case Types::FdcStore:
+            case Types::FsysStore:
+            case Types::FlashMapStore:
+            case Types::CmdbStore:                       path = QFileDialog::getSaveFileName(this, tr("Save store body to file"),       name + ".bin", tr("Binary files (*.bin);;All files (*)")); break;
+            case Types::Microcode:                       path = QFileDialog::getSaveFileName(this, tr("Save microcode body to file"),   name + ".ucb", tr("Microcode body files (*.ucb *.bin);;All files (*)")); break;
+            case Types::SlicData:
+                if (subtype == Subtypes::PubkeySlicData) path = QFileDialog::getSaveFileName(this, tr("Save SLIC pubkey body to file"), name + ".spb", tr("SLIC pubkey body files (*.spb *.bin);;All files (*)"));
+                else                                     path = QFileDialog::getSaveFileName(this, tr("Save SLIC marker body to file"), name + ".smb", tr("SLIC marker body files (*.smb *.bin);;All files (*)"));
+                break;
+            default:                                     path = QFileDialog::getSaveFileName(this, tr("Save object to file"),           name + ".bin", tr("Binary files (*.bin);;All files (*)"));
         }
     }
-    else path = QFileDialog::getSaveFileName(this, tr("Save object to file"), name + ".bin", tr("Binary files (*.bin);;All files (*)"));
+    else                                             path = QFileDialog::getSaveFileName(this, tr("Save object to file"),           name + ".bin", tr("Binary files (*.bin);;All files (*)"));
     
     if (path.trimmed().isEmpty())
         return;
@@ -582,26 +578,17 @@ void UEFITool::remove()
 
 void UEFITool::about()
 {
-    QMessageBox::about(this,
+    QMessageBox::about(this, tr("About UEFITool"), tr(
-                       tr("About UEFITool"),
+                                                      "Copyright (c) 2019, Nikolaj Schlej.<br>"
-                       tr("<b>UEFITool %1.</b><br><br>"
+                                                      "Program icon made by <a href=https://www.behance.net/alzhidkov>Alexander Zhidkov</a>.<br>"
-                          "Copyright (c) 2013-2025, Nikolaj (<b>CodeRush</b>) Schlej, Vitaly (<b>vit9696</b>) Cheptsov, <a href=https://github.com/LongSoft/UEFITool/graphs/contributors>et al</a>.<br><br>"
+                                                      "The program uses QHexEdit2 library made by <a href=https://github.com/Simsys/>Simsys</a>.<br>"
-                          "Program icon made by <a href=https://www.behance.net/alzhidkov>Alexander Zhidkov</a>.<br><br>"
+                                                      "Qt-less engine is using Bstrlib made by <a href=https://github.com/websnarf/>Paul Hsieh</a>.<br><br>"
-                          "GUI uses QHexView made by <a href=https://github.com/Dax89>Antonio Davide</a>.<br>"
+                                                      "The program is dedicated to <b>RevoGirl</b>. Rest in peace, young genius.<br><br>"
-                          "Qt-less engine uses Bstrlib made by <a href=https://github.com/websnarf>Paul Hsieh</a>.<br>"
+                                                      "The program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License.<br>"
-                          "Engine uses Tiano compression code made by <a href=https://github.com/tianocore>TianoCore developers</a>.<br>"
+                                                      "The full text of the license may be found at <a href=http://opensource.org/licenses/bsd-license.php>OpenSource.org</a>.<br><br>"
-                          "Engine uses LZMA compression code made by <a href=https://www.7-zip.org/sdk.html>Igor Pavlov</a>.<br>"
+                                                      "<b>THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN \"AS IS\" BASIS, "
-                          "Engine uses zlib compression code made by <a href=https://github.com/madler>Mark Adler</a>.<br>"
+                                                      "WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, "
-                          "Engine uses LibTomCrypt hashing code made by <a href=https://github.com/libtom>LibTom developers</a>.<br>"
+                                                      "EITHER EXPRESS OR IMPLIED.</b>"));
-                          "Engine uses KaitaiStruct runtime made by <a href=https://github.com/kaitai-io>Kaitai team</a>.<br><br>"
-                          "The program is dedicated to <b>RevoGirl</b>. Rest in peace, young genius.<br><br>"
-                          "The program and the accompanying materials are licensed and made available under the terms and conditions of the BSD-2-Clause License.<br>"
-                          "The full text of the license may be found at <a href=https://opensource.org/licenses/BSD-2-Clause>OpenSource.org</a>.<br><br>"
-                          "<b>THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN \"AS IS\" BASIS, "
-                          "WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, "
-                          "EITHER EXPRESS OR IMPLIED.</b>"
-                          "").arg(version)
-                       );
 }
 
 void UEFITool::aboutQt()
@@ -661,14 +648,15 @@ void UEFITool::openImageFile(QString path)
     
     // Parse the image
     USTATUS result = ffsParser->parse(buffer);
+    
     showParserMessages();
     if (result) {
         QMessageBox::critical(this, tr("Image parsing failed"), errorCodeToUString(result), QMessageBox::Ok);
         return;
     }
-    else {
+    else
         ui->statusBar->showMessage(tr("Opened: %1").arg(fileInfo.fileName()));
-    }
+    
     ffsParser->outputInfo();
     
     // Enable or disable FIT tab
@@ -773,7 +761,7 @@ void UEFITool::toggleBootGuardMarking(bool enabled)
     markingEnabled = enabled;
 }
 
-// Emit double click signal of QListWidget on enter/return key pressed
+/* emit double click signal of QListWidget on enter/return key pressed */
 bool UEFITool::eventFilter(QObject* obj, QEvent* event)
 {
     if (event->type() == QEvent::KeyPress) {
@@ -810,286 +798,312 @@ void UEFITool::showParserMessages()
     
     std::vector<std::pair<QString, QModelIndex> > messages = ffsParser->getMessages();
     
-    for (const auto &msg : messages) {
+#if QT_VERSION_MAJOR < 6
-        QListWidgetItem* item = new QListWidgetItem(msg.first, NULL, 0);
+    std::pair<QString, QModelIndex> msg;
-        item->setData(Qt::UserRole, QByteArray((const char*)&msg.second, sizeof(msg.second)));
-        ui->parserMessagesListWidget->addItem(item);
-    }
-        
-    ui->messagesTabWidget->setCurrentIndex(TAB_PARSER);
-    ui->parserMessagesListWidget->scrollToBottom();
-}
-
-void UEFITool::showFinderMessages()
-{
-    ui->finderMessagesListWidget->clear();
-    if (!ffsParser)
-        return;
     
-    std::vector<std::pair<QString, QModelIndex> > messages = ffsFinder->getMessages();
+    foreach (msg, messages) {
-    
-    for (const auto &msg : messages) {
-        QListWidgetItem* item = new QListWidgetItem(msg.first, NULL, 0);
-        item->setData(Qt::UserRole, QByteArray((const char*)&msg.second, sizeof(msg.second)));;
-        ui->finderMessagesListWidget->addItem(item);
-    }
-    
-    ui->messagesTabWidget->setTabEnabled(TAB_SEARCH, true);
-    ui->messagesTabWidget->setCurrentIndex(TAB_SEARCH);
-    ui->finderMessagesListWidget->scrollToBottom();
-}
-
-void UEFITool::showBuilderMessages()
-{
-    ui->builderMessagesListWidget->clear();
-    if (!ffsBuilder)
-        return;
-    
-    std::vector<std::pair<QString, QModelIndex> > messages = ffsBuilder->getMessages();
-    
-    for (const auto &msg : messages) {
-        QListWidgetItem* item = new QListWidgetItem(msg.first, NULL, 0);
-        item->setData(Qt::UserRole, QByteArray((const char*)&msg.second, sizeof(msg.second)));
-        ui->builderMessagesListWidget->addItem(item);
-    }
-    
-    ui->messagesTabWidget->setTabEnabled(TAB_BUILDER, true);
-    ui->messagesTabWidget->setCurrentIndex(TAB_BUILDER);
-    ui->builderMessagesListWidget->scrollToBottom();
-}
-
-void UEFITool::scrollTreeView(QListWidgetItem* item)
-{
-    QByteArray second = item->data(Qt::UserRole).toByteArray();
-    QModelIndex *index = (QModelIndex *)second.data();
-    if (index && index->isValid()) {
-        ui->structureTreeView->scrollTo(*index, QAbstractItemView::PositionAtCenter);
-        ui->structureTreeView->selectionModel()->select(*index, QItemSelectionModel::Select | QItemSelectionModel::Rows | QItemSelectionModel::Clear);
-    }
-}
-
-void UEFITool::scrollTreeView(QTableWidgetItem* item)
-{
-    QByteArray second = item->data(Qt::UserRole).toByteArray();
-    QModelIndex *index = (QModelIndex *)second.data();
-    if (index && index->isValid()) {
-        ui->structureTreeView->scrollTo(*index, QAbstractItemView::PositionAtCenter);
-        ui->structureTreeView->selectionModel()->select(*index, QItemSelectionModel::Select | QItemSelectionModel::Rows | QItemSelectionModel::Clear);
-    }
-}
-
-void UEFITool::contextMenuEvent(QContextMenuEvent* event)
-{
-    // The checks involving underMouse do not work well enough on macOS, and result in right-click sometimes
-    // not showing any context menu at all. Most likely it is a bug in Qt, which does not affect other systems.
-    // For this reason we reimplement this manually.
-    if (ui->parserMessagesListWidget->rect().contains(ui->parserMessagesListWidget->mapFromGlobal(event->globalPos())) ||
-        ui->finderMessagesListWidget->rect().contains(ui->finderMessagesListWidget->mapFromGlobal(event->globalPos())) ||
-        ui->builderMessagesListWidget->rect().contains(ui->builderMessagesListWidget->mapFromGlobal(event->globalPos()))) {
-        ui->menuMessageActions->exec(event->globalPos());
-        return;
-    }
-    
-    
-    if (!ui->structureTreeView->rect().contains(ui->structureTreeView->mapFromGlobal(event->globalPos())))
-        return;
-    
-    QPoint pt = event->pos();
-    QModelIndex index = ui->structureTreeView->indexAt(ui->structureTreeView->viewport()->mapFrom(this, pt));
-    if (!index.isValid()) {
-        return;
-    }
-    
-    switch (model->type(index)) {
-        case Types::Capsule:        ui->menuCapsuleActions->exec(event->globalPos());      break;
-        case Types::Image:          ui->menuImageActions->exec(event->globalPos());        break;
-        case Types::Region:         ui->menuRegionActions->exec(event->globalPos());       break;
-        case Types::Padding:        ui->menuPaddingActions->exec(event->globalPos());      break;
-        case Types::Volume:         ui->menuVolumeActions->exec(event->globalPos());       break;
-        case Types::File:           ui->menuFileActions->exec(event->globalPos());         break;
-        case Types::Section:        ui->menuSectionActions->exec(event->globalPos());      break;
-        case Types::VssStore:
-        case Types::Vss2Store:
-        case Types::FdcStore:
-        case Types::SysFStore:
-        case Types::EvsaStore:
-        case Types::FtwStore:
-        case Types::PhoenixFlashMapStore:
-        case Types::InsydeFlashDeviceMapStore:
-        case Types::DellDvarStore:
-        case Types::NvarGuidStore:
-        case Types::CmdbStore:
-        case Types::FptStore:
-        case Types::CpdStore:
-        case Types::BpdtStore:      ui->menuStoreActions->exec(event->globalPos());        break;
-        case Types::FreeSpace:      break; // No menu needed for FreeSpace item
-        default:                    ui->menuEntryActions->exec(event->globalPos());        break;
-    }
-}
-
-void UEFITool::readSettings()
-{
-    QSettings settings(this);
-    restoreGeometry(settings.value("mainWindow/geometry").toByteArray());
-    restoreState(settings.value("mainWindow/windowState").toByteArray());
-    QList<int> horList, vertList;
-    horList.append(settings.value("mainWindow/treeWidth", 600).toInt());
-    horList.append(settings.value("mainWindow/infoWidth", 180).toInt());
-    vertList.append(settings.value("mainWindow/treeHeight", 400).toInt());
-    vertList.append(settings.value("mainWindow/messageHeight", 180).toInt());
-    ui->infoSplitter->setSizes(horList);
-    ui->messagesSplitter->setSizes(vertList);
-    ui->structureTreeView->setColumnWidth(0, settings.value("tree/columnWidth0", ui->structureTreeView->columnWidth(0)).toInt());
-    ui->structureTreeView->setColumnWidth(1, settings.value("tree/columnWidth1", ui->structureTreeView->columnWidth(1)).toInt());
-    ui->structureTreeView->setColumnWidth(2, settings.value("tree/columnWidth2", ui->structureTreeView->columnWidth(2)).toInt());
-    ui->structureTreeView->setColumnWidth(3, settings.value("tree/columnWidth3", ui->structureTreeView->columnWidth(3)).toInt());
-    markingEnabled = settings.value("tree/markingEnabled", true).toBool();
-    ui->actionToggleBootGuardMarking->setChecked(markingEnabled);
-    
-    // Set monospace font
-    QString fontName;
-    int fontSize;
-#if defined Q_OS_MACOS
-    fontName = settings.value("mainWindow/fontName", QString("Menlo")).toString();
-    fontSize = settings.value("mainWindow/fontSize", 10).toInt();
-#elif defined Q_OS_WIN
-    fontName = settings.value("mainWindow/fontName", QString("Consolas")).toString();
-    fontSize = settings.value("mainWindow/fontSize", 9).toInt();
 #else
-    fontName = settings.value("mainWindow/fontName", QString("Courier New")).toString();
+        for (const auto &msg : messages) {
-    fontSize = settings.value("mainWindow/fontSize", 10).toInt();
 #endif
-    currentFont = QFont(fontName, fontSize);
+            QListWidgetItem* item = new QListWidgetItem(msg.first, NULL, 0);
-    currentFont.setStyleHint(QFont::Monospace);
+            item->setData(Qt::UserRole, QByteArray((const char*)&msg.second, sizeof(msg.second)));
-    QApplication::setFont(currentFont);
+            ui->parserMessagesListWidget->addItem(item);
-}
-
-void UEFITool::writeSettings()
-{
-    QSettings settings(this);
-    settings.setValue("mainWindow/geometry", saveGeometry());
-    settings.setValue("mainWindow/windowState", saveState());
-    settings.setValue("mainWindow/treeWidth", ui->structureGroupBox->width());
-    settings.setValue("mainWindow/infoWidth", ui->infoGroupBox->width());
-    settings.setValue("mainWindow/treeHeight", ui->structureGroupBox->height());
-    settings.setValue("mainWindow/messageHeight", ui->messagesTabWidget->height());
-    settings.setValue("tree/columnWidth0", ui->structureTreeView->columnWidth(0));
-    settings.setValue("tree/columnWidth1", ui->structureTreeView->columnWidth(1));
-    settings.setValue("tree/columnWidth2", ui->structureTreeView->columnWidth(2));
-    settings.setValue("tree/columnWidth3", ui->structureTreeView->columnWidth(3));
-    settings.setValue("tree/markingEnabled", markingEnabled);
-    settings.setValue("mainWindow/fontName", currentFont.family());
-    settings.setValue("mainWindow/fontSize", currentFont.pointSize());
-}
-
-void UEFITool::showFitTable()
-{
-    std::vector<std::pair<std::vector<UString>, UModelIndex> > fitTable = ffsParser->getFitTable();
-    if (fitTable.empty()) {
-        // Disable FIT tab
-        ui->messagesTabWidget->setTabEnabled(TAB_FIT, false);
-        return;
-    }
-    
-    // Enable FIT tab
-    ui->messagesTabWidget->setTabEnabled(TAB_FIT, true);
-    
-    // Set up the FIT table
-    ui->fitTableWidget->clear();
-    ui->fitTableWidget->setRowCount((int)fitTable.size());
-    ui->fitTableWidget->setColumnCount(6);
-    ui->fitTableWidget->setHorizontalHeaderLabels(QStringList() << tr("Address") << tr("Size") << tr("Version") << tr("Checksum") << tr("Type") << tr("Information"));
-    ui->fitTableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    ui->fitTableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
-    ui->fitTableWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-    ui->fitTableWidget->horizontalHeader()->setStretchLastSection(true);
-    
-    // Add all data to the table widget
-    for (size_t i = 0; i < fitTable.size(); i++) {
-        for (UINT8 j = 0; j < 6; j++) {
-            QTableWidgetItem* item = new QTableWidgetItem(fitTable[i].first[j]);
-            item->setData(Qt::UserRole, QByteArray((const char*)&fitTable[i].second, sizeof(fitTable[i].second)));
-            ui->fitTableWidget->setItem((int)i, j, item);
         }
+        
+        ui->messagesTabWidget->setCurrentIndex(TAB_PARSER);
+        ui->parserMessagesListWidget->scrollToBottom();
     }
     
-    ui->fitTableWidget->resizeColumnsToContents();
+    void UEFITool::showFinderMessages()
-    ui->fitTableWidget->resizeRowsToContents();
+    {
-    ui->messagesTabWidget->setCurrentIndex(TAB_FIT);
+        ui->finderMessagesListWidget->clear();
-}
+        if (!ffsParser)
-
+            return;
-void UEFITool::showSecurityInfo()
+        
-{
+        std::vector<std::pair<QString, QModelIndex> > messages = ffsFinder->getMessages();
-    // Get security info
+        
-    UString secInfo = ffsParser->getSecurityInfo();
+#if QT_VERSION_MAJOR < 6
-    if (secInfo.isEmpty()) {
+        std::pair<QString, QModelIndex> msg;
-        ui->messagesTabWidget->setTabEnabled(TAB_SECURITY, false);
+        
-        return;
+        foreach (msg, messages) {
-    }
+#else
-    
+            for (const auto &msg : messages) {
-    ui->messagesTabWidget->setTabEnabled(TAB_SECURITY, true);
+#endif
-    ui->securityEdit->setPlainText(secInfo);
+                QListWidgetItem* item = new QListWidgetItem(msg.first, NULL, 0);
-    ui->messagesTabWidget->setCurrentIndex(TAB_SECURITY);
+                item->setData(Qt::UserRole, QByteArray((const char*)&msg.second, sizeof(msg.second)));;
-}
+                ui->finderMessagesListWidget->addItem(item);
-
-void UEFITool::currentTabChanged(int index)
-{
-    U_UNUSED_PARAMETER(index);
-    
-    ui->menuMessageActions->setEnabled(false);
-    ui->actionMessagesCopy->setEnabled(false);
-    ui->actionMessagesCopyAll->setEnabled(false);
-    ui->actionMessagesClear->setEnabled(false);
-}
-
-void UEFITool::loadGuidDatabase()
-{
-    QString path = QFileDialog::getOpenFileName(this, tr("Select GUID database file to load"), currentDir, tr("Comma-separated values files (*.csv);;All files (*)"));
-    if (!path.isEmpty()) {
-        initGuidDatabase(path);
-        if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("New GUID database loaded"), tr("Apply new GUID database on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
-            openImageFile(currentPath);
-    }
-}
-
-void UEFITool::unloadGuidDatabase()
-{
-    initGuidDatabase();
-    if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("GUID database unloaded"), tr("Apply changes on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
-        openImageFile(currentPath);
-}
-
-void UEFITool::loadDefaultGuidDatabase()
-{
-    initGuidDatabase(":/guids.csv");
-    if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("Default GUID database loaded"), tr("Apply default GUID database on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
-        openImageFile(currentPath);
-}
-
-void UEFITool::exportDiscoveredGuids()
-{
-    GuidDatabase db = guidDatabaseFromTreeRecursive(model, model->index(0, 0));
-    if (!db.empty()) {
-        QString path = QFileDialog::getSaveFileName(this, tr("Save parsed GUIDs to database"), currentPath + ".guids.csv", tr("Comma-separated values files (*.csv);;All files (*)"));
-        if (!path.isEmpty())
-            guidDatabaseExportToFile(path, db);
-    }
-}
-
-void UEFITool::generateReport()
-{
-    QString path = QFileDialog::getSaveFileName(this, tr("Save report to text file"), currentPath + ".report.txt", tr("Text files (*.txt);;All files (*)"));
-    if (!path.isEmpty()) {
-        std::vector<QString> report = ffsReport->generate();
-        if (report.size()) {
-            QFile file;
-            file.setFileName(path);
-            if (file.open(QFile::Text | QFile::WriteOnly)) {
-                for (size_t i = 0; i < report.size(); i++) {
-                    file.write(report[i].toLatin1().append('\n'));
-                }
-                file.close();
             }
+            
+            ui->messagesTabWidget->setTabEnabled(TAB_SEARCH, true);
+            ui->messagesTabWidget->setCurrentIndex(TAB_SEARCH);
+            ui->finderMessagesListWidget->scrollToBottom();
         }
-    }
+        
-}
+        void UEFITool::showBuilderMessages()
+        {
+            ui->builderMessagesListWidget->clear();
+            if (!ffsBuilder)
+                return;
+            
+            std::vector<std::pair<QString, QModelIndex> > messages = ffsBuilder->getMessages();
+            
+#if QT_VERSION_MAJOR < 6
+            std::pair<QString, QModelIndex> msg;
+            
+            foreach (msg, messages) {
+#else
+                for (const auto &msg : messages) {
+#endif
+                    QListWidgetItem* item = new QListWidgetItem(msg.first, NULL, 0);
+                    item->setData(Qt::UserRole, QByteArray((const char*)&msg.second, sizeof(msg.second)));
+                    ui->builderMessagesListWidget->addItem(item);
+                }
+                
+                ui->messagesTabWidget->setTabEnabled(TAB_BUILDER, true);
+                ui->messagesTabWidget->setCurrentIndex(TAB_BUILDER);
+                ui->builderMessagesListWidget->scrollToBottom();
+            }
+            
+            void UEFITool::scrollTreeView(QListWidgetItem* item)
+            {
+                QByteArray second = item->data(Qt::UserRole).toByteArray();
+                QModelIndex *index = (QModelIndex *)second.data();
+                if (index && index->isValid()) {
+                    ui->structureTreeView->scrollTo(*index, QAbstractItemView::PositionAtCenter);
+                    ui->structureTreeView->selectionModel()->select(*index, QItemSelectionModel::Select | QItemSelectionModel::Rows | QItemSelectionModel::Clear);
+                }
+            }
+            
+            void UEFITool::scrollTreeView(QTableWidgetItem* item)
+            {
+                QByteArray second = item->data(Qt::UserRole).toByteArray();
+                QModelIndex *index = (QModelIndex *)second.data();
+                if (index && index->isValid()) {
+                    ui->structureTreeView->scrollTo(*index, QAbstractItemView::PositionAtCenter);
+                    ui->structureTreeView->selectionModel()->select(*index, QItemSelectionModel::Select | QItemSelectionModel::Rows | QItemSelectionModel::Clear);
+                }
+            }
+            
+            void UEFITool::contextMenuEvent(QContextMenuEvent* event)
+            {
+                // The checks involving underMouse do not work well enough on macOS, and result in right-click sometimes
+                // not showing any context menu at all. Most likely it is a bug in Qt, which does not affect other systems.
+                // For this reason we reimplement this manually.
+                if (ui->parserMessagesListWidget->rect().contains(ui->parserMessagesListWidget->mapFromGlobal(event->globalPos())) ||
+                    ui->finderMessagesListWidget->rect().contains(ui->finderMessagesListWidget->mapFromGlobal(event->globalPos())) ||
+                    ui->builderMessagesListWidget->rect().contains(ui->builderMessagesListWidget->mapFromGlobal(event->globalPos()))) {
+                    ui->menuMessageActions->exec(event->globalPos());
+                    return;
+                }
+                
+                
+                if (!ui->structureTreeView->rect().contains(ui->structureTreeView->mapFromGlobal(event->globalPos())))
+                    return;
+                
+                QPoint pt = event->pos();
+                QModelIndex index = ui->structureTreeView->indexAt(ui->structureTreeView->viewport()->mapFrom(this, pt));
+                if (!index.isValid()) {
+                    return;
+                }
+                
+                switch (model->type(index))
+                {
+                    case Types::Capsule:        ui->menuCapsuleActions->exec(event->globalPos());      break;
+                    case Types::Image:          ui->menuImageActions->exec(event->globalPos());        break;
+                    case Types::Region:         ui->menuRegionActions->exec(event->globalPos());       break;
+                    case Types::Padding:        ui->menuPaddingActions->exec(event->globalPos());      break;
+                    case Types::Volume:         ui->menuVolumeActions->exec(event->globalPos());       break;
+                    case Types::File:           ui->menuFileActions->exec(event->globalPos());         break;
+                    case Types::Section:        ui->menuSectionActions->exec(event->globalPos());      break;
+                    case Types::VssStore:
+                    case Types::Vss2Store:
+                    case Types::FdcStore:
+                    case Types::FsysStore:
+                    case Types::EvsaStore:
+                    case Types::FtwStore:
+                    case Types::FlashMapStore:
+                    case Types::CmdbStore:
+                    case Types::FptStore:
+                    case Types::CpdStore:
+                    case Types::BpdtStore:      ui->menuStoreActions->exec(event->globalPos());        break;
+                    case Types::FreeSpace:      break; // No menu needed for FreeSpace item
+                    default:                    ui->menuEntryActions->exec(event->globalPos());        break;
+                }
+            }
+            
+            void UEFITool::readSettings()
+            {
+                QSettings settings(this);
+                restoreGeometry(settings.value("mainWindow/geometry").toByteArray());
+                restoreState(settings.value("mainWindow/windowState").toByteArray());
+                QList<int> horList, vertList;
+                horList.append(settings.value("mainWindow/treeWidth", 600).toInt());
+                horList.append(settings.value("mainWindow/infoWidth", 180).toInt());
+                vertList.append(settings.value("mainWindow/treeHeight", 400).toInt());
+                vertList.append(settings.value("mainWindow/messageHeight", 180).toInt());
+                ui->infoSplitter->setSizes(horList);
+                ui->messagesSplitter->setSizes(vertList);
+                ui->structureTreeView->setColumnWidth(0, settings.value("tree/columnWidth0", ui->structureTreeView->columnWidth(0)).toInt());
+                ui->structureTreeView->setColumnWidth(1, settings.value("tree/columnWidth1", ui->structureTreeView->columnWidth(1)).toInt());
+                ui->structureTreeView->setColumnWidth(2, settings.value("tree/columnWidth2", ui->structureTreeView->columnWidth(2)).toInt());
+                ui->structureTreeView->setColumnWidth(3, settings.value("tree/columnWidth3", ui->structureTreeView->columnWidth(3)).toInt());
+                markingEnabled = settings.value("tree/markingEnabled", true).toBool();
+                ui->actionToggleBootGuardMarking->setChecked(markingEnabled);
+                
+                // Set monospace font for some controls
+                QString fontName;
+                int fontSize;
+#if defined Q_OS_OSX
+                fontName = settings.value("mainWindow/fontName", QString("Menlo")).toString();
+                fontSize = settings.value("mainWindow/fontSize", 10).toInt();
+#elif defined Q_OS_WIN
+                fontName = settings.value("mainWindow/fontName", QString("Consolas")).toString();
+                fontSize = settings.value("mainWindow/fontSize", 9).toInt();
+#else
+                fontName = settings.value("mainWindow/fontName", QString("Courier New")).toString();
+                fontSize = settings.value("mainWindow/fontSize", 10).toInt();
+#endif
+                currentFont = QFont(fontName, fontSize);
+                ui->infoEdit->setFont(currentFont);
+                ui->parserMessagesListWidget->setFont(currentFont);
+                ui->finderMessagesListWidget->setFont(currentFont);
+                ui->builderMessagesListWidget->setFont(currentFont);
+                ui->fitTableWidget->setFont(currentFont);
+                ui->securityEdit->setFont(currentFont);
+                ui->structureTreeView->setFont(currentFont);
+                searchDialog->ui->guidEdit->setFont(currentFont);
+                searchDialog->ui->hexEdit->setFont(currentFont);
+                hexViewDialog->setFont(currentFont);
+                goToAddressDialog->ui->hexSpinBox->setFont(currentFont);
+                goToBaseDialog->ui->hexSpinBox->setFont(currentFont);
+            }
+            
+            void UEFITool::writeSettings()
+            {
+                QSettings settings(this);
+                settings.setValue("mainWindow/geometry", saveGeometry());
+                settings.setValue("mainWindow/windowState", saveState());
+                settings.setValue("mainWindow/treeWidth", ui->structureGroupBox->width());
+                settings.setValue("mainWindow/infoWidth", ui->infoGroupBox->width());
+                settings.setValue("mainWindow/treeHeight", ui->structureGroupBox->height());
+                settings.setValue("mainWindow/messageHeight", ui->messagesTabWidget->height());
+                settings.setValue("tree/columnWidth0", ui->structureTreeView->columnWidth(0));
+                settings.setValue("tree/columnWidth1", ui->structureTreeView->columnWidth(1));
+                settings.setValue("tree/columnWidth2", ui->structureTreeView->columnWidth(2));
+                settings.setValue("tree/columnWidth3", ui->structureTreeView->columnWidth(3));
+                settings.setValue("tree/markingEnabled", markingEnabled);
+                settings.setValue("mainWindow/fontName", currentFont.family());
+                settings.setValue("mainWindow/fontSize", currentFont.pointSize());
+            }
+            
+            void UEFITool::showFitTable()
+            {
+                std::vector<std::pair<std::vector<UString>, UModelIndex> > fitTable = ffsParser->getFitTable();
+                if (fitTable.empty()) {
+                    // Disable FIT tab
+                    ui->messagesTabWidget->setTabEnabled(TAB_FIT, false);
+                    return;
+                }
+                
+                // Enable FIT tab
+                ui->messagesTabWidget->setTabEnabled(TAB_FIT, true);
+                
+                // Set up the FIT table
+                ui->fitTableWidget->clear();
+                ui->fitTableWidget->setRowCount((int)fitTable.size());
+                ui->fitTableWidget->setColumnCount(6);
+                ui->fitTableWidget->setHorizontalHeaderLabels(QStringList() << tr("Address") << tr("Size") << tr("Version") << tr("Checksum") << tr("Type") << tr("Information"));
+                ui->fitTableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
+                ui->fitTableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
+                ui->fitTableWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+                ui->fitTableWidget->horizontalHeader()->setStretchLastSection(true);
+                
+                // Add all data to the table widget
+                for (size_t i = 0; i < fitTable.size(); i++) {
+                    for (UINT8 j = 0; j < 6; j++) {
+                        QTableWidgetItem* item = new QTableWidgetItem(fitTable[i].first[j]);
+                        item->setData(Qt::UserRole, QByteArray((const char*)&fitTable[i].second, sizeof(fitTable[i].second)));
+                        ui->fitTableWidget->setItem((int)i, j, item);
+                    }
+                }
+                
+                ui->fitTableWidget->resizeColumnsToContents();
+                ui->fitTableWidget->resizeRowsToContents();
+                ui->messagesTabWidget->setCurrentIndex(TAB_FIT);
+            }
+            
+            void UEFITool::showSecurityInfo()
+            {
+                // Get security info
+                UString secInfo = ffsParser->getSecurityInfo();
+                if (secInfo.isEmpty()) {
+                    ui->messagesTabWidget->setTabEnabled(TAB_SECURITY, false);
+                    return;
+                }
+                
+                ui->messagesTabWidget->setTabEnabled(TAB_SECURITY, true);
+                ui->securityEdit->setPlainText(secInfo);
+                ui->messagesTabWidget->setCurrentIndex(TAB_SECURITY);
+            }
+            
+            void UEFITool::currentTabChanged(int index)
+            {
+                U_UNUSED_PARAMETER(index);
+                
+                ui->menuMessageActions->setEnabled(false);
+                ui->actionMessagesCopy->setEnabled(false);
+                ui->actionMessagesCopyAll->setEnabled(false);
+                ui->actionMessagesClear->setEnabled(false);
+            }
+            
+            void UEFITool::loadGuidDatabase()
+            {
+                QString path = QFileDialog::getOpenFileName(this, tr("Select GUID database file to load"), currentDir, tr("Comma-separated values files (*.csv);;All files (*)"));
+                if (!path.isEmpty()) {
+                    initGuidDatabase(path);
+                    if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("New GUID database loaded"), tr("Apply new GUID database on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
+                        openImageFile(currentPath);
+                }
+            }
+            
+            void UEFITool::unloadGuidDatabase()
+            {
+                initGuidDatabase();
+                if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("GUID database unloaded"), tr("Apply changes on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
+                    openImageFile(currentPath);
+            }
+            
+            void UEFITool::loadDefaultGuidDatabase()
+            {
+                initGuidDatabase(":/guids.csv");
+                if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("Default GUID database loaded"), tr("Apply default GUID database on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
+                    openImageFile(currentPath);
+            }
+            
+            void UEFITool::exportDiscoveredGuids()
+            {
+                GuidDatabase db = guidDatabaseFromTreeRecursive(model, model->index(0, 0));
+                if (!db.empty()) {
+                    QString path = QFileDialog::getSaveFileName(this, tr("Save parsed GUIDs to database"), currentPath + ".guids.csv", tr("Comma-separated values files (*.csv);;All files (*)"));
+                    if (!path.isEmpty())
+                        guidDatabaseExportToFile(path, db);
+                }
+            }
+            
+            void UEFITool::generateReport()
+            {
+                QString path = QFileDialog::getSaveFileName(this, tr("Save report to text file"), currentPath + ".report.txt", tr("Text files (*.txt);;All files (*)"));
+                if (!path.isEmpty()) {
+                    std::vector<QString> report = ffsReport->generate();
+                    if (report.size()) {
+                        QFile file;
+                        file.setFileName(path);
+                        if (file.open(QFile::Text | QFile::WriteOnly)) {
+                            for (size_t i = 0; i < report.size(); i++) {
+                                file.write(report[i].toLatin1().append('\n'));
+                            }
+                            file.close();
+                        }
+                    }
+                }
+            }

UEFITool/uefitool.desktop

@@ -3,8 +3,9 @@ Type=Application
 Version=1.0
 Name=UEFITool
 Comment=UEFI firmware image viewer and editor
+Path=/usr/bin
 Exec=uefitool
 Icon=uefitool
 Terminal=false
 Categories=Development;System;Utility;HardwareSettings;Electronics;Engineering;
-Keywords=BIOS;UEFI;
+Keywords=BIOS;

UEFITool/uefitool.h

@@ -27,12 +27,10 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QMimeData>
-#include <QPalette>
 #include <QPlainTextEdit>
 #include <QProcess>
 #include <QSettings>
 #include <QSplitter>
-#include <QStyleFactory>
 #include <QString>
 #include <QTableWidget>
 #include <QTreeView>
@@ -127,10 +125,6 @@ private slots:
 
     void currentTabChanged(int index);
 
-#if QT_VERSION_MAJOR >= 6 && QT_VERSION_MINOR >= 5
-    void updateUiForNewColorScheme(Qt::ColorScheme scheme);
-#endif
-
 private:
     Ui::UEFITool* ui;
     TreeModel* model;

UEFITool/uefitool.pro

@@ -15,7 +15,7 @@ HEADERS += uefitool.h \
  hexviewdialog.h \
  gotobasedialog.h \
  gotoaddressdialog.h \
- hexlineedit.h \
+ guidlineedit.h \
  ffsfinder.h \
  hexspinbox.h \
  ../common/fitparser.h \
@@ -37,6 +37,7 @@ HEADERS += uefitool.h \
  ../common/ffsparser.h \
  ../common/ffsreport.h \
  ../common/treeitem.h \
+ ../common/ffsutils.h \
  ../common/intel_fit.h \
  ../common/intel_microcode.h \
  ../common/treemodel.h \
@@ -46,22 +47,9 @@ HEADERS += uefitool.h \
  ../common/Tiano/EfiTianoCompress.h \
  ../common/ustring.h \
  ../common/ubytearray.h \
- ../common/umemstream.h \
  ../common/digest/sha1.h \
  ../common/digest/sha2.h \
  ../common/digest/sm3.h \
- ../common/generated/ami_nvar.h \
- ../common/generated/apple_sysf.h \
- ../common/generated/dell_dvar.h \
- ../common/generated/edk2_vss.h \
- ../common/generated/edk2_vss2.h \
- ../common/generated/edk2_ftw.h \
- ../common/generated/insyde_fdc.h \
- ../common/generated/insyde_fdm.h \
- ../common/generated/ms_slic_marker.h \
- ../common/generated/ms_slic_pubkey.h \
- ../common/generated/phoenix_flm.h \
- ../common/generated/phoenix_evsa.h \
  ../common/generated/intel_acbp_v1.h \
  ../common/generated/intel_acbp_v2.h \
  ../common/generated/intel_keym_v1.h \
@@ -73,27 +61,15 @@ HEADERS += uefitool.h \
  ../common/zlib/zlib.h \
  ../common/zlib/crc32.h \
  ../version.h \
- QHexView/include/QHexView/model/buffer/qhexbuffer.h \
+ qhexedit2/qhexedit.h \
- QHexView/include/QHexView/model/buffer/qdevicebuffer.h \
+ qhexedit2/chunks.h \
- QHexView/include/QHexView/model/buffer/qmemorybuffer.h \
+ qhexedit2/commands.h
- QHexView/include/QHexView/model/buffer/qmappedfilebuffer.h \
- QHexView/include/QHexView/model/commands/hexcommand.h \
- QHexView/include/QHexView/model/commands/insertcommand.h \
- QHexView/include/QHexView/model/commands/removecommand.h \
- QHexView/include/QHexView/model/commands/replacecommand.h \
- QHexView/include/QHexView/model/qhexcursor.h \
- QHexView/include/QHexView/model/qhexdelegate.h \
- QHexView/include/QHexView/model/qhexdocument.h \
- QHexView/include/QHexView/model/qhexmetadata.h \
- QHexView/include/QHexView/model/qhexoptions.h \
- QHexView/include/QHexView/model/qhexutils.h \
- QHexView/include/QHexView/qhexview.h
 
 SOURCES += uefitool_main.cpp \
  uefitool.cpp \
  searchdialog.cpp \
  hexviewdialog.cpp \
- hexlineedit.cpp \
+ guidlineedit.cpp \
  ffsfinder.cpp \
  hexspinbox.cpp \
  ../common/fitparser.cpp \
@@ -110,6 +86,7 @@ SOURCES += uefitool_main.cpp \
  ../common/ffsbuilder.cpp \
  ../common/ffsparser.cpp \
  ../common/ffsreport.cpp \
+ ../common/ffsutils.cpp \
  ../common/treeitem.cpp \
  ../common/treemodel.cpp \
  ../common/LZMA/LzmaCompress.c \
@@ -128,18 +105,6 @@ SOURCES += uefitool_main.cpp \
  ../common/digest/sha256.c \
  ../common/digest/sha512.c \
  ../common/digest/sm3.c \
- ../common/generated/ami_nvar.cpp \
- ../common/generated/apple_sysf.cpp \
- ../common/generated/dell_dvar.cpp \
- ../common/generated/edk2_vss.cpp \
- ../common/generated/edk2_vss2.cpp \
- ../common/generated/edk2_ftw.cpp \
- ../common/generated/insyde_fdc.cpp \
- ../common/generated/insyde_fdm.cpp \
- ../common/generated/ms_slic_marker.cpp \
- ../common/generated/ms_slic_pubkey.cpp \
- ../common/generated/phoenix_flm.cpp \
- ../common/generated/phoenix_evsa.cpp \
  ../common/generated/intel_acbp_v1.cpp \
  ../common/generated/intel_acbp_v2.cpp \
  ../common/generated/intel_keym_v1.cpp \
@@ -161,22 +126,9 @@ SOURCES += uefitool_main.cpp \
  ../common/zlib/trees.c \
  ../common/zlib/uncompr.c \
  ../common/zlib/zutil.c \
- QHexView/src/model/buffer/qhexbuffer.cpp \
+ qhexedit2/qhexedit.cpp \
- QHexView/src/model/buffer/qdevicebuffer.cpp \
+ qhexedit2/chunks.cpp \
- QHexView/src/model/buffer/qmemorybuffer.cpp \
+ qhexedit2/commands.cpp
- QHexView/src/model/buffer/qmappedfilebuffer.cpp \
- QHexView/src/model/commands/hexcommand.cpp \
- QHexView/src/model/commands/insertcommand.cpp \
- QHexView/src/model/commands/removecommand.cpp \
- QHexView/src/model/commands/replacecommand.cpp \
- QHexView/src/model/qhexcursor.cpp \
- QHexView/src/model/qhexdelegate.cpp \
- QHexView/src/model/qhexdocument.cpp \
- QHexView/src/model/qhexmetadata.cpp \
- QHexView/src/model/qhexutils.cpp \
- QHexView/src/qhexview.cpp
-
-INCLUDEPATH += QHexView/include/
 
 FORMS += uefitool.ui \
  searchdialog.ui \

UEFITool/uefitool_main.cpp

@@ -1,6 +1,6 @@
 /* uefitool_main.cpp
  
- Copyright (c) 2022, Nikolaj Schlej. All rights reserved.
+ Copyright (c) 2018, LongSoft. All rights reserved.
  This program and the accompanying materials
  are licensed and made available under the terms and conditions of the BSD License
  which accompanies this distribution.  The full text of the license may be found at
@@ -23,12 +23,10 @@ public:
     UEFIToolApplication(int &argc, char **argv)
     : QApplication(argc, argv)
     {
-        setOrganizationName("CodeRush");
+        setOrganizationName("LongSoft");
-        setOrganizationDomain("coderush.me");
+        setOrganizationDomain("longsoft.org");
-        setApplicationName("UEFITool");
+        setApplicationName("UEFITool NE");
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
+        
-        setDesktopFileName("uefitool");
-#endif
         tool = new UEFITool();
     }
     

appstream/appdata.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>com.github.LongSoft.UEFITool</id>
-  <launchable type="desktop-id">com.github.LongSoft.UEFITool.desktop</launchable>
-  <name>UEFITool</name>
-  <summary>UEFI firmware image viewer and editor</summary>
-  <description>
-    <p>UEFITool is a cross-platform open source application, that parses UEFI PI-compatible firmware image into a tree structure, verifies image integrity and provides a GUI to manipulate image elements.</p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image type="source">https://github.com/LongSoft/UEFITool/raw/new_engine/appstream/UEFITool.png</image>
-    </screenshot>
-  </screenshots>
-  <releases>
-    <release version="A70" date="2025-03-13" />
-  </releases>
-  <url type="homepage">https://github.com/LongSoft/UEFITool</url>
-  <developer_name>LongSoft</developer_name>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>BSD-2-Clause</project_license>
-  <content_rating type="oars-1.1" />
-</component>

common/LZMA/SDK/C/7zTypes.h

@@ -1,8 +1,8 @@
 /* 7zTypes.h -- Basic types
-2024-01-24 : Igor Pavlov : Public domain */
+2022-04-01 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_7Z_TYPES_H
+#ifndef __7Z_TYPES_H
-#define ZIP7_7Z_TYPES_H
+#define __7Z_TYPES_H
 
 #ifdef _WIN32
 /* #include <windows.h> */
@@ -52,11 +52,6 @@ typedef int SRes;
     #define MY_ALIGN(n)
   #endif
 #else
-  /*
-  // C11/C++11:
-  #include <stdalign.h>
-  #define MY_ALIGN(n) alignas(n)
-  */
   #define MY_ALIGN(n) __attribute__ ((aligned(n)))
 #endif
 
@@ -67,7 +62,7 @@ typedef int SRes;
 typedef unsigned WRes;
 #define MY_SRes_HRESULT_FROM_WRes(x) HRESULT_FROM_WIN32(x)
 
-// #define MY_HRES_ERROR_INTERNAL_ERROR  MY_SRes_HRESULT_FROM_WRes(ERROR_INTERNAL_ERROR)
+// #define MY_HRES_ERROR__INTERNAL_ERROR  MY_SRes_HRESULT_FROM_WRes(ERROR_INTERNAL_ERROR)
 
 #else // _WIN32
 
@@ -75,13 +70,13 @@ typedef unsigned WRes;
 typedef int WRes;
 
 // (FACILITY_ERRNO = 0x800) is 7zip's FACILITY constant to represent (errno) errors in HRESULT
-#define MY_FACILITY_ERRNO  0x800
+#define MY__FACILITY_ERRNO  0x800
-#define MY_FACILITY_WIN32  7
+#define MY__FACILITY_WIN32  7
-#define MY_FACILITY_WRes  MY_FACILITY_ERRNO
+#define MY__FACILITY__WRes  MY__FACILITY_ERRNO
 
 #define MY_HRESULT_FROM_errno_CONST_ERROR(x) ((HRESULT)( \
           ( (HRESULT)(x) & 0x0000FFFF) \
-          | (MY_FACILITY_WRes << 16)  \
+          | (MY__FACILITY__WRes << 16)  \
           | (HRESULT)0x80000000 ))
 
 #define MY_SRes_HRESULT_FROM_WRes(x) \
@@ -125,17 +120,17 @@ typedef int WRes;
 #define ERROR_INVALID_REPARSE_DATA  ((HRESULT)0x80071128L)
 #define ERROR_REPARSE_TAG_INVALID   ((HRESULT)0x80071129L)
 
-// if (MY_FACILITY_WRes != FACILITY_WIN32),
+// if (MY__FACILITY__WRes != FACILITY_WIN32),
 // we use FACILITY_WIN32 for COM errors:
 #define E_OUTOFMEMORY               ((HRESULT)0x8007000EL)
 #define E_INVALIDARG                ((HRESULT)0x80070057L)
-#define MY_E_ERROR_NEGATIVE_SEEK    ((HRESULT)0x80070083L)
+#define MY__E_ERROR_NEGATIVE_SEEK   ((HRESULT)0x80070083L)
 
 /*
 // we can use FACILITY_ERRNO for some COM errors, that have errno equivalents:
 #define E_OUTOFMEMORY             MY_HRESULT_FROM_errno_CONST_ERROR(ENOMEM)
 #define E_INVALIDARG              MY_HRESULT_FROM_errno_CONST_ERROR(EINVAL)
-#define MY_E_ERROR_NEGATIVE_SEEK  MY_HRESULT_FROM_errno_CONST_ERROR(EINVAL)
+#define MY__E_ERROR_NEGATIVE_SEEK MY_HRESULT_FROM_errno_CONST_ERROR(EINVAL)
 */
 
 #define TEXT(quote) quote
@@ -161,18 +156,18 @@ typedef int WRes;
 
 
 #ifndef RINOK
-#define RINOK(x) { const int _result_ = (x); if (_result_ != 0) return _result_; }
+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
 #endif
 
 #ifndef RINOK_WRes
-#define RINOK_WRes(x) { const WRes _result_ = (x); if (_result_ != 0) return _result_; }
+#define RINOK_WRes(x) { WRes __result__ = (x); if (__result__ != 0) return __result__; }
 #endif
 
 typedef unsigned char Byte;
 typedef short Int16;
 typedef unsigned short UInt16;
 
-#ifdef Z7_DECL_Int32_AS_long
+#ifdef _LZMA_UINT32_IS_ULONG
 typedef long Int32;
 typedef unsigned long UInt32;
 #else
@@ -211,51 +206,37 @@ typedef size_t SIZE_T;
 #endif //  _WIN32
 
 
-#define MY_HRES_ERROR_INTERNAL_ERROR  ((HRESULT)0x8007054FL)
+#define MY_HRES_ERROR__INTERNAL_ERROR  ((HRESULT)0x8007054FL)
 
 
-#ifdef Z7_DECL_Int64_AS_long
+#ifdef _SZ_NO_INT_64
+
+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
+   NOTES: Some code will work incorrectly in that case! */
 
 typedef long Int64;
 typedef unsigned long UInt64;
 
 #else
 
-#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(__clang__)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 typedef __int64 Int64;
 typedef unsigned __int64 UInt64;
-#else
+#define UINT64_CONST(n) n
-#if defined(__clang__) || defined(__GNUC__)
-#include <stdint.h>
-typedef int64_t Int64;
-typedef uint64_t UInt64;
 #else
 typedef long long int Int64;
 typedef unsigned long long int UInt64;
-// #define UINT64_CONST(n) n ## ULL
+#define UINT64_CONST(n) n ## ULL
-#endif
 #endif
 
 #endif
 
-#define UINT64_CONST(n) n
+#ifdef _LZMA_NO_SYSTEM_SIZE_T
-
+typedef UInt32 SizeT;
-
-#ifdef Z7_DECL_SizeT_AS_unsigned_int
-typedef unsigned int SizeT;
 #else
 typedef size_t SizeT;
 #endif
 
-/*
-#if (defined(_MSC_VER) && _MSC_VER <= 1200)
-typedef size_t MY_uintptr_t;
-#else
-#include <stdint.h>
-typedef uintptr_t MY_uintptr_t;
-#endif
-*/
-
 typedef int BoolInt;
 /* typedef BoolInt Bool; */
 #define True 1
@@ -263,23 +244,23 @@ typedef int BoolInt;
 
 
 #ifdef _WIN32
-#define Z7_STDCALL __stdcall
+#define MY_STD_CALL __stdcall
 #else
-#define Z7_STDCALL
+#define MY_STD_CALL
 #endif
 
 #ifdef _MSC_VER
 
 #if _MSC_VER >= 1300
-#define Z7_NO_INLINE __declspec(noinline)
+#define MY_NO_INLINE __declspec(noinline)
 #else
-#define Z7_NO_INLINE
+#define MY_NO_INLINE
 #endif
 
-#define Z7_FORCE_INLINE __forceinline
+#define MY_FORCE_INLINE __forceinline
 
-#define Z7_CDECL      __cdecl
+#define MY_CDECL __cdecl
-#define Z7_FASTCALL  __fastcall
+#define MY_FAST_CALL __fastcall
 
 #else //  _MSC_VER
 
@@ -287,25 +268,27 @@ typedef int BoolInt;
     || (defined(__clang__) && (__clang_major__ >= 4)) \
     || defined(__INTEL_COMPILER) \
     || defined(__xlC__)
-#define Z7_NO_INLINE      __attribute__((noinline))
+#define MY_NO_INLINE __attribute__((noinline))
-#define Z7_FORCE_INLINE   __attribute__((always_inline)) inline
+// #define MY_FORCE_INLINE __attribute__((always_inline)) inline
 #else
-#define Z7_NO_INLINE
+#define MY_NO_INLINE
-#define Z7_FORCE_INLINE
 #endif
 
-#define Z7_CDECL
+#define MY_FORCE_INLINE
+
+
+#define MY_CDECL
 
 #if  defined(_M_IX86) \
   || defined(__i386__)
-// #define Z7_FASTCALL __attribute__((fastcall))
+// #define MY_FAST_CALL __attribute__((fastcall))
-// #define Z7_FASTCALL __attribute__((cdecl))
+// #define MY_FAST_CALL __attribute__((cdecl))
-#define Z7_FASTCALL
+#define MY_FAST_CALL
 #elif defined(MY_CPU_AMD64)
-// #define Z7_FASTCALL __attribute__((ms_abi))
+// #define MY_FAST_CALL __attribute__((ms_abi))
-#define Z7_FASTCALL
+#define MY_FAST_CALL
 #else
-#define Z7_FASTCALL
+#define MY_FAST_CALL
 #endif
 
 #endif //  _MSC_VER
@@ -313,49 +296,41 @@ typedef int BoolInt;
 
 /* The following interfaces use first parameter as pointer to structure */
 
-// #define Z7_C_IFACE_CONST_QUAL
+typedef struct IByteIn IByteIn;
-#define Z7_C_IFACE_CONST_QUAL const
+struct IByteIn
-
-#define Z7_C_IFACE_DECL(a) \
-  struct a ## _; \
-  typedef Z7_C_IFACE_CONST_QUAL struct a ## _ * a ## Ptr; \
-  typedef struct a ## _ a; \
-  struct a ## _
-
-
-Z7_C_IFACE_DECL (IByteIn)
 {
-  Byte (*Read)(IByteInPtr p); /* reads one byte, returns 0 in case of EOF or error */
+  Byte (*Read)(const IByteIn *p); /* reads one byte, returns 0 in case of EOF or error */
 };
 #define IByteIn_Read(p) (p)->Read(p)
 
 
-Z7_C_IFACE_DECL (IByteOut)
+typedef struct IByteOut IByteOut;
+struct IByteOut
 {
-  void (*Write)(IByteOutPtr p, Byte b);
+  void (*Write)(const IByteOut *p, Byte b);
 };
 #define IByteOut_Write(p, b) (p)->Write(p, b)
 
 
-Z7_C_IFACE_DECL (ISeqInStream)
+typedef struct ISeqInStream ISeqInStream;
+struct ISeqInStream
 {
-  SRes (*Read)(ISeqInStreamPtr p, void *buf, size_t *size);
+  SRes (*Read)(const ISeqInStream *p, void *buf, size_t *size);
     /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
        (output(*size) < input(*size)) is allowed */
 };
 #define ISeqInStream_Read(p, buf, size) (p)->Read(p, buf, size)
 
-/* try to read as much as avail in stream and limited by (*processedSize) */
-SRes SeqInStream_ReadMax(ISeqInStreamPtr stream, void *buf, size_t *processedSize);
 /* it can return SZ_ERROR_INPUT_EOF */
-// SRes SeqInStream_Read(ISeqInStreamPtr stream, void *buf, size_t size);
+SRes SeqInStream_Read(const ISeqInStream *stream, void *buf, size_t size);
-// SRes SeqInStream_Read2(ISeqInStreamPtr stream, void *buf, size_t size, SRes errorType);
+SRes SeqInStream_Read2(const ISeqInStream *stream, void *buf, size_t size, SRes errorType);
-SRes SeqInStream_ReadByte(ISeqInStreamPtr stream, Byte *buf);
+SRes SeqInStream_ReadByte(const ISeqInStream *stream, Byte *buf);
 
 
-Z7_C_IFACE_DECL (ISeqOutStream)
+typedef struct ISeqOutStream ISeqOutStream;
+struct ISeqOutStream
 {
-  size_t (*Write)(ISeqOutStreamPtr p, const void *buf, size_t size);
+  size_t (*Write)(const ISeqOutStream *p, const void *buf, size_t size);
     /* Returns: result - the number of actually written bytes.
        (result < size) means error */
 };
@@ -369,26 +344,29 @@ typedef enum
 } ESzSeek;
 
 
-Z7_C_IFACE_DECL (ISeekInStream)
+typedef struct ISeekInStream ISeekInStream;
+struct ISeekInStream
 {
-  SRes (*Read)(ISeekInStreamPtr p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
+  SRes (*Read)(const ISeekInStream *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
-  SRes (*Seek)(ISeekInStreamPtr p, Int64 *pos, ESzSeek origin);
+  SRes (*Seek)(const ISeekInStream *p, Int64 *pos, ESzSeek origin);
 };
 #define ISeekInStream_Read(p, buf, size)   (p)->Read(p, buf, size)
 #define ISeekInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)
 
 
-Z7_C_IFACE_DECL (ILookInStream)
+typedef struct ILookInStream ILookInStream;
+struct ILookInStream
 {
-  SRes (*Look)(ILookInStreamPtr p, const void **buf, size_t *size);
+  SRes (*Look)(const ILookInStream *p, const void **buf, size_t *size);
     /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
        (output(*size) > input(*size)) is not allowed
        (output(*size) < input(*size)) is allowed */
-  SRes (*Skip)(ILookInStreamPtr p, size_t offset);
+  SRes (*Skip)(const ILookInStream *p, size_t offset);
     /* offset must be <= output(*size) of Look */
-  SRes (*Read)(ILookInStreamPtr p, void *buf, size_t *size);
+
+  SRes (*Read)(const ILookInStream *p, void *buf, size_t *size);
     /* reads directly (without buffer). It's same as ISeqInStream::Read */
-  SRes (*Seek)(ILookInStreamPtr p, Int64 *pos, ESzSeek origin);
+  SRes (*Seek)(const ILookInStream *p, Int64 *pos, ESzSeek origin);
 };
 
 #define ILookInStream_Look(p, buf, size)   (p)->Look(p, buf, size)
@@ -397,18 +375,19 @@ Z7_C_IFACE_DECL (ILookInStream)
 #define ILookInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)
 
 
-SRes LookInStream_LookRead(ILookInStreamPtr stream, void *buf, size_t *size);
+SRes LookInStream_LookRead(const ILookInStream *stream, void *buf, size_t *size);
-SRes LookInStream_SeekTo(ILookInStreamPtr stream, UInt64 offset);
+SRes LookInStream_SeekTo(const ILookInStream *stream, UInt64 offset);
 
 /* reads via ILookInStream::Read */
-SRes LookInStream_Read2(ILookInStreamPtr stream, void *buf, size_t size, SRes errorType);
+SRes LookInStream_Read2(const ILookInStream *stream, void *buf, size_t size, SRes errorType);
-SRes LookInStream_Read(ILookInStreamPtr stream, void *buf, size_t size);
+SRes LookInStream_Read(const ILookInStream *stream, void *buf, size_t size);
+
 
 
 typedef struct
 {
   ILookInStream vt;
-  ISeekInStreamPtr realStream;
+  const ISeekInStream *realStream;
  
   size_t pos;
   size_t size; /* it's data size */
@@ -420,13 +399,13 @@ typedef struct
 
 void LookToRead2_CreateVTable(CLookToRead2 *p, int lookahead);
 
-#define LookToRead2_INIT(p) { (p)->pos = (p)->size = 0; }
+#define LookToRead2_Init(p) { (p)->pos = (p)->size = 0; }
 
 
 typedef struct
 {
   ISeqInStream vt;
-  ILookInStreamPtr realStream;
+  const ILookInStream *realStream;
 } CSecToLook;
 
 void SecToLook_CreateVTable(CSecToLook *p);
@@ -436,19 +415,20 @@ void SecToLook_CreateVTable(CSecToLook *p);
 typedef struct
 {
   ISeqInStream vt;
-  ILookInStreamPtr realStream;
+  const ILookInStream *realStream;
 } CSecToRead;
 
 void SecToRead_CreateVTable(CSecToRead *p);
 
 
-Z7_C_IFACE_DECL (ICompressProgress)
+typedef struct ICompressProgress ICompressProgress;
+
+struct ICompressProgress
 {
-  SRes (*Progress)(ICompressProgressPtr p, UInt64 inSize, UInt64 outSize);
+  SRes (*Progress)(const ICompressProgress *p, UInt64 inSize, UInt64 outSize);
     /* Returns: result. (result != SZ_OK) means break.
        Value (UInt64)(Int64)-1 for size means unknown value. */
 };
-
 #define ICompressProgress_Progress(p, inSize, outSize) (p)->Progress(p, inSize, outSize)
 
 
@@ -486,13 +466,13 @@ struct ISzAlloc
 
 
 
-#ifndef Z7_container_of
+#ifndef MY_container_of
 
 /*
-#define Z7_container_of(ptr, type, m) container_of(ptr, type, m)
+#define MY_container_of(ptr, type, m) container_of(ptr, type, m)
-#define Z7_container_of(ptr, type, m) CONTAINING_RECORD(ptr, type, m)
+#define MY_container_of(ptr, type, m) CONTAINING_RECORD(ptr, type, m)
-#define Z7_container_of(ptr, type, m) ((type *)((char *)(ptr) - offsetof(type, m)))
+#define MY_container_of(ptr, type, m) ((type *)((char *)(ptr) - offsetof(type, m)))
-#define Z7_container_of(ptr, type, m) (&((type *)0)->m == (ptr), ((type *)(((char *)(ptr)) - MY_offsetof(type, m))))
+#define MY_container_of(ptr, type, m) (&((type *)0)->m == (ptr), ((type *)(((char *)(ptr)) - MY_offsetof(type, m))))
 */
 
 /*
@@ -501,64 +481,24 @@ struct ISzAlloc
     GCC 4.8.1 : classes with non-public variable members"
 */
 
-#define Z7_container_of(ptr, type, m) \
+#define MY_container_of(ptr, type, m) ((type *)(void *)((char *)(void *)(1 ? (ptr) : &((type *)0)->m) - MY_offsetof(type, m)))
-  ((type *)(void *)((char *)(void *) \
-  (1 ? (ptr) : &((type *)NULL)->m) - MY_offsetof(type, m)))
 
-#define Z7_container_of_CONST(ptr, type, m) \
+#endif
-  ((const type *)(const void *)((const char *)(const void *) \
+
-  (1 ? (ptr) : &((type *)NULL)->m) - MY_offsetof(type, m)))
+#define CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m) ((type *)(void *)(ptr))
 
 /*
-#define Z7_container_of_NON_CONST_FROM_CONST(ptr, type, m) \
+#define CONTAINER_FROM_VTBL(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)
-  ((type *)(void *)(const void *)((const char *)(const void *) \
-  (1 ? (ptr) : &((type *)NULL)->m) - MY_offsetof(type, m)))
 */
+#define CONTAINER_FROM_VTBL(ptr, type, m) MY_container_of(ptr, type, m)
 
-#endif
+#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)
-
-#define Z7_CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m) ((type *)(void *)(ptr))
-
-// #define Z7_CONTAINER_FROM_VTBL(ptr, type, m) Z7_CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)
-#define Z7_CONTAINER_FROM_VTBL(ptr, type, m) Z7_container_of(ptr, type, m)
-// #define Z7_CONTAINER_FROM_VTBL(ptr, type, m) Z7_container_of_NON_CONST_FROM_CONST(ptr, type, m)
-
-#define Z7_CONTAINER_FROM_VTBL_CONST(ptr, type, m) Z7_container_of_CONST(ptr, type, m)
-
-#define Z7_CONTAINER_FROM_VTBL_CLS(ptr, type, m) Z7_CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)
 /*
-#define Z7_CONTAINER_FROM_VTBL_CLS(ptr, type, m) Z7_CONTAINER_FROM_VTBL(ptr, type, m)
+#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL(ptr, type, m)
 */
-#if defined (__clang__) || defined(__GNUC__)
-#define Z7_DIAGNOSTIC_IGNORE_BEGIN_CAST_QUAL \
-  _Pragma("GCC diagnostic push") \
-  _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#define Z7_DIAGNOSTIC_IGNORE_END_CAST_QUAL \
-  _Pragma("GCC diagnostic pop")
-#else
-#define Z7_DIAGNOSTIC_IGNORE_BEGIN_CAST_QUAL
-#define Z7_DIAGNOSTIC_IGNORE_END_CAST_QUAL
-#endif
-
-#define Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR(ptr, type, m, p) \
-  Z7_DIAGNOSTIC_IGNORE_BEGIN_CAST_QUAL \
-  type *p = Z7_CONTAINER_FROM_VTBL(ptr, type, m); \
-  Z7_DIAGNOSTIC_IGNORE_END_CAST_QUAL
-
-#define Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(type) \
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR(pp, type, vt, p)
 
 
-// #define ZIP7_DECLARE_HANDLE(name)  typedef void *name;
+#define MY_memset_0_ARRAY(a) memset((a), 0, sizeof(a))
-#define Z7_DECLARE_HANDLE(name)  struct name##_dummy{int unused;}; typedef struct name##_dummy *name;
-
-
-#define Z7_memset_0_ARRAY(a)  memset((a), 0, sizeof(a))
-
-#ifndef Z7_ARRAY_SIZE
-#define Z7_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
 
 #ifdef _WIN32
 
@@ -587,11 +527,3 @@ struct ISzAlloc
 EXTERN_C_END
 
 #endif
-
-/*
-#ifndef Z7_ST
-#ifdef _7ZIP_ST
-#define Z7_ST
-#endif
-#endif
-*/

common/LZMA/SDK/C/7zVersion.h

@@ -1,7 +1,7 @@
-#define MY_VER_MAJOR 24
+#define MY_VER_MAJOR 22
-#define MY_VER_MINOR 9
+#define MY_VER_MINOR 01
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "24.09"
+#define MY_VERSION_NUMBERS "22.01"
 #define MY_VERSION MY_VERSION_NUMBERS
 
 #ifdef MY_CPU_NAME
@@ -10,12 +10,12 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2024-11-29"
+#define MY_DATE "2022-07-15"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov"
 #define MY_COPYRIGHT_PD "Igor Pavlov : Public domain"
-#define MY_COPYRIGHT_CR "Copyright (c) 1999-2024 Igor Pavlov"
+#define MY_COPYRIGHT_CR "Copyright (c) 1999-2022 Igor Pavlov"
 
 #ifdef USE_COPYRIGHT_CR
   #define MY_COPYRIGHT MY_COPYRIGHT_CR

common/LZMA/SDK/C/7zWindows.h

@@ -1,101 +0,0 @@
-/* 7zWindows.h -- StdAfx
-2023-04-02 : Igor Pavlov : Public domain */
-
-#ifndef ZIP7_INC_7Z_WINDOWS_H
-#define ZIP7_INC_7Z_WINDOWS_H
-
-#ifdef _WIN32
-
-#if defined(__clang__)
-# pragma clang diagnostic push
-#endif
-
-#if defined(_MSC_VER)
-
-#pragma warning(push)
-#pragma warning(disable : 4668) // '_WIN32_WINNT' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
-
-#if _MSC_VER == 1900
-// for old kit10 versions
-// #pragma warning(disable : 4255) // winuser.h(13979): warning C4255: 'GetThreadDpiAwarenessContext':
-#endif
-// win10 Windows Kit:
-#endif // _MSC_VER
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200 && !defined(_WIN64)
-// for msvc6 without sdk2003
-#define RPC_NO_WINDOWS_H
-#endif
-
-#if defined(__MINGW32__) || defined(__MINGW64__)
-// #if defined(__GNUC__) && !defined(__clang__)
-#include <windows.h>
-#else
-#include <Windows.h>
-#endif
-// #include <basetsd.h>
-// #include <wtypes.h>
-
-// but if precompiled with clang-cl then we need
-// #include <windows.h>
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#if defined(__clang__)
-# pragma clang diagnostic pop
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200 && !defined(_WIN64)
-#ifndef _W64
-
-typedef long LONG_PTR, *PLONG_PTR;
-typedef unsigned long ULONG_PTR, *PULONG_PTR;
-typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
-
-#define Z7_OLD_WIN_SDK
-#endif // _W64
-#endif // _MSC_VER == 1200
-
-#ifdef Z7_OLD_WIN_SDK
-
-#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-#ifndef INVALID_SET_FILE_POINTER
-#define INVALID_SET_FILE_POINTER ((DWORD)-1)
-#endif
-#ifndef FILE_SPECIAL_ACCESS
-#define FILE_SPECIAL_ACCESS    (FILE_ANY_ACCESS)
-#endif
-
-// ShlObj.h:
-// #define BIF_NEWDIALOGSTYLE     0x0040
-
-#pragma warning(disable : 4201)
-// #pragma warning(disable : 4115)
-
-#undef  VARIANT_TRUE
-#define VARIANT_TRUE ((VARIANT_BOOL)-1)
-#endif
-
-#endif // Z7_OLD_WIN_SDK
-
-#ifdef UNDER_CE
-#undef  VARIANT_TRUE
-#define VARIANT_TRUE ((VARIANT_BOOL)-1)
-#endif
-
-
-#if defined(_MSC_VER)
-#if _MSC_VER >= 1400 && _MSC_VER <= 1600
-  // BaseTsd.h(148) : 'HandleToULong' : unreferenced inline function has been removed
-  // string.h
-  // #pragma warning(disable : 4514)
-#endif
-#endif
-
-
-/* #include "7zTypes.h" */
-
-#endif

common/LZMA/SDK/C/Bra.c

@@ -1,709 +1,230 @@
-/* Bra.c -- Branch converters for RISC code
+/* Bra.c -- Converters for RISC code
-2024-01-20 : Igor Pavlov : Public domain */
+2021-02-09 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
-#include "Bra.h"
-#include "RotateDefs.h"
 #include "CpuArch.h"
+#include "Bra.h"
 
-#if defined(MY_CPU_SIZEOF_POINTER) \
+SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
-    && ( MY_CPU_SIZEOF_POINTER == 4 \
-      || MY_CPU_SIZEOF_POINTER == 8)
-  #define BR_CONV_USE_OPT_PC_PTR
-#endif
-
-#ifdef BR_CONV_USE_OPT_PC_PTR
-#define BR_PC_INIT  pc -= (UInt32)(SizeT)p;
-#define BR_PC_GET   (pc + (UInt32)(SizeT)p)
-#else
-#define BR_PC_INIT  pc += (UInt32)size;
-#define BR_PC_GET   (pc - (UInt32)(SizeT)(lim - p))
-// #define BR_PC_INIT
-// #define BR_PC_GET   (pc + (UInt32)(SizeT)(p - data))
-#endif
-
-#define BR_CONVERT_VAL(v, c) if (encoding) v += c; else v -= c;
-// #define BR_CONVERT_VAL(v, c) if (!encoding) c = (UInt32)0 - c; v += c;
-
-#define Z7_BRANCH_CONV(name) z7_ ## name
-
-#define Z7_BRANCH_FUNC_MAIN(name) \
-static \
-Z7_FORCE_INLINE \
-Z7_ATTRIB_NO_VECTOR \
-Byte *Z7_BRANCH_CONV(name)(Byte *p, SizeT size, UInt32 pc, int encoding)
-
-#define Z7_BRANCH_FUNC_IMP(name, m, encoding) \
-Z7_NO_INLINE \
-Z7_ATTRIB_NO_VECTOR \
-Byte *m(name)(Byte *data, SizeT size, UInt32 pc) \
-  { return Z7_BRANCH_CONV(name)(data, size, pc, encoding); } \
-
-#ifdef Z7_EXTRACT_ONLY
-#define Z7_BRANCH_FUNCS_IMP(name) \
-  Z7_BRANCH_FUNC_IMP(name, Z7_BRANCH_CONV_DEC_2, 0)
-#else
-#define Z7_BRANCH_FUNCS_IMP(name) \
-  Z7_BRANCH_FUNC_IMP(name, Z7_BRANCH_CONV_DEC_2, 0) \
-  Z7_BRANCH_FUNC_IMP(name, Z7_BRANCH_CONV_ENC_2, 1)
-#endif
-
-#if defined(__clang__)
-#define BR_EXTERNAL_FOR
-#define BR_NEXT_ITERATION  continue;
-#else
-#define BR_EXTERNAL_FOR    for (;;)
-#define BR_NEXT_ITERATION  break;
-#endif
-
-#if defined(__clang__) && (__clang_major__ >= 8) \
-  || defined(__GNUC__) && (__GNUC__ >= 1000) \
-  // GCC is not good for __builtin_expect() here
-  /* || defined(_MSC_VER) && (_MSC_VER >= 1920) */
-  // #define Z7_unlikely [[unlikely]]
-  // #define Z7_LIKELY(x)   (__builtin_expect((x), 1))
-  #define Z7_UNLIKELY(x) (__builtin_expect((x), 0))
-  // #define Z7_likely [[likely]]
-#else
-  // #define Z7_LIKELY(x)   (x)
-  #define Z7_UNLIKELY(x) (x)
-  // #define Z7_likely
-#endif
-
-
-Z7_BRANCH_FUNC_MAIN(BranchConv_ARM64)
 {
-  // Byte *p = data;
+  Byte *p;
   const Byte *lim;
-  const UInt32 flag = (UInt32)1 << (24 - 4);
+  size &= ~(size_t)3;
-  const UInt32 mask = ((UInt32)1 << 24) - (flag << 1);
+  ip += 4;
-  size &= ~(SizeT)3;
+  p = data;
-  // if (size == 0) return p;
+  lim = data + size;
-  lim = p + size;
-  BR_PC_INIT
-  pc -= 4;  // because (p) will point to next instruction
-  
-  BR_EXTERNAL_FOR
-  {
-    // Z7_PRAGMA_OPT_DISABLE_LOOP_UNROLL_VECTORIZE
-    for (;;)
-    {
-      UInt32 v;
-      if Z7_UNLIKELY(p == lim)
-        return p;
-      v = GetUi32a(p);
-      p += 4;
-      if Z7_UNLIKELY(((v - 0x94000000) & 0xfc000000) == 0)
-      {
-        UInt32 c = BR_PC_GET >> 2;
-        BR_CONVERT_VAL(v, c)
-        v &= 0x03ffffff;
-        v |= 0x94000000;
-        SetUi32a(p - 4, v)
-        BR_NEXT_ITERATION
-      }
-      // v = rotlFixed(v, 8);  v += (flag << 8) - 0x90;  if Z7_UNLIKELY((v & ((mask << 8) + 0x9f)) == 0)
-      v -= 0x90000000;  if Z7_UNLIKELY((v & 0x9f000000) == 0)
-      {
-        UInt32 z, c;
-        // v = rotrFixed(v, 8);
-        v += flag; if Z7_UNLIKELY(v & mask) continue;
-        z = (v & 0xffffffe0) | (v >> 26);
-        c = (BR_PC_GET >> (12 - 3)) & ~(UInt32)7;
-        BR_CONVERT_VAL(z, c)
-        v &= 0x1f;
-        v |= 0x90000000;
-        v |= z << 26;
-        v |= 0x00ffffe0 & ((z & (((flag << 1) - 1))) - flag);
-        SetUi32a(p - 4, v)
-      }
-    }
-  }
-}
-Z7_BRANCH_FUNCS_IMP(BranchConv_ARM64)
 
+  if (encoding)
 
-Z7_BRANCH_FUNC_MAIN(BranchConv_ARM)
-{
-  // Byte *p = data;
-  const Byte *lim;
-  size &= ~(SizeT)3;
-  lim = p + size;
-  BR_PC_INIT
-  /* in ARM: branch offset is relative to the +2 instructions from current instruction.
-     (p) will point to next instruction */
-  pc += 8 - 4;
-  
   for (;;)
   {
     for (;;)
     {
-      if Z7_UNLIKELY(p >= lim) { return p; }  p += 4;  if Z7_UNLIKELY(p[-1] == 0xeb) break;
+      if (p >= lim)
-      if Z7_UNLIKELY(p >= lim) { return p; }  p += 4;  if Z7_UNLIKELY(p[-1] == 0xeb) break;
+        return (SizeT)(p - data);
-    }
-    {
-      UInt32 v = GetUi32a(p - 4);
-      UInt32 c = BR_PC_GET >> 2;
-      BR_CONVERT_VAL(v, c)
-      v &= 0x00ffffff;
-      v |= 0xeb000000;
-      SetUi32a(p - 4, v)
-    }
-  }
-}
-Z7_BRANCH_FUNCS_IMP(BranchConv_ARM)
-
-
-Z7_BRANCH_FUNC_MAIN(BranchConv_PPC)
-{
-  // Byte *p = data;
-  const Byte *lim;
-  size &= ~(SizeT)3;
-  lim = p + size;
-  BR_PC_INIT
-  pc -= 4;  // because (p) will point to next instruction
-  
-  for (;;)
-  {
-    UInt32 v;
-    for (;;)
-    {
-      if Z7_UNLIKELY(p == lim)
-        return p;
-      // v = GetBe32a(p);
-      v = *(UInt32 *)(void *)p;
       p += 4;
-      // if ((v & 0xfc000003) == 0x48000001) break;
+      if (p[-1] == 0xEB)
-      // if ((p[-4] & 0xFC) == 0x48 && (p[-1] & 3) == 1) break;
-      if Z7_UNLIKELY(
-          ((v - Z7_CONV_BE_TO_NATIVE_CONST32(0x48000001))
-              & Z7_CONV_BE_TO_NATIVE_CONST32(0xfc000003)) == 0) break;
-    }
-    {
-      v = Z7_CONV_NATIVE_TO_BE_32(v);
-      {
-        UInt32 c = BR_PC_GET;
-        BR_CONVERT_VAL(v, c)
-      }
-      v &= 0x03ffffff;
-      v |= 0x48000000;
-      SetBe32a(p - 4, v)
-    }
-  }
-}
-Z7_BRANCH_FUNCS_IMP(BranchConv_PPC)
-
-
-#ifdef Z7_CPU_FAST_ROTATE_SUPPORTED
-#define BR_SPARC_USE_ROTATE
-#endif
-
-Z7_BRANCH_FUNC_MAIN(BranchConv_SPARC)
-{
-  // Byte *p = data;
-  const Byte *lim;
-  const UInt32 flag = (UInt32)1 << 22;
-  size &= ~(SizeT)3;
-  lim = p + size;
-  BR_PC_INIT
-  pc -= 4;  // because (p) will point to next instruction
-  for (;;)
-  {
-    UInt32 v;
-    for (;;)
-    {
-      if Z7_UNLIKELY(p == lim)
-        return p;
-      /* // the code without GetBe32a():
-      { const UInt32 v = GetUi16a(p) & 0xc0ff; p += 4; if (v == 0x40 || v == 0xc07f) break; }
-      */
-      v = GetBe32a(p);
-      p += 4;
-    #ifdef BR_SPARC_USE_ROTATE
-      v = rotlFixed(v, 2);
-      v += (flag << 2) - 1;
-      if Z7_UNLIKELY((v & (3 - (flag << 3))) == 0)
-    #else
-      v += (UInt32)5 << 29;
-      v ^= (UInt32)7 << 29;
-      v += flag;
-      if Z7_UNLIKELY((v & (0 - (flag << 1))) == 0)
-    #endif
         break;
     }
     {
-      // UInt32 v = GetBe32a(p - 4);
+      UInt32 v = GetUi32(p - 4);
-    #ifndef BR_SPARC_USE_ROTATE
       v <<= 2;
-    #endif
+        v += ip + (UInt32)(p - data);
-      {
-        UInt32 c = BR_PC_GET;
-        BR_CONVERT_VAL(v, c)
-      }
-      v &= (flag << 3) - 1;
-    #ifdef BR_SPARC_USE_ROTATE
-      v -= (flag << 2) - 1;
-      v = rotrFixed(v, 2);
-    #else
-      v -= (flag << 2);
       v >>= 2;
-      v |= (UInt32)1 << 30;
+      v &= 0x00FFFFFF;
-    #endif
+      v |= 0xEB000000;
-      SetBe32a(p - 4, v)
+      SetUi32(p - 4, v);
+    }
+  }
+
+  for (;;)
+  {
+    for (;;)
+    {
+      if (p >= lim)
+        return (SizeT)(p - data);
+      p += 4;
+      if (p[-1] == 0xEB)
+        break;
+    }
+    {
+      UInt32 v = GetUi32(p - 4);
+      v <<= 2;
+        v -= ip + (UInt32)(p - data);
+      v >>= 2;
+      v &= 0x00FFFFFF;
+      v |= 0xEB000000;
+      SetUi32(p - 4, v);
     }
   }
 }
-Z7_BRANCH_FUNCS_IMP(BranchConv_SPARC)
 
 
-Z7_BRANCH_FUNC_MAIN(BranchConv_ARMT)
+SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
 {
-  // Byte *p = data;
+  Byte *p;
-  Byte *lim;
+  const Byte *lim;
-  size &= ~(SizeT)1;
+  size &= ~(size_t)1;
-  // if (size == 0) return p;
+  p = data;
-  if (size <= 2) return p;
+  lim = data + size - 4;
-  size -= 2;
+
-  lim = p + size;
+  if (encoding)
-  BR_PC_INIT
-  /* in ARM: branch offset is relative to the +2 instructions from current instruction.
-     (p) will point to the +2 instructions from current instruction */
-  // pc += 4 - 4;
-  // if (encoding) pc -= 0xf800 << 1; else pc += 0xf800 << 1;
-  // #define ARMT_TAIL_PROC { goto armt_tail; }
-  #define ARMT_TAIL_PROC { return p; }
   
-  do
+  for (;;)
   {
-    /* in MSVC 32-bit x86 compilers:
+    UInt32 b1;
-       UInt32 version : it loads value from memory with movzx
-       Byte   version : it loads value to 8-bit register (AL/CL)
-       movzx version is slightly faster in some cpus
-    */
-    unsigned b1;
-    // Byte / unsigned
-    b1 = p[1];
-    // optimized version to reduce one (p >= lim) check:
-    // unsigned a1 = p[1];  b1 = p[3];  p += 2;  if Z7_LIKELY((b1 & (a1 ^ 8)) < 0xf8)
     for (;;)
     {
-      unsigned b3; // Byte / UInt32
+      UInt32 b3;
-      /* (Byte)(b3) normalization can use low byte computations in MSVC.
+      if (p > lim)
-         It gives smaller code, and no loss of speed in some compilers/cpus.
+        return (SizeT)(p - data);
-         But new MSVC 32-bit x86 compilers use more slow load
+      b1 = p[1];
-         from memory to low byte register in that case.
+      b3 = p[3];
-         So we try to use full 32-bit computations for faster code.
+      p += 2;
-      */
+      b1 ^= 8;
-      // if (p >= lim) { ARMT_TAIL_PROC }  b3 = b1 + 8;  b1 = p[3];  p += 2;  if ((b3 & b1) >= 0xf8) break;
+      if ((b3 & b1) >= 0xF8)
-      if Z7_UNLIKELY(p >= lim) { ARMT_TAIL_PROC }  b3 = p[3];  p += 2;  if Z7_UNLIKELY((b3 & (b1 ^ 8)) >= 0xf8) break;
+        break;
-      if Z7_UNLIKELY(p >= lim) { ARMT_TAIL_PROC }  b1 = p[3];  p += 2;  if Z7_UNLIKELY((b1 & (b3 ^ 8)) >= 0xf8) break;
     }
     {
-      /* we can adjust pc for (0xf800) to rid of (& 0x7FF) operation.
-         But gcc/clang for arm64 can use bfi instruction for full code here */
       UInt32 v =
-          ((UInt32)GetUi16a(p - 2) << 11) |
+             ((UInt32)b1 << 19)
-          ((UInt32)GetUi16a(p) & 0x7FF);
-      /*
-      UInt32 v =
-            ((UInt32)p[1 - 2] << 19)
           + (((UInt32)p[1] & 0x7) << 8)
           + (((UInt32)p[-2] << 11))
           + (p[0]);
-      */
+
       p += 2;
       {
-        UInt32 c = BR_PC_GET >> 1;
+        UInt32 cur = (ip + (UInt32)(p - data)) >> 1;
-        BR_CONVERT_VAL(v, c)
+          v += cur;
       }
-      SetUi16a(p - 4, (UInt16)(((v >> 11) & 0x7ff) | 0xf000))
+
-      SetUi16a(p - 2, (UInt16)(v | 0xf800))
-      /*
       p[-4] = (Byte)(v >> 11);
-      p[-3] = (Byte)(0xf0 | ((v >> 19) & 0x7));
+      p[-3] = (Byte)(0xF0 | ((v >> 19) & 0x7));
       p[-2] = (Byte)v;
-      p[-1] = (Byte)(0xf8 | (v >> 8));
+      p[-1] = (Byte)(0xF8 | (v >> 8));
-      */
     }
   }
-  while (p < lim);
-  return p;
-  // armt_tail:
-  // if ((Byte)((lim[1] & 0xf8)) != 0xf0) { lim += 2; }  return lim;
-  // return (Byte *)(lim + ((Byte)((lim[1] ^ 0xf0) & 0xf8) == 0 ? 0 : 2));
-  // return (Byte *)(lim + (((lim[1] ^ ~0xfu) & ~7u) == 0 ? 0 : 2));
-  // return (Byte *)(lim + 2 - (((((unsigned)lim[1] ^ 8) + 8) >> 7) & 2));
-}
-Z7_BRANCH_FUNCS_IMP(BranchConv_ARMT)
-
-
-// #define BR_IA64_NO_INLINE
-
-Z7_BRANCH_FUNC_MAIN(BranchConv_IA64)
-{
-  // Byte *p = data;
-  const Byte *lim;
-  size &= ~(SizeT)15;
-  lim = p + size;
-  pc -= 1 << 4;
-  pc >>= 4 - 1;
-  // pc -= 1 << 1;
   
   for (;;)
   {
-    unsigned m;
+    UInt32 b1;
     for (;;)
     {
-      if Z7_UNLIKELY(p == lim)
+      UInt32 b3;
-        return p;
+      if (p > lim)
-      m = (unsigned)((UInt32)0x334b0000 >> (*p & 0x1e));
+        return (SizeT)(p - data);
-      p += 16;
+      b1 = p[1];
-      pc += 1 << 1;
+      b3 = p[3];
-      if (m &= 3)
+      p += 2;
+      b1 ^= 8;
+      if ((b3 & b1) >= 0xF8)
         break;
     }
     {
-      p += (ptrdiff_t)m * 5 - 20; // negative value is expected here.
+      UInt32 v =
-      do
+             ((UInt32)b1 << 19)
+          + (((UInt32)p[1] & 0x7) << 8)
+          + (((UInt32)p[-2] << 11))
+          + (p[0]);
+
+      p += 2;
       {
-        const UInt32 t =
+        UInt32 cur = (ip + (UInt32)(p - data)) >> 1;
-          #if defined(MY_CPU_X86_OR_AMD64)
+          v -= cur;
-            // we use 32-bit load here to reduce code size on x86:
-            GetUi32(p);
-          #else
-            GetUi16(p);
-          #endif
-        UInt32 z = GetUi32(p + 1) >> m;
-        p += 5;
-        if (((t >> m) & (0x70 << 1)) == 0
-            && ((z - (0x5000000 << 1)) & (0xf000000 << 1)) == 0)
-        {
-          UInt32 v = (UInt32)((0x8fffff << 1) | 1) & z;
-          z ^= v;
-        #ifdef BR_IA64_NO_INLINE
-          v |= (v & ((UInt32)1 << (23 + 1))) >> 3;
-          {
-            UInt32 c = pc;
-            BR_CONVERT_VAL(v, c)
-          }
-          v &= (0x1fffff << 1) | 1;
-        #else
-          {
-            if (encoding)
-            {
-              // pc &= ~(0xc00000 << 1); // we just need to clear at least 2 bits
-              pc &= (0x1fffff << 1) | 1;
-              v += pc;
-            }
-            else
-            {
-              // pc |= 0xc00000 << 1; // we need to set at least 2 bits
-              pc |= ~(UInt32)((0x1fffff << 1) | 1);
-              v -= pc;
-            }
-          }
-          v &= ~(UInt32)(0x600000 << 1);
-        #endif
-          v += (0x700000 << 1);
-          v &= (0x8fffff << 1) | 1;
-          z |= v;
-          z <<= m;
-          SetUi32(p + 1 - 5, z)
-        }
-        m++;
       }
-      while (m &= 3); // while (m < 4);
+
+      /*
+      SetUi16(p - 4, (UInt16)(((v >> 11) & 0x7FF) | 0xF000));
+      SetUi16(p - 2, (UInt16)(v | 0xF800));
+      */
+      
+      p[-4] = (Byte)(v >> 11);
+      p[-3] = (Byte)(0xF0 | ((v >> 19) & 0x7));
+      p[-2] = (Byte)v;
+      p[-1] = (Byte)(0xF8 | (v >> 8));
     }
   }
 }
-Z7_BRANCH_FUNCS_IMP(BranchConv_IA64)
 
 
-#define BR_CONVERT_VAL_ENC(v)  v += BR_PC_GET;
+SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
-#define BR_CONVERT_VAL_DEC(v)  v -= BR_PC_GET;
-
-#if 1 && defined(MY_CPU_LE_UNALIGN)
-  #define RISCV_USE_UNALIGNED_LOAD
-#endif
-
-#ifdef RISCV_USE_UNALIGNED_LOAD
-  #define RISCV_GET_UI32(p)      GetUi32(p)
-  #define RISCV_SET_UI32(p, v)   { SetUi32(p, v) }
-#else
-  #define RISCV_GET_UI32(p) \
-    ((UInt32)GetUi16a(p) + \
-    ((UInt32)GetUi16a((p) + 2) << 16))
-  #define RISCV_SET_UI32(p, v) { \
-    SetUi16a(p, (UInt16)(v)) \
-    SetUi16a((p) + 2, (UInt16)(v >> 16)) }
-#endif
-
-#if 1 && defined(MY_CPU_LE)
-  #define RISCV_USE_16BIT_LOAD
-#endif
-
-#ifdef RISCV_USE_16BIT_LOAD
-  #define RISCV_LOAD_VAL(p)  GetUi16a(p)
-#else
-  #define RISCV_LOAD_VAL(p)  (*(p))
-#endif
-
-#define RISCV_INSTR_SIZE  2
-#define RISCV_STEP_1      (4 + RISCV_INSTR_SIZE)
-#define RISCV_STEP_2      4
-#define RISCV_REG_VAL     (2 << 7)
-#define RISCV_CMD_VAL     3
-#if 1
-  // for code size optimization:
-  #define RISCV_DELTA_7F  0x7f
-#else
-  #define RISCV_DELTA_7F  0
-#endif
-
-#define RISCV_CHECK_1(v, b) \
-    (((((b) - RISCV_CMD_VAL) ^ ((v) << 8)) & (0xf8000 + RISCV_CMD_VAL)) == 0)
-
-#if 1
-  #define RISCV_CHECK_2(v, r) \
-    ((((v) - ((RISCV_CMD_VAL << 12) | RISCV_REG_VAL | 8)) \
-           << 18) \
-     < ((r) & 0x1d))
-#else
-  // this branch gives larger code, because
-  // compilers generate larger code for big constants.
-  #define RISCV_CHECK_2(v, r) \
-    ((((v) - ((RISCV_CMD_VAL << 12) | RISCV_REG_VAL)) \
-           & ((RISCV_CMD_VAL << 12) | RISCV_REG_VAL)) \
-     < ((r) & 0x1d))
-#endif
-
-
-#define RISCV_SCAN_LOOP \
-  Byte *lim; \
-  size &= ~(SizeT)(RISCV_INSTR_SIZE - 1); \
-  if (size <= 6) return p; \
-  size -= 6; \
-  lim = p + size; \
-  BR_PC_INIT \
-  for (;;) \
-  { \
-    UInt32 a, v; \
-    /* Z7_PRAGMA_OPT_DISABLE_LOOP_UNROLL_VECTORIZE */ \
-    for (;;) \
-    { \
-      if Z7_UNLIKELY(p >= lim) { return p; } \
-      a = (RISCV_LOAD_VAL(p) ^ 0x10u) + 1; \
-      if ((a & 0x77) == 0) break; \
-      a = (RISCV_LOAD_VAL(p + RISCV_INSTR_SIZE) ^ 0x10u) + 1; \
-      p += RISCV_INSTR_SIZE * 2; \
-      if ((a & 0x77) == 0) \
-      { \
-        p -= RISCV_INSTR_SIZE; \
-        if Z7_UNLIKELY(p >= lim) { return p; } \
-        break; \
-      } \
-    }
-// (xx6f ^ 10) + 1 = xx7f + 1 = xx80       : JAL
-// (xxef ^ 10) + 1 = xxff + 1 = xx00 + 100 : JAL
-// (xx17 ^ 10) + 1 = xx07 + 1 = xx08       : AUIPC
-// (xx97 ^ 10) + 1 = xx87 + 1 = xx88       : AUIPC
-
-Byte * Z7_BRANCH_CONV_ENC(RISCV)(Byte *p, SizeT size, UInt32 pc)
 {
-  RISCV_SCAN_LOOP
+  Byte *p;
-    v = a;
+  const Byte *lim;
-    a = RISCV_GET_UI32(p);
+  size &= ~(size_t)3;
-#ifndef RISCV_USE_16BIT_LOAD
+  ip -= 4;
-    v += (UInt32)p[1] << 8;
+  p = data;
-#endif
+  lim = data + size;
 
-    if ((v & 8) == 0) // JAL
+  for (;;)
+  {
+    for (;;)
     {
-      if ((v - (0x100 /* - RISCV_DELTA_7F */)) & 0xd80)
+      if (p >= lim)
-      {
+        return (SizeT)(p - data);
-        p += RISCV_INSTR_SIZE;
-        continue;
-      }
-      {
-        v = ((a &    1u << 31) >> 11)
-          | ((a & 0x3ff << 21) >> 20)
-          | ((a &     1 << 20) >> 9)
-          |  (a &  0xff << 12);
-        BR_CONVERT_VAL_ENC(v)
-        // ((v & 1) == 0)
-        // v: bits [1 : 20] contain offset bits
-#if 0 && defined(RISCV_USE_UNALIGNED_LOAD)
-        a &= 0xfff;
-        a |= ((UInt32)(v << 23))
-          |  ((UInt32)(v <<  7) & ((UInt32)0xff << 16))
-          |  ((UInt32)(v >>  5) & ((UInt32)0xf0 << 8));
-        RISCV_SET_UI32(p, a)
-#else // aligned
-#if 0
-        SetUi16a(p, (UInt16)(((v >> 5) & 0xf000) | (a & 0xfff)))
-#else
-        p[1] = (Byte)(((v >> 13) & 0xf0) | ((a >> 8) & 0xf));
-#endif
-
-#if 1 && defined(Z7_CPU_FAST_BSWAP_SUPPORTED) && defined(MY_CPU_LE)
-        v <<= 15;
-        v = Z7_BSWAP32(v);
-        SetUi16a(p + 2, (UInt16)v)
-#else
-        p[2] = (Byte)(v >> 9);
-        p[3] = (Byte)(v >> 1);
-#endif
-#endif // aligned
-      }
       p += 4;
-      continue;
+      /* if ((v & 0xFC000003) == 0x48000001) */
-    } // JAL
+      if ((p[-4] & 0xFC) == 0x48 && (p[-1] & 3) == 1)
-
+        break;
-    {
-      // AUIPC
-      if (v & 0xe80)  // (not x0) and (not x2)
-      {
-        const UInt32 b = RISCV_GET_UI32(p + 4);
-        if (RISCV_CHECK_1(v, b))
-        {
-          {
-            const UInt32 temp = (b << 12) | (0x17 + RISCV_REG_VAL);
-            RISCV_SET_UI32(p, temp)
-          }
-          a &= 0xfffff000;
-          {
-#if 1
-          const int t = -1 >> 1;
-          if (t != -1)
-            a += (b >> 20) - ((b >> 19) & 0x1000); // arithmetic right shift emulation
-          else
-#endif
-            a += (UInt32)((Int32)b >> 20); // arithmetic right shift (sign-extension).
-          }
-          BR_CONVERT_VAL_ENC(a)
-#if 1 && defined(Z7_CPU_FAST_BSWAP_SUPPORTED) && defined(MY_CPU_LE)
-          a = Z7_BSWAP32(a);
-          RISCV_SET_UI32(p + 4, a)
-#else
-          SetBe32(p + 4, a)
-#endif
-          p += 8;
-        }
-        else
-          p += RISCV_STEP_1;
-      }
-      else
-      {
-        UInt32 r = a >> 27;
-        if (RISCV_CHECK_2(v, r))
-        {
-          v = RISCV_GET_UI32(p + 4);
-          r = (r << 7) + 0x17 + (v & 0xfffff000);
-          a = (a >> 12) | (v << 20);
-          RISCV_SET_UI32(p, r)
-          RISCV_SET_UI32(p + 4, a)
-          p += 8;
-        }
-        else
-          p += RISCV_STEP_2;
-      }
     }
-  } // for
+    {
+      UInt32 v = GetBe32(p - 4);
+      if (encoding)
+        v += ip + (UInt32)(p - data);
+      else
+        v -= ip + (UInt32)(p - data);
+      v &= 0x03FFFFFF;
+      v |= 0x48000000;
+      SetBe32(p - 4, v);
+    }
+  }
 }
 
 
-Byte * Z7_BRANCH_CONV_DEC(RISCV)(Byte *p, SizeT size, UInt32 pc)
+SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
 {
-  RISCV_SCAN_LOOP
+  Byte *p;
-#ifdef RISCV_USE_16BIT_LOAD
+  const Byte *lim;
-    if ((a & 8) == 0)
+  size &= ~(size_t)3;
-    {
+  ip -= 4;
-#else
+  p = data;
-    v = a;
+  lim = data + size;
-    a += (UInt32)p[1] << 8;
-    if ((v & 8) == 0)
-    {
-#endif
-      // JAL
-      a -= 0x100 - RISCV_DELTA_7F;
-      if (a & 0xd80)
-      {
-        p += RISCV_INSTR_SIZE;
-        continue;
-      }
-      {
-        const UInt32 a_old = (a + (0xef - RISCV_DELTA_7F)) & 0xfff;
-#if 0 // unaligned
-        a = GetUi32(p);
-        v = (UInt32)(a >> 23) & ((UInt32)0xff << 1)
-          | (UInt32)(a >>  7) & ((UInt32)0xff << 9)
-#elif 1 && defined(Z7_CPU_FAST_BSWAP_SUPPORTED) && defined(MY_CPU_LE)
-        v = GetUi16a(p + 2);
-        v = Z7_BSWAP32(v) >> 15
-#else
-        v = (UInt32)p[3] << 1
-          | (UInt32)p[2] << 9
-#endif
-          | (UInt32)((a & 0xf000) << 5);
-        BR_CONVERT_VAL_DEC(v)
-        a = a_old
-          | (v << 11 &    1u << 31)
-          | (v << 20 & 0x3ff << 21)
-          | (v <<  9 &     1 << 20)
-          | (v       &  0xff << 12);
-        RISCV_SET_UI32(p, a)
-      }
-      p += 4;
-      continue;
-    } // JAL
 
+  for (;;)
+  {
+    for (;;)
     {
-      // AUIPC
+      if (p >= lim)
-      v = a;
+        return (SizeT)(p - data);
-#if 1 && defined(RISCV_USE_UNALIGNED_LOAD)
+      /*
-      a = GetUi32(p);
+      v = GetBe32(p);
-#else
+      p += 4;
-      a |= (UInt32)GetUi16a(p + 2) << 16;
+      m = v + ((UInt32)5 << 29);
-#endif
+      m ^= (UInt32)7 << 29;
-      if ((v & 0xe80) == 0)  // x0/x2
+      m += (UInt32)1 << 22;
-      {
+      if ((m & ((UInt32)0x1FF << 23)) == 0)
-        const UInt32 r = a >> 27;
+        break;
-        if (RISCV_CHECK_2(v, r))
+      */
-        {
+      p += 4;
-          UInt32 b;
+      if ((p[-4] == 0x40 && (p[-3] & 0xC0) == 0) ||
-#if 1 && defined(Z7_CPU_FAST_BSWAP_SUPPORTED) && defined(MY_CPU_LE)
+          (p[-4] == 0x7F && (p[-3] >= 0xC0)))
-          b = RISCV_GET_UI32(p + 4);
+        break;
-          b = Z7_BSWAP32(b);
-#else
-          b = GetBe32(p + 4);
-#endif
-          v = a >> 12;
-          BR_CONVERT_VAL_DEC(b)
-          a = (r << 7) + 0x17;
-          a += (b + 0x800) & 0xfffff000;
-          v |= b << 20;
-          RISCV_SET_UI32(p, a)
-          RISCV_SET_UI32(p + 4, v)
-          p += 8;
-        }
-        else
-          p += RISCV_STEP_2;
-      }
-      else
-      {
-        const UInt32 b = RISCV_GET_UI32(p + 4);
-        if (!RISCV_CHECK_1(v, b))
-          p += RISCV_STEP_1;
-        else
-        {
-          v = (a & 0xfffff000) | (b >> 20);
-          a = (b << 12) | (0x17 + RISCV_REG_VAL);
-          RISCV_SET_UI32(p, a)
-          RISCV_SET_UI32(p + 4, v)
-          p += 8;
-        }
-      }
     }
-  } // for
+    {
+      UInt32 v = GetBe32(p - 4);
+      v <<= 2;
+      if (encoding)
+        v += ip + (UInt32)(p - data);
+      else
+        v -= ip + (UInt32)(p - data);
+      
+      v &= 0x01FFFFFF;
+      v -= (UInt32)1 << 24;
+      v ^= 0xFF000000;
+      v >>= 2;
+      v |= 0x40000000;
+      SetBe32(p - 4, v);
+    }
+  }
 }

common/LZMA/SDK/C/Bra.h

@@ -1,105 +1,64 @@
 /* Bra.h -- Branch converters for executables
-2024-01-20 : Igor Pavlov : Public domain */
+2013-01-18 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_BRA_H
+#ifndef __BRA_H
-#define ZIP7_INC_BRA_H
+#define __BRA_H
 
 #include "7zTypes.h"
 
 EXTERN_C_BEGIN
 
-/* #define PPC BAD_PPC_11 // for debug */
-
-#define Z7_BRANCH_CONV_DEC_2(name)  z7_ ## name ## _Dec
-#define Z7_BRANCH_CONV_ENC_2(name)  z7_ ## name ## _Enc
-#define Z7_BRANCH_CONV_DEC(name)    Z7_BRANCH_CONV_DEC_2(BranchConv_ ## name)
-#define Z7_BRANCH_CONV_ENC(name)    Z7_BRANCH_CONV_ENC_2(BranchConv_ ## name)
-#define Z7_BRANCH_CONV_ST_DEC(name) z7_BranchConvSt_ ## name ## _Dec
-#define Z7_BRANCH_CONV_ST_ENC(name) z7_BranchConvSt_ ## name ## _Enc
-
-#define Z7_BRANCH_CONV_DECL(name)    Byte * name(Byte *data, SizeT size, UInt32 pc)
-#define Z7_BRANCH_CONV_ST_DECL(name) Byte * name(Byte *data, SizeT size, UInt32 pc, UInt32 *state)
-
-typedef Z7_BRANCH_CONV_DECL(   (*z7_Func_BranchConv));
-typedef Z7_BRANCH_CONV_ST_DECL((*z7_Func_BranchConvSt));
-
-#define Z7_BRANCH_CONV_ST_X86_STATE_INIT_VAL 0
-Z7_BRANCH_CONV_ST_DECL (Z7_BRANCH_CONV_ST_DEC(X86));
-Z7_BRANCH_CONV_ST_DECL (Z7_BRANCH_CONV_ST_ENC(X86));
-
-#define Z7_BRANCH_FUNCS_DECL(name) \
-Z7_BRANCH_CONV_DECL (Z7_BRANCH_CONV_DEC_2(name)); \
-Z7_BRANCH_CONV_DECL (Z7_BRANCH_CONV_ENC_2(name));
-
-Z7_BRANCH_FUNCS_DECL (BranchConv_ARM64)
-Z7_BRANCH_FUNCS_DECL (BranchConv_ARM)
-Z7_BRANCH_FUNCS_DECL (BranchConv_ARMT)
-Z7_BRANCH_FUNCS_DECL (BranchConv_PPC)
-Z7_BRANCH_FUNCS_DECL (BranchConv_SPARC)
-Z7_BRANCH_FUNCS_DECL (BranchConv_IA64)
-Z7_BRANCH_FUNCS_DECL (BranchConv_RISCV)
-
 /*
-These functions convert data that contain CPU instructions.
+These functions convert relative addresses to absolute addresses
-Each such function converts relative addresses to absolute addresses in some
+in CALL instructions to increase the compression ratio.
-branch instructions: CALL (in all converters) and JUMP (X86 converter only).
+  
-Such conversion allows to increase compression ratio, if we compress that data.
+  In:
-
+    data     - data buffer
-There are 2 types of converters:
+    size     - size of data
-  Byte * Conv_RISC (Byte *data, SizeT size, UInt32 pc);
+    ip       - current virtual Instruction Pinter (IP) value
-  Byte * ConvSt_X86(Byte *data, SizeT size, UInt32 pc, UInt32 *state);
+    state    - state variable for x86 converter
-Each Converter supports 2 versions: one for encoding
+    encoding - 0 (for decoding), 1 (for encoding)
-and one for decoding (_Enc/_Dec postfixes in function name).
+  
-
+  Out:
-In params:
+    state    - state variable for x86 converter
-  data  : data buffer
+
-  size  : size of data
+  Returns:
-  pc    : current virtual Program Counter (Instruction Pointer) value
+    The number of processed bytes. If you call these functions with multiple calls,
-In/Out param:
+    you must start next call with first byte after block of processed bytes.
-  state : pointer to state variable (for X86 converter only)
-
-Return:
-  The pointer to position in (data) buffer after last byte that was processed.
-  If the caller calls converter again, it must call it starting with that position.
-  But the caller is allowed to move data in buffer. So pointer to
-  current processed position also will be changed for next call.
-  Also the caller must increase internal (pc) value for next call.
   
-Each converter has some characteristics: Endian, Alignment, LookAhead.
   Type   Endian  Alignment  LookAhead
   
-  X86    little      1          4
+  x86    little      1          4
   ARMT   little      2          2
-  RISCV  little      2          6
   ARM    little      4          0
-  ARM64  little      4          0
   PPC     big        4          0
   SPARC   big        4          0
   IA64   little     16          0
 
-  (data) must be aligned for (Alignment).
+  size must be >= Alignment + LookAhead, if it's not last block.
-  processed size can be calculated as:
+  If (size < Alignment + LookAhead), converter returns 0.
-    SizeT processed = Conv(data, size, pc) - data;
-  if (processed == 0)
-    it means that converter needs more data for processing.
-  If (size < Alignment + LookAhead)
-    then (processed == 0) is allowed.
 
-Example code for conversion in loop:
+  Example:
-  UInt32 pc = 0;
+
-  size = 0;
+    UInt32 ip = 0;
-  for (;;)
+    for ()
-  {
+    {
-    size += Load_more_input_data(data + size);
+      ; size must be >= Alignment + LookAhead, if it's not last block
-    SizeT processed = Conv(data, size, pc) - data;
+      SizeT processed = Convert(data, size, ip, 1);
-    if (processed == 0 && no_more_input_data_after_size)
+      data += processed;
-      break; // we stop convert loop
+      size -= processed;
-    data += processed;
+      ip += processed;
-    size -= processed;
+    }
-    pc += processed;
-  }
 */
 
+#define x86_Convert_Init(state) { state = 0; }
+SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding);
+SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+
 EXTERN_C_END
 
 #endif

common/LZMA/SDK/C/Bra86.c

@@ -1,187 +1,82 @@
-/* Bra86.c -- Branch converter for X86 code (BCJ)
+/* Bra86.c -- Converter for x86 code (BCJ)
-2023-04-02 : Igor Pavlov : Public domain */
+2021-02-09 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
 #include "Bra.h"
-#include "CpuArch.h"
 
+#define Test86MSByte(b) ((((b) + 1) & 0xFE) == 0)
 
-#if defined(MY_CPU_SIZEOF_POINTER) \
+SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding)
-    && ( MY_CPU_SIZEOF_POINTER == 4 \
-      || MY_CPU_SIZEOF_POINTER == 8)
-  #define BR_CONV_USE_OPT_PC_PTR
-#endif
-
-#ifdef BR_CONV_USE_OPT_PC_PTR
-#define BR_PC_INIT  pc -= (UInt32)(SizeT)p; // (MY_uintptr_t)
-#define BR_PC_GET   (pc + (UInt32)(SizeT)p)
-#else
-#define BR_PC_INIT  pc += (UInt32)size;
-#define BR_PC_GET   (pc - (UInt32)(SizeT)(lim - p))
-// #define BR_PC_INIT
-// #define BR_PC_GET   (pc + (UInt32)(SizeT)(p - data))
-#endif
-
-#define BR_CONVERT_VAL(v, c) if (encoding) v += c; else v -= c;
-// #define BR_CONVERT_VAL(v, c) if (!encoding) c = (UInt32)0 - c; v += c;
-
-#define Z7_BRANCH_CONV_ST(name) z7_BranchConvSt_ ## name
-
-#define BR86_NEED_CONV_FOR_MS_BYTE(b) ((((b) + 1) & 0xfe) == 0)
-
-#ifdef MY_CPU_LE_UNALIGN
-  #define BR86_PREPARE_BCJ_SCAN  const UInt32 v = GetUi32(p) ^ 0xe8e8e8e8;
-  #define BR86_IS_BCJ_BYTE(n)    ((v & ((UInt32)0xfe << (n) * 8)) == 0)
-#else
-  #define BR86_PREPARE_BCJ_SCAN
-  // bad for MSVC X86 (partial write to byte reg):
-  #define BR86_IS_BCJ_BYTE(n)    ((p[n - 4] & 0xfe) == 0xe8)
-  // bad for old MSVC (partial write to byte reg):
-  // #define BR86_IS_BCJ_BYTE(n)    (((*p ^ 0xe8) & 0xfe) == 0)
-#endif
- 
-static
-Z7_FORCE_INLINE
-Z7_ATTRIB_NO_VECTOR
-Byte *Z7_BRANCH_CONV_ST(X86)(Byte *p, SizeT size, UInt32 pc, UInt32 *state, int encoding)
 {
+  SizeT pos = 0;
+  UInt32 mask = *state & 7;
   if (size < 5)
-    return p;
+    return 0;
- {
+  size -= 4;
-  // Byte *p = data;
+  ip += 5;
-  const Byte *lim = p + size - 4;
-  unsigned mask = (unsigned)*state;  // & 7;
-#ifdef BR_CONV_USE_OPT_PC_PTR
-  /* if BR_CONV_USE_OPT_PC_PTR is defined: we need to adjust (pc) for (+4),
-        because call/jump offset is relative to the next instruction.
-     if BR_CONV_USE_OPT_PC_PTR is not defined : we don't need to adjust (pc) for (+4),
-         because  BR_PC_GET uses (pc - (lim - p)), and lim was adjusted for (-4) before.
-  */
-  pc += 4;
-#endif
-  BR_PC_INIT
-  goto start;
 
-  for (;; mask |= 4)
+  for (;;)
   {
-    // cont: mask |= 4;
+    Byte *p = data + pos;
-  start:
+    const Byte *limit = data + size;
-    if (p >= lim)
+    for (; p < limit; p++)
-      goto fin;
+      if ((*p & 0xFE) == 0xE8)
-    {
+        break;
-      BR86_PREPARE_BCJ_SCAN
-      p += 4;
-      if (BR86_IS_BCJ_BYTE(0))  { goto m0; }  mask >>= 1;
-      if (BR86_IS_BCJ_BYTE(1))  { goto m1; }  mask >>= 1;
-      if (BR86_IS_BCJ_BYTE(2))  { goto m2; }  mask = 0;
-      if (BR86_IS_BCJ_BYTE(3))  { goto a3; }
-    }
-    goto main_loop;
 
-  m0: p--;
-  m1: p--;
-  m2: p--;
-    if (mask == 0)
-      goto a3;
-    if (p > lim)
-      goto fin_p;
-   
-    // if (((0x17u >> mask) & 1) == 0)
-    if (mask > 4 || mask == 3)
     {
-      mask >>= 1;
+      SizeT d = (SizeT)(p - data) - pos;
-      continue; // goto cont;
+      pos = (SizeT)(p - data);
-    }
+      if (p >= limit)
-    mask >>= 1;
-    if (BR86_NEED_CONV_FOR_MS_BYTE(p[mask]))
-      continue; // goto cont;
-    // if (!BR86_NEED_CONV_FOR_MS_BYTE(p[3])) continue; // goto cont;
-    {
-      UInt32 v = GetUi32(p);
-      UInt32 c;
-      v += (1 << 24);  if (v & 0xfe000000) continue; // goto cont;
-      c = BR_PC_GET;
-      BR_CONVERT_VAL(v, c)
       {
-        mask <<= 3;
+        *state = (d > 2 ? 0 : mask >> (unsigned)d);
-        if (BR86_NEED_CONV_FOR_MS_BYTE(v >> mask))
+        return pos;
+      }
+      if (d > 2)
+        mask = 0;
+      else
+      {
+        mask >>= (unsigned)d;
+        if (mask != 0 && (mask > 4 || mask == 3 || Test86MSByte(p[(size_t)(mask >> 1) + 1])))
         {
-          v ^= (((UInt32)0x100 << mask) - 1);
+          mask = (mask >> 1) | 4;
-          #ifdef MY_CPU_X86
+          pos++;
-          // for X86 : we can recalculate (c) to reduce register pressure
+          continue;
-            c = BR_PC_GET;
+        }
-          #endif
+      }
-          BR_CONVERT_VAL(v, c)
+    }
+
+    if (Test86MSByte(p[4]))
+    {
+      UInt32 v = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);
+      UInt32 cur = ip + (UInt32)pos;
+      pos += 5;
+      if (encoding)
+        v += cur;
+      else
+        v -= cur;
+      if (mask != 0)
+      {
+        unsigned sh = (mask & 6) << 2;
+        if (Test86MSByte((Byte)(v >> sh)))
+        {
+          v ^= (((UInt32)0x100 << sh) - 1);
+          if (encoding)
+            v += cur;
+          else
+            v -= cur;
         }
         mask = 0;
       }
-      // v = (v & ((1 << 24) - 1)) - (v & (1 << 24));
+      p[1] = (Byte)v;
-      v &= (1 << 25) - 1;  v -= (1 << 24);
+      p[2] = (Byte)(v >> 8);
-      SetUi32(p, v)
+      p[3] = (Byte)(v >> 16);
-      p += 4;
+      p[4] = (Byte)(0 - ((v >> 24) & 1));
-      goto main_loop;
     }
-
+    else
-  main_loop:
-    if (p >= lim)
-      goto fin;
-    for (;;)
     {
-      BR86_PREPARE_BCJ_SCAN
+      mask = (mask >> 1) | 4;
-      p += 4;
+      pos++;
-      if (BR86_IS_BCJ_BYTE(0))  { goto a0; }
-      if (BR86_IS_BCJ_BYTE(1))  { goto a1; }
-      if (BR86_IS_BCJ_BYTE(2))  { goto a2; }
-      if (BR86_IS_BCJ_BYTE(3))  { goto a3; }
-      if (p >= lim)
-        goto fin;
-    }
-  
-  a0: p--;
-  a1: p--;
-  a2: p--;
-  a3:
-    if (p > lim)
-      goto fin_p;
-    // if (!BR86_NEED_CONV_FOR_MS_BYTE(p[3])) continue; // goto cont;
-    {
-      UInt32 v = GetUi32(p);
-      UInt32 c;
-      v += (1 << 24);  if (v & 0xfe000000) continue; // goto cont;
-      c = BR_PC_GET;
-      BR_CONVERT_VAL(v, c)
-      // v = (v & ((1 << 24) - 1)) - (v & (1 << 24));
-      v &= (1 << 25) - 1;  v -= (1 << 24);
-      SetUi32(p, v)
-      p += 4;
-      goto main_loop;
     }
   }
-
-fin_p:
-  p--;
-fin:
-  // the following processing for tail is optional and can be commented
-  /*
-  lim += 4;
-  for (; p < lim; p++, mask >>= 1)
-    if ((*p & 0xfe) == 0xe8)
-      break;
-  */
-  *state = (UInt32)mask;
-  return p;
- }
 }
-
-
-#define Z7_BRANCH_CONV_ST_FUNC_IMP(name, m, encoding) \
-Z7_NO_INLINE \
-Z7_ATTRIB_NO_VECTOR \
-Byte *m(name)(Byte *data, SizeT size, UInt32 pc, UInt32 *state) \
-  { return Z7_BRANCH_CONV_ST(name)(data, size, pc, state, encoding); }
-
-Z7_BRANCH_CONV_ST_FUNC_IMP(X86, Z7_BRANCH_CONV_ST_DEC, 0)
-#ifndef Z7_EXTRACT_ONLY
-Z7_BRANCH_CONV_ST_FUNC_IMP(X86, Z7_BRANCH_CONV_ST_ENC, 1)
-#endif

common/LZMA/SDK/C/Compiler.h

@@ -1,105 +1,12 @@
-/* Compiler.h : Compiler specific defines and pragmas
+/* Compiler.h
-2024-01-22 : Igor Pavlov : Public domain */
+2021-01-05 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_COMPILER_H
+#ifndef __7Z_COMPILER_H
-#define ZIP7_INC_COMPILER_H
+#define __7Z_COMPILER_H
 
-#if defined(__clang__)
+  #ifdef __clang__
-# define Z7_CLANG_VERSION  (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
+    #pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
-#if defined(__clang__) && defined(__apple_build_version__)
-# define Z7_APPLE_CLANG_VERSION   Z7_CLANG_VERSION
-#elif defined(__clang__)
-# define Z7_LLVM_CLANG_VERSION    Z7_CLANG_VERSION
-#elif defined(__GNUC__)
-# define Z7_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#endif
-
-#ifdef _MSC_VER
-#if !defined(__clang__) && !defined(__GNUC__)
-#define Z7_MSC_VER_ORIGINAL _MSC_VER
-#endif
-#endif
-
-#if defined(__MINGW32__) || defined(__MINGW64__)
-#define Z7_MINGW
-#endif
-
-#if defined(__LCC__) && (defined(__MCST__) || defined(__e2k__))
-#define Z7_MCST_LCC
-#define Z7_MCST_LCC_VERSION (__LCC__ * 100 + __LCC_MINOR__)
-#endif
-
-/*
-#if defined(__AVX2__) \
-    || defined(Z7_GCC_VERSION) && (Z7_GCC_VERSION >= 40900) \
-    || defined(Z7_APPLE_CLANG_VERSION) && (Z7_APPLE_CLANG_VERSION >= 40600) \
-    || defined(Z7_LLVM_CLANG_VERSION) && (Z7_LLVM_CLANG_VERSION >= 30100) \
-    || defined(Z7_MSC_VER_ORIGINAL) && (Z7_MSC_VER_ORIGINAL >= 1800) \
-    || defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1400)
-    #define Z7_COMPILER_AVX2_SUPPORTED
   #endif
-#endif
-*/
-
-// #pragma GCC diagnostic ignored "-Wunknown-pragmas"
-
-#ifdef __clang__
-// padding size of '' with 4 bytes to alignment boundary
-#pragma GCC diagnostic ignored "-Wpadded"
-
-#if defined(Z7_LLVM_CLANG_VERSION) && (__clang_major__ == 13) \
-  && defined(__FreeBSD__)
-// freebsd:
-#pragma GCC diagnostic ignored "-Wexcess-padding"
-#endif
-
-#if __clang_major__ >= 16
-#pragma GCC diagnostic ignored "-Wunsafe-buffer-usage"
-#endif
-
-#if __clang_major__ == 13
-#if defined(__SIZEOF_POINTER__) && (__SIZEOF_POINTER__ == 16)
-// cheri
-#pragma GCC diagnostic ignored "-Wcapability-to-integer-cast"
-#endif
-#endif
-
-#if __clang_major__ == 13
-  // for <arm_neon.h>
-  #pragma GCC diagnostic ignored "-Wreserved-identifier"
-#endif
-
-#endif // __clang__
-
-#if defined(_WIN32) && defined(__clang__) && __clang_major__ >= 16
-// #pragma GCC diagnostic ignored "-Wcast-function-type-strict"
-#define Z7_DIAGNOSTIC_IGNORE_CAST_FUNCTION \
-  _Pragma("GCC diagnostic ignored \"-Wcast-function-type-strict\"")
-#else
-#define Z7_DIAGNOSTIC_IGNORE_CAST_FUNCTION
-#endif
-
-typedef void (*Z7_void_Function)(void);
-#if defined(__clang__) || defined(__GNUC__)
-#define Z7_CAST_FUNC_C  (Z7_void_Function)
-#elif defined(_MSC_VER) && _MSC_VER > 1920
-#define Z7_CAST_FUNC_C  (void *)
-// #pragma warning(disable : 4191) // 'type cast': unsafe conversion from 'FARPROC' to 'void (__cdecl *)()'
-#else
-#define Z7_CAST_FUNC_C
-#endif
-/*
-#if (defined(__GNUC__) && (__GNUC__ >= 8)) || defined(__clang__)
-  // #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
-*/
-#ifdef __GNUC__
-#if defined(Z7_GCC_VERSION) && (Z7_GCC_VERSION >= 40000) && (Z7_GCC_VERSION < 70000)
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-#endif
-
 
 #ifdef _MSC_VER
 
@@ -110,124 +17,24 @@ typedef void (*Z7_void_Function)(void);
     #pragma warning(disable : 4214) // nonstandard extension used : bit field types other than int
   #endif
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
+  #if _MSC_VER >= 1300
-#pragma warning(disable : 4464) // relative include path contains '..'
+    #pragma warning(disable : 4996) // This function or variable may be unsafe
-#endif
+  #else
+    #pragma warning(disable : 4511) // copy constructor could not be generated
+    #pragma warning(disable : 4512) // assignment operator could not be generated
+    #pragma warning(disable : 4514) // unreferenced inline function has been removed
+    #pragma warning(disable : 4702) // unreachable code
+    #pragma warning(disable : 4710) // not inlined
+    #pragma warning(disable : 4714) // function marked as __forceinline not inlined
+    #pragma warning(disable : 4786) // identifier was truncated to '255' characters in the debug information
+  #endif
 
-// == 1200 : -O1 : for __forceinline
+  #ifdef __clang__
-// >= 1900 : -O1 : for printf
+    #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#pragma warning(disable : 4710) // function not inlined
+    #pragma clang diagnostic ignored "-Wmicrosoft-exception-spec"
+    // #pragma clang diagnostic ignored "-Wreserved-id-macro"
+  #endif
 
-#if _MSC_VER < 1900
-// winnt.h: 'Int64ShllMod32'
-#pragma warning(disable : 4514) // unreferenced inline function has been removed
-#endif
-    
-#if _MSC_VER < 1300
-// #pragma warning(disable : 4702) // unreachable code
-// Bra.c : -O1:
-#pragma warning(disable : 4714) // function marked as __forceinline not inlined
-#endif
-
-/*
-#if _MSC_VER > 1400 && _MSC_VER <= 1900
-// strcat: This function or variable may be unsafe
-// sysinfoapi.h: kit10: GetVersion was declared deprecated
-#pragma warning(disable : 4996)
-#endif
-*/
-
-#if _MSC_VER > 1200
-// -Wall warnings
-
-#pragma warning(disable : 4711) // function selected for automatic inline expansion
-#pragma warning(disable : 4820) // '2' bytes padding added after data member
-
-#if _MSC_VER >= 1400 && _MSC_VER < 1920
-// 1400: string.h: _DBG_MEMCPY_INLINE_
-// 1600 - 191x : smmintrin.h __cplusplus'
-// is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
-#pragma warning(disable : 4668)
-
-// 1400 - 1600 : WinDef.h : 'FARPROC' :
-// 1900 - 191x : immintrin.h: _readfsbase_u32
-// no function prototype given : converting '()' to '(void)'
-#pragma warning(disable : 4255)
-#endif
-
-#if _MSC_VER >= 1914
-// Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
-#pragma warning(disable : 5045)
-#endif
-
-#endif // _MSC_VER > 1200
-#endif // _MSC_VER
-
-
-#if defined(__clang__) && (__clang_major__ >= 4)
-  #define Z7_PRAGMA_OPT_DISABLE_LOOP_UNROLL_VECTORIZE \
-    _Pragma("clang loop unroll(disable)") \
-    _Pragma("clang loop vectorize(disable)")
-  #define Z7_ATTRIB_NO_VECTORIZE
-#elif defined(__GNUC__) && (__GNUC__ >= 5) \
-    && (!defined(Z7_MCST_LCC_VERSION) || (Z7_MCST_LCC_VERSION >= 12610))
-  #define Z7_ATTRIB_NO_VECTORIZE __attribute__((optimize("no-tree-vectorize")))
-  // __attribute__((optimize("no-unroll-loops")));
-  #define Z7_PRAGMA_OPT_DISABLE_LOOP_UNROLL_VECTORIZE
-#elif defined(_MSC_VER) && (_MSC_VER >= 1920)
-  #define Z7_PRAGMA_OPT_DISABLE_LOOP_UNROLL_VECTORIZE \
-    _Pragma("loop( no_vector )")
-  #define Z7_ATTRIB_NO_VECTORIZE
-#else
-  #define Z7_PRAGMA_OPT_DISABLE_LOOP_UNROLL_VECTORIZE
-  #define Z7_ATTRIB_NO_VECTORIZE
-#endif
-
-#if defined(MY_CPU_X86_OR_AMD64) && ( \
-       defined(__clang__) && (__clang_major__ >= 4) \
-    || defined(__GNUC__) && (__GNUC__ >= 5))
-  #define Z7_ATTRIB_NO_SSE  __attribute__((__target__("no-sse")))
-#else
-  #define Z7_ATTRIB_NO_SSE
-#endif
-
-#define Z7_ATTRIB_NO_VECTOR \
-  Z7_ATTRIB_NO_VECTORIZE \
-  Z7_ATTRIB_NO_SSE
-
-
-#if defined(__clang__) && (__clang_major__ >= 8) \
-  || defined(__GNUC__) && (__GNUC__ >= 1000) \
-  /* || defined(_MSC_VER) && (_MSC_VER >= 1920) */
-  // GCC is not good for __builtin_expect()
-  #define Z7_LIKELY(x)   (__builtin_expect((x), 1))
-  #define Z7_UNLIKELY(x) (__builtin_expect((x), 0))
-  // #define Z7_unlikely [[unlikely]]
-  // #define Z7_likely [[likely]]
-#else
-  #define Z7_LIKELY(x)   (x)
-  #define Z7_UNLIKELY(x) (x)
-  // #define Z7_likely
-#endif
-
-
-#if (defined(Z7_CLANG_VERSION) && (Z7_CLANG_VERSION >= 30600))
-
-#if (Z7_CLANG_VERSION < 130000)
-#define Z7_DIAGNOSTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER \
-  _Pragma("GCC diagnostic push") \
-  _Pragma("GCC diagnostic ignored \"-Wreserved-id-macro\"")
-#else
-#define Z7_DIAGNOSTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER \
-  _Pragma("GCC diagnostic push") \
-  _Pragma("GCC diagnostic ignored \"-Wreserved-macro-identifier\"")
-#endif
-
-#define Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_IDENTIFIER \
-  _Pragma("GCC diagnostic pop")
-#else
-#define Z7_DIAGNOSTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER
-#define Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_IDENTIFIER
 #endif
 
 #define UNUSED_VAR(x) (void)x;

common/LZMA/SDK/C/CpuArch.h

@@ -1,8 +1,8 @@
 /* CpuArch.h -- CPU specific code
-Igor Pavlov : Public domain */
+2022-07-15 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_CPU_ARCH_H
+#ifndef __CPU_ARCH_H
-#define ZIP7_INC_CPU_ARCH_H
+#define __CPU_ARCH_H
 
 #include "7zTypes.h"
 
@@ -20,7 +20,6 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
   MY_CPU_64BIT doesn't mean that (sizeof(void *) == 8)
 */
 
-#if !defined(_M_ARM64EC)
 #if  defined(_M_X64) \
   || defined(_M_AMD64) \
   || defined(__x86_64__) \
@@ -36,7 +35,6 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
   #endif
   #define MY_CPU_64BIT
 #endif
-#endif
 
 
 #if  defined(_M_IX86) \
@@ -49,26 +47,11 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
 
 
 #if  defined(_M_ARM64) \
-  || defined(_M_ARM64EC) \
   || defined(__AARCH64EL__) \
   || defined(__AARCH64EB__) \
   || defined(__aarch64__)
   #define MY_CPU_ARM64
-#if   defined(__ILP32__) \
+  #define MY_CPU_NAME "arm64"
-   || defined(__SIZEOF_POINTER__) && (__SIZEOF_POINTER__ == 4)
-    #define MY_CPU_NAME "arm64-32"
-    #define MY_CPU_SIZEOF_POINTER 4
-#elif defined(__SIZEOF_POINTER__) && (__SIZEOF_POINTER__ == 16)
-    #define MY_CPU_NAME "arm64-128"
-    #define MY_CPU_SIZEOF_POINTER 16
-#else
-#if defined(_M_ARM64EC)
-    #define MY_CPU_NAME "arm64ec"
-#else
-    #define MY_CPU_NAME "arm64"
-#endif
-    #define MY_CPU_SIZEOF_POINTER 8
-#endif
   #define MY_CPU_64BIT
 #endif
 
@@ -85,10 +68,8 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
   #define MY_CPU_ARM
 
   #if defined(__thumb__) || defined(__THUMBEL__) || defined(_M_ARMT)
-    #define MY_CPU_ARMT
     #define MY_CPU_NAME "armt"
   #else
-    #define MY_CPU_ARM32
     #define MY_CPU_NAME "arm"
   #endif
   /* #define MY_CPU_32BIT */
@@ -122,8 +103,6 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
   || defined(__PPC__) \
   || defined(_POWER)
 
-#define MY_CPU_PPC_OR_PPC64
-
 #if  defined(__ppc64__) \
   || defined(__powerpc64__) \
   || defined(_LP64) \
@@ -144,36 +123,8 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
 #endif
 
 
-#if   defined(__sparc__) \
-   || defined(__sparc)
-  #define MY_CPU_SPARC
-  #if  defined(__LP64__) \
-    || defined(_LP64) \
-    || defined(__SIZEOF_POINTER__) && (__SIZEOF_POINTER__ == 8)
-    #define MY_CPU_NAME "sparcv9"
-    #define MY_CPU_SIZEOF_POINTER 8
-    #define MY_CPU_64BIT
-  #elif defined(__sparc_v9__) \
-     || defined(__sparcv9)
-    #define MY_CPU_64BIT
-    #if defined(__SIZEOF_POINTER__) && (__SIZEOF_POINTER__ == 4)
-      #define MY_CPU_NAME "sparcv9-32"
-    #else
-      #define MY_CPU_NAME "sparcv9m"
-    #endif
-  #elif defined(__sparc_v8__) \
-     || defined(__sparcv8)
-    #define MY_CPU_NAME "sparcv8"
-    #define MY_CPU_SIZEOF_POINTER 4
-  #else
-    #define MY_CPU_NAME "sparc"
-  #endif
-#endif
-
-
 #if  defined(__riscv) \
   || defined(__riscv__)
-    #define MY_CPU_RISCV
   #if __riscv_xlen == 32
     #define MY_CPU_NAME "riscv32"
   #elif __riscv_xlen == 64
@@ -184,39 +135,6 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
 #endif
 
 
-#if defined(__loongarch__)
-  #define MY_CPU_LOONGARCH
-  #if defined(__loongarch64) || defined(__loongarch_grlen) && (__loongarch_grlen == 64)
-  #define MY_CPU_64BIT
-  #endif
-  #if defined(__loongarch64)
-  #define MY_CPU_NAME "loongarch64"
-  #define MY_CPU_LOONGARCH64
-  #else
-  #define MY_CPU_NAME "loongarch"
-  #endif
-#endif
-
-
-// #undef MY_CPU_NAME
-// #undef MY_CPU_SIZEOF_POINTER
-// #define __e2k__
-// #define __SIZEOF_POINTER__ 4
-#if  defined(__e2k__)
-  #define MY_CPU_E2K
-  #if defined(__ILP32__) || defined(__SIZEOF_POINTER__) && (__SIZEOF_POINTER__ == 4)
-    #define MY_CPU_NAME "e2k-32"
-    #define MY_CPU_SIZEOF_POINTER 4
-  #else
-    #define MY_CPU_NAME "e2k"
-    #if defined(__LP64__) || defined(__SIZEOF_POINTER__) && (__SIZEOF_POINTER__ == 8)
-      #define MY_CPU_SIZEOF_POINTER 8
-    #endif
-  #endif
-  #define MY_CPU_64BIT
-#endif
-
-
 #if defined(MY_CPU_X86) || defined(MY_CPU_AMD64)
 #define MY_CPU_X86_OR_AMD64
 #endif
@@ -247,7 +165,6 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
     || defined(MY_CPU_ARM_LE) \
     || defined(MY_CPU_ARM64_LE) \
     || defined(MY_CPU_IA64_LE) \
-    || defined(_LITTLE_ENDIAN) \
     || defined(__LITTLE_ENDIAN__) \
     || defined(__ARMEL__) \
     || defined(__THUMBEL__) \
@@ -280,9 +197,6 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
   #error Stop_Compiling_Bad_Endian
 #endif
 
-#if !defined(MY_CPU_LE) && !defined(MY_CPU_BE)
-  #error Stop_Compiling_CPU_ENDIAN_must_be_detected_at_compile_time
-#endif
 
 #if defined(MY_CPU_32BIT) && defined(MY_CPU_64BIT)
   #error Stop_Compiling_Bad_32_64_BIT
@@ -324,7 +238,6 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
 
 
 #ifndef MY_CPU_NAME
-  // #define MY_CPU_IS_UNKNOWN
   #ifdef MY_CPU_LE
     #define MY_CPU_NAME "LE"
   #elif defined(MY_CPU_BE)
@@ -340,121 +253,15 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
 
 
 
-#ifdef __has_builtin
-  #define Z7_has_builtin(x)  __has_builtin(x)
-#else
-  #define Z7_has_builtin(x)  0
-#endif
-
-
-#define Z7_BSWAP32_CONST(v) \
-       ( (((UInt32)(v) << 24)                   ) \
-       | (((UInt32)(v) <<  8) & (UInt32)0xff0000) \
-       | (((UInt32)(v) >>  8) & (UInt32)0xff00  ) \
-       | (((UInt32)(v) >> 24)                   ))
-
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-
-#include <stdlib.h>
-
-/* Note: these macros will use bswap instruction (486), that is unsupported in 386 cpu */
-
-#pragma intrinsic(_byteswap_ushort)
-#pragma intrinsic(_byteswap_ulong)
-#pragma intrinsic(_byteswap_uint64)
-
-#define Z7_BSWAP16(v)  _byteswap_ushort(v)
-#define Z7_BSWAP32(v)  _byteswap_ulong (v)
-#define Z7_BSWAP64(v)  _byteswap_uint64(v)
-#define Z7_CPU_FAST_BSWAP_SUPPORTED
-
-/* GCC can generate slow code that calls function for __builtin_bswap32() for:
-     - GCC for RISCV, if Zbb/XTHeadBb extension is not used.
-     - GCC for SPARC.
-   The code from CLANG for SPARC also is not fastest.
-   So we don't define Z7_CPU_FAST_BSWAP_SUPPORTED in some cases.
-*/
-#elif (!defined(MY_CPU_RISCV) || defined (__riscv_zbb) || defined(__riscv_xtheadbb)) \
-    && !defined(MY_CPU_SPARC) \
-    && ( \
-       (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) \
-    || (defined(__clang__) && Z7_has_builtin(__builtin_bswap16)) \
-    )
-
-#define Z7_BSWAP16(v)  __builtin_bswap16(v)
-#define Z7_BSWAP32(v)  __builtin_bswap32(v)
-#define Z7_BSWAP64(v)  __builtin_bswap64(v)
-#define Z7_CPU_FAST_BSWAP_SUPPORTED
-
-#else
-
-#define Z7_BSWAP16(v) ((UInt16) \
-       ( ((UInt32)(v) << 8) \
-       | ((UInt32)(v) >> 8) \
-       ))
-
-#define Z7_BSWAP32(v) Z7_BSWAP32_CONST(v)
-
-#define Z7_BSWAP64(v) \
-       ( ( ( (UInt64)(v)                           ) << 8 * 7 ) \
-       | ( ( (UInt64)(v) & ((UInt32)0xff << 8 * 1) ) << 8 * 5 ) \
-       | ( ( (UInt64)(v) & ((UInt32)0xff << 8 * 2) ) << 8 * 3 ) \
-       | ( ( (UInt64)(v) & ((UInt32)0xff << 8 * 3) ) << 8 * 1 ) \
-       | ( ( (UInt64)(v) >> 8 * 1 ) & ((UInt32)0xff << 8 * 3) ) \
-       | ( ( (UInt64)(v) >> 8 * 3 ) & ((UInt32)0xff << 8 * 2) ) \
-       | ( ( (UInt64)(v) >> 8 * 5 ) & ((UInt32)0xff << 8 * 1) ) \
-       | ( ( (UInt64)(v) >> 8 * 7 )                           ) \
-       )
-
-#endif
-
-
-
 #ifdef MY_CPU_LE
   #if defined(MY_CPU_X86_OR_AMD64) \
-      || defined(MY_CPU_ARM64) \
+      || defined(MY_CPU_ARM64)
-      || defined(MY_CPU_RISCV) && defined(__riscv_misaligned_fast) \
-      || defined(MY_CPU_E2K) && defined(__iset__) && (__iset__ >= 6)
     #define MY_CPU_LE_UNALIGN
     #define MY_CPU_LE_UNALIGN_64
   #elif defined(__ARM_FEATURE_UNALIGNED)
-/* === ALIGNMENT on 32-bit arm and LDRD/STRD/LDM/STM instructions.
+    /* gcc9 for 32-bit arm can use LDRD instruction that requires 32-bit alignment.
-  Description of problems:
+       So we can't use unaligned 64-bit operations. */
-problem-1 : 32-bit ARM architecture:
+    #define MY_CPU_LE_UNALIGN
-  multi-access (pair of 32-bit accesses) instructions (LDRD/STRD/LDM/STM)
-  require 32-bit (WORD) alignment (by 32-bit ARM architecture).
-  So there is "Alignment fault exception", if data is not aligned for 32-bit.
-
-problem-2 : 32-bit kernels and arm64 kernels:
-  32-bit linux kernels provide fixup for these "paired" instruction "Alignment fault exception".
-  So unaligned paired-access instructions work via exception handler in kernel in 32-bit linux.
- 
-  But some arm64 kernels do not handle these faults in 32-bit programs.
-  So we have unhandled exception for such instructions.
-  Probably some new arm64 kernels have fixed it, and unaligned
-  paired-access instructions work in new kernels?
-
-problem-3 : compiler for 32-bit arm:
-  Compilers use LDRD/STRD/LDM/STM for UInt64 accesses
-  and for another cases where two 32-bit accesses are fused
-  to one multi-access instruction.
-  So UInt64 variables must be aligned for 32-bit, and each
-  32-bit access must be aligned for 32-bit, if we want to
-  avoid "Alignment fault" exception (handled or unhandled).
-
-problem-4 : performace:
-  Even if unaligned access is handled by kernel, it will be slow.
-  So if we allow unaligned access, we can get fast unaligned
-  single-access, and slow unaligned paired-access.
-
-  We don't allow unaligned access on 32-bit arm, because compiler
-  genarates paired-access instructions that require 32-bit alignment,
-  and some arm64 kernels have no handler for these instructions.
-  Also unaligned paired-access instructions will be slow, if kernel handles them.
-*/
-    // it must be disabled:
-    // #define MY_CPU_LE_UNALIGN
   #endif
 #endif
 
@@ -465,11 +272,13 @@ problem-4 : performace:
 #define GetUi32(p) (*(const UInt32 *)(const void *)(p))
 #ifdef MY_CPU_LE_UNALIGN_64
 #define GetUi64(p) (*(const UInt64 *)(const void *)(p))
-#define SetUi64(p, v) { *(UInt64 *)(void *)(p) = (v); }
 #endif
 
 #define SetUi16(p, v) { *(UInt16 *)(void *)(p) = (v); }
 #define SetUi32(p, v) { *(UInt32 *)(void *)(p) = (v); }
+#ifdef MY_CPU_LE_UNALIGN_64
+#define SetUi64(p, v) { *(UInt64 *)(void *)(p) = (v); }
+#endif
 
 #else
 
@@ -496,33 +305,50 @@ problem-4 : performace:
 #endif
 
 
-#ifndef GetUi64
+#ifndef MY_CPU_LE_UNALIGN_64
+
 #define GetUi64(p) (GetUi32(p) | ((UInt64)GetUi32(((const Byte *)(p)) + 4) << 32))
-#endif
 
-#ifndef SetUi64
 #define SetUi64(p, v) { Byte *_ppp2_ = (Byte *)(p); UInt64 _vvv2_ = (v); \
-    SetUi32(_ppp2_    , (UInt32)_vvv2_) \
+    SetUi32(_ppp2_    , (UInt32)_vvv2_); \
-    SetUi32(_ppp2_ + 4, (UInt32)(_vvv2_ >> 32)) }
+    SetUi32(_ppp2_ + 4, (UInt32)(_vvv2_ >> 32)); }
+
 #endif
 
 
-#if defined(MY_CPU_LE_UNALIGN) && defined(Z7_CPU_FAST_BSWAP_SUPPORTED)
 
-#if 0
+
-// Z7_BSWAP16 can be slow for x86-msvc
+#ifdef __has_builtin
-#define GetBe16_to32(p)  (Z7_BSWAP16 (*(const UInt16 *)(const void *)(p)))
+  #define MY__has_builtin(x) __has_builtin(x)
 #else
-#define GetBe16_to32(p)  (Z7_BSWAP32 (*(const UInt16 *)(const void *)(p)) >> 16)
+  #define MY__has_builtin(x) 0
 #endif
 
-#define GetBe32(p)  Z7_BSWAP32 (*(const UInt32 *)(const void *)(p))
+#if defined(MY_CPU_LE_UNALIGN) && /* defined(_WIN64) && */ defined(_MSC_VER) && (_MSC_VER >= 1300)
-#define SetBe32(p, v) { (*(UInt32 *)(void *)(p)) = Z7_BSWAP32(v); }
 
-#if defined(MY_CPU_LE_UNALIGN_64)
+/* Note: we use bswap instruction, that is unsupported in 386 cpu */
-#define GetBe64(p)  Z7_BSWAP64 (*(const UInt64 *)(const void *)(p))
+
-#define SetBe64(p, v) { (*(UInt64 *)(void *)(p)) = Z7_BSWAP64(v); }
+#include <stdlib.h>
-#endif
+
+#pragma intrinsic(_byteswap_ushort)
+#pragma intrinsic(_byteswap_ulong)
+#pragma intrinsic(_byteswap_uint64)
+
+/* #define GetBe16(p) _byteswap_ushort(*(const UInt16 *)(const Byte *)(p)) */
+#define GetBe32(p) _byteswap_ulong (*(const UInt32 *)(const void *)(p))
+#define GetBe64(p) _byteswap_uint64(*(const UInt64 *)(const void *)(p))
+
+#define SetBe32(p, v) (*(UInt32 *)(void *)(p)) = _byteswap_ulong(v)
+
+#elif defined(MY_CPU_LE_UNALIGN) && ( \
+       (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) \
+    || (defined(__clang__) && MY__has_builtin(__builtin_bswap16)) )
+
+/* #define GetBe16(p) __builtin_bswap16(*(const UInt16 *)(const void *)(p)) */
+#define GetBe32(p) __builtin_bswap32(*(const UInt32 *)(const void *)(p))
+#define GetBe64(p) __builtin_bswap64(*(const UInt64 *)(const void *)(p))
+
+#define SetBe32(p, v) (*(UInt32 *)(void *)(p)) = __builtin_bswap32(v)
 
 #else
 
@@ -532,6 +358,8 @@ problem-4 : performace:
     ((UInt32)((const Byte *)(p))[2] <<  8) | \
              ((const Byte *)(p))[3] )
 
+#define GetBe64(p) (((UInt64)GetBe32(p) << 32) | GetBe32(((const Byte *)(p)) + 4))
+
 #define SetBe32(p, v) { Byte *_ppp_ = (Byte *)(p); UInt32 _vvv_ = (v); \
     _ppp_[0] = (Byte)(_vvv_ >> 24); \
     _ppp_[1] = (Byte)(_vvv_ >> 16); \
@@ -540,113 +368,53 @@ problem-4 : performace:
 
 #endif
 
-#ifndef GetBe64
-#define GetBe64(p) (((UInt64)GetBe32(p) << 32) | GetBe32(((const Byte *)(p)) + 4))
-#endif
-
-#ifndef SetBe64
-#define SetBe64(p, v) { Byte *_ppp_ = (Byte *)(p); UInt64 _vvv_ = (v); \
-    _ppp_[0] = (Byte)(_vvv_ >> 56); \
-    _ppp_[1] = (Byte)(_vvv_ >> 48); \
-    _ppp_[2] = (Byte)(_vvv_ >> 40); \
-    _ppp_[3] = (Byte)(_vvv_ >> 32); \
-    _ppp_[4] = (Byte)(_vvv_ >> 24); \
-    _ppp_[5] = (Byte)(_vvv_ >> 16); \
-    _ppp_[6] = (Byte)(_vvv_ >> 8); \
-    _ppp_[7] = (Byte)_vvv_; }
-#endif
 
 #ifndef GetBe16
-#ifdef GetBe16_to32
+
-#define GetBe16(p) ( (UInt16) GetBe16_to32(p))
-#else
 #define GetBe16(p) ( (UInt16) ( \
     ((UInt16)((const Byte *)(p))[0] << 8) | \
              ((const Byte *)(p))[1] ))
-#endif
+
 #endif
 
 
-#if defined(MY_CPU_BE)
-#define Z7_CONV_BE_TO_NATIVE_CONST32(v)  (v)
-#define Z7_CONV_LE_TO_NATIVE_CONST32(v)  Z7_BSWAP32_CONST(v)
-#define Z7_CONV_NATIVE_TO_BE_32(v)       (v)
-#elif defined(MY_CPU_LE)
-#define Z7_CONV_BE_TO_NATIVE_CONST32(v)  Z7_BSWAP32_CONST(v)
-#define Z7_CONV_LE_TO_NATIVE_CONST32(v)  (v)
-#define Z7_CONV_NATIVE_TO_BE_32(v)       Z7_BSWAP32(v)
-#else
-#error Stop_Compiling_Unknown_Endian_CONV
-#endif
-
-
-#if defined(MY_CPU_BE)
-
-#define GetBe64a(p)      (*(const UInt64 *)(const void *)(p))
-#define GetBe32a(p)      (*(const UInt32 *)(const void *)(p))
-#define GetBe16a(p)      (*(const UInt16 *)(const void *)(p))
-#define SetBe32a(p, v)   { *(UInt32 *)(void *)(p) = (v); }
-#define SetBe16a(p, v)   { *(UInt16 *)(void *)(p) = (v); }
-
-#define GetUi64a(p)      GetUi64(p)
-#define GetUi32a(p)      GetUi32(p)
-#define GetUi16a(p)      GetUi16(p)
-#define SetUi32a(p, v)   SetUi32(p, v)
-#define SetUi16a(p, v)   SetUi16(p, v)
-
-#elif defined(MY_CPU_LE)
-
-#define GetUi64a(p)      (*(const UInt64 *)(const void *)(p))
-#define GetUi32a(p)      (*(const UInt32 *)(const void *)(p))
-#define GetUi16a(p)      (*(const UInt16 *)(const void *)(p))
-#define SetUi32a(p, v)   { *(UInt32 *)(void *)(p) = (v); }
-#define SetUi16a(p, v)   { *(UInt16 *)(void *)(p) = (v); }
-
-#define GetBe64a(p)      GetBe64(p)
-#define GetBe32a(p)      GetBe32(p)
-#define GetBe16a(p)      GetBe16(p)
-#define SetBe32a(p, v)   SetBe32(p, v)
-#define SetBe16a(p, v)   SetBe16(p, v)
-
-#else
-#error Stop_Compiling_Unknown_Endian_CPU_a
-#endif
-
-
-#ifndef GetBe16_to32
-#define GetBe16_to32(p) GetBe16(p)
-#endif
-
-
-#if defined(MY_CPU_X86_OR_AMD64) \
-  || defined(MY_CPU_ARM_OR_ARM64) \
-  || defined(MY_CPU_PPC_OR_PPC64)
-  #define Z7_CPU_FAST_ROTATE_SUPPORTED
-#endif
-
 
 #ifdef MY_CPU_X86_OR_AMD64
 
-void Z7_FASTCALL z7_x86_cpuid(UInt32 a[4], UInt32 function);
+typedef struct
-UInt32 Z7_FASTCALL z7_x86_cpuid_GetMaxFunc(void);
+{
-#if defined(MY_CPU_AMD64)
+  UInt32 maxFunc;
-#define Z7_IF_X86_CPUID_SUPPORTED
+  UInt32 vendor[3];
-#else
+  UInt32 ver;
-#define Z7_IF_X86_CPUID_SUPPORTED if (z7_x86_cpuid_GetMaxFunc())
+  UInt32 b;
-#endif
+  UInt32 c;
+  UInt32 d;
+} Cx86cpuid;
+
+enum
+{
+  CPU_FIRM_INTEL,
+  CPU_FIRM_AMD,
+  CPU_FIRM_VIA
+};
+
+void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d);
+
+BoolInt x86cpuid_CheckAndRead(Cx86cpuid *p);
+int x86cpuid_GetFirm(const Cx86cpuid *p);
+
+#define x86cpuid_GetFamily(ver) (((ver >> 16) & 0xFF0) | ((ver >> 8) & 0xF))
+#define x86cpuid_GetModel(ver)  (((ver >> 12) &  0xF0) | ((ver >> 4) & 0xF))
+#define x86cpuid_GetStepping(ver) (ver & 0xF)
+
+BoolInt CPU_Is_InOrder(void);
 
 BoolInt CPU_IsSupported_AES(void);
-BoolInt CPU_IsSupported_AVX(void);
 BoolInt CPU_IsSupported_AVX2(void);
-BoolInt CPU_IsSupported_AVX512F_AVX512VL(void);
 BoolInt CPU_IsSupported_VAES_AVX2(void);
-BoolInt CPU_IsSupported_CMOV(void);
-BoolInt CPU_IsSupported_SSE(void);
-BoolInt CPU_IsSupported_SSE2(void);
 BoolInt CPU_IsSupported_SSSE3(void);
 BoolInt CPU_IsSupported_SSE41(void);
 BoolInt CPU_IsSupported_SHA(void);
-BoolInt CPU_IsSupported_SHA512(void);
 BoolInt CPU_IsSupported_PageGB(void);
 
 #elif defined(MY_CPU_ARM_OR_ARM64)
@@ -664,13 +432,12 @@ BoolInt CPU_IsSupported_SHA1(void);
 BoolInt CPU_IsSupported_SHA2(void);
 BoolInt CPU_IsSupported_AES(void);
 #endif
-BoolInt CPU_IsSupported_SHA512(void);
 
 #endif
 
 #if defined(__APPLE__)
-int z7_sysctlbyname_Get(const char *name, void *buf, size_t *bufSize);
+int My_sysctlbyname_Get(const char *name, void *buf, size_t *bufSize);
-int z7_sysctlbyname_Get_UInt32(const char *name, UInt32 *val);
+int My_sysctlbyname_Get_UInt32(const char *name, UInt32 *val);
 #endif
 
 EXTERN_C_END

common/LZMA/SDK/C/LzFind.h

@@ -1,8 +1,8 @@
 /* LzFind.h -- Match finder for LZ algorithms
-2024-01-22 : Igor Pavlov : Public domain */
+2021-07-13 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_LZ_FIND_H
+#ifndef __LZ_FIND_H
-#define ZIP7_INC_LZ_FIND_H
+#define __LZ_FIND_H
 
 #include "7zTypes.h"
 
@@ -10,9 +10,9 @@ EXTERN_C_BEGIN
 
 typedef UInt32 CLzRef;
 
-typedef struct
+typedef struct _CMatchFinder
 {
-  const Byte *buffer;
+  Byte *buffer;
   UInt32 pos;
   UInt32 posLimit;
   UInt32 streamPos;  /* wrap over Zero is allowed (streamPos < pos). Use (UInt32)(streamPos - pos) */
@@ -32,8 +32,8 @@ typedef struct
   UInt32 hashMask;
   UInt32 cutValue;
 
-  Byte *bufBase;
+  Byte *bufferBase;
-  ISeqInStreamPtr stream;
+  ISeqInStream *stream;
   
   UInt32 blockSize;
   UInt32 keepSizeBefore;
@@ -43,9 +43,7 @@ typedef struct
   size_t directInputRem;
   UInt32 historySize;
   UInt32 fixedHashSize;
-  Byte numHashBytes_Min;
+  UInt32 hashSizeSum;
-  Byte numHashOutBits;
-  Byte _pad2_[2];
   SRes result;
   UInt32 crc[256];
   size_t numRefs;
@@ -71,45 +69,24 @@ void MatchFinder_ReadIfRequired(CMatchFinder *p);
 
 void MatchFinder_Construct(CMatchFinder *p);
 
-/* (directInput = 0) is default value.
+/* Conditions:
-   It's required to provide correct (directInput) value
+     historySize <= 3 GB
-   before calling MatchFinder_Create().
+     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
-   You can set (directInput) by any of the following calls:
-     - MatchFinder_SET_DIRECT_INPUT_BUF()
-     - MatchFinder_SET_STREAM()
-     - MatchFinder_SET_STREAM_MODE()
 */
-
-#define MatchFinder_SET_DIRECT_INPUT_BUF(p, _src_, _srcLen_) { \
-  (p)->stream = NULL; \
-  (p)->directInput = 1; \
-  (p)->buffer = (_src_); \
-  (p)->directInputRem = (_srcLen_); }
-
-/*
-#define MatchFinder_SET_STREAM_MODE(p) { \
-  (p)->directInput = 0; }
-*/
-
-#define MatchFinder_SET_STREAM(p, _stream_) { \
-  (p)->stream = _stream_; \
-  (p)->directInput = 0; }
-  
-
 int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
     ISzAllocPtr alloc);
 void MatchFinder_Free(CMatchFinder *p, ISzAllocPtr alloc);
 void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, size_t numItems);
+// void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
 
 /*
-#define MatchFinder_INIT_POS(p, val) \
+#define Inline_MatchFinder_InitPos(p, val) \
     (p)->pos = (val); \
     (p)->streamPos = (val);
 */
 
-// void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+#define Inline_MatchFinder_ReduceOffsets(p, subValue) \
-#define MatchFinder_REDUCE_OFFSETS(p, subValue) \
     (p)->pos -= (subValue); \
     (p)->streamPos -= (subValue);
 
@@ -130,7 +107,7 @@ typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
 typedef UInt32 * (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
 typedef void (*Mf_Skip_Func)(void *object, UInt32);
 
-typedef struct
+typedef struct _IMatchFinder
 {
   Mf_Init_Func Init;
   Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
@@ -144,8 +121,7 @@ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder2 *vTable);
 void MatchFinder_Init_LowHash(CMatchFinder *p);
 void MatchFinder_Init_HighHash(CMatchFinder *p);
 void MatchFinder_Init_4(CMatchFinder *p);
-// void MatchFinder_Init(CMatchFinder *p);
+void MatchFinder_Init(CMatchFinder *p);
-void MatchFinder_Init(void *p);
 
 UInt32* Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
 UInt32* Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);

common/LZMA/SDK/C/LzHash.h

@@ -1,8 +1,8 @@
-/* LzHash.h -- HASH constants for LZ algorithms
+/* LzHash.h -- HASH functions for LZ algorithms
-2023-03-05 : Igor Pavlov : Public domain */
+2019-10-30 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_LZ_HASH_H
+#ifndef __LZ_HASH_H
-#define ZIP7_INC_LZ_HASH_H
+#define __LZ_HASH_H
 
 /*
   (kHash2Size >= (1 <<  8)) : Required

common/LZMA/SDK/C/LzmaDec.c

@@ -1,5 +1,5 @@
 /* LzmaDec.c -- LZMA Decoder
-2023-04-07 : Igor Pavlov : Public domain */
+2021-04-01 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -8,15 +8,15 @@
 /* #include "CpuArch.h" */
 #include "LzmaDec.h"
 
-// #define kNumTopBits 24
+#define kNumTopBits 24
-#define kTopValue ((UInt32)1 << 24)
+#define kTopValue ((UInt32)1 << kNumTopBits)
 
 #define kNumBitModelTotalBits 11
 #define kBitModelTotal (1 << kNumBitModelTotalBits)
 
 #define RC_INIT_SIZE 5
 
-#ifndef Z7_LZMA_DEC_OPT
+#ifndef _LZMA_DEC_OPT
 
 #define kNumMoveBits 5
 #define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
@@ -25,14 +25,14 @@
 #define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
 #define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
 #define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
-  { UPDATE_0(p)  i = (i + i); A0; } else \
+  { UPDATE_0(p); i = (i + i); A0; } else \
-  { UPDATE_1(p)  i = (i + i) + 1; A1; }
+  { UPDATE_1(p); i = (i + i) + 1; A1; }
 
 #define TREE_GET_BIT(probs, i) { GET_BIT2(probs + i, i, ;, ;); }
 
 #define REV_BIT(p, i, A0, A1) IF_BIT_0(p + i) \
-  { UPDATE_0(p + i)  A0; } else \
+  { UPDATE_0(p + i); A0; } else \
-  { UPDATE_1(p + i)  A1; }
+  { UPDATE_1(p + i); A1; }
 #define REV_BIT_VAR(  p, i, m) REV_BIT(p, i, i += m; m += m, m += m; i += m; )
 #define REV_BIT_CONST(p, i, m) REV_BIT(p, i, i += m;       , i += m * 2; )
 #define REV_BIT_LAST( p, i, m) REV_BIT(p, i, i -= m        , ; )
@@ -40,19 +40,19 @@
 #define TREE_DECODE(probs, limit, i) \
   { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
 
-/* #define Z7_LZMA_SIZE_OPT */
+/* #define _LZMA_SIZE_OPT */
 
-#ifdef Z7_LZMA_SIZE_OPT
+#ifdef _LZMA_SIZE_OPT
 #define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
 #else
 #define TREE_6_DECODE(probs, i) \
   { i = 1; \
-  TREE_GET_BIT(probs, i) \
+  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i) \
+  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i) \
+  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i) \
+  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i) \
+  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i) \
+  TREE_GET_BIT(probs, i); \
   i -= 0x40; }
 #endif
 
@@ -64,25 +64,25 @@
   probLit = prob + (offs + bit + symbol); \
   GET_BIT2(probLit, symbol, offs ^= bit; , ;)
 
-#endif // Z7_LZMA_DEC_OPT
+#endif // _LZMA_DEC_OPT
 
 
 #define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_INPUT_EOF; range <<= 8; code = (code << 8) | (*buf++); }
 
-#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK bound = (range >> kNumBitModelTotalBits) * (UInt32)ttt; if (code < bound)
+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * (UInt32)ttt; if (code < bound)
 #define UPDATE_0_CHECK range = bound;
 #define UPDATE_1_CHECK range -= bound; code -= bound;
 #define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
-  { UPDATE_0_CHECK  i = (i + i); A0; } else \
+  { UPDATE_0_CHECK; i = (i + i); A0; } else \
-  { UPDATE_1_CHECK  i = (i + i) + 1; A1; }
+  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
 #define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
 #define TREE_DECODE_CHECK(probs, limit, i) \
   { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
 
 
 #define REV_BIT_CHECK(p, i, m) IF_BIT_0_CHECK(p + i) \
-  { UPDATE_0_CHECK  i += m; m += m; } else \
+  { UPDATE_0_CHECK; i += m; m += m; } else \
-  { UPDATE_1_CHECK  m += m; i += m; }
+  { UPDATE_1_CHECK; m += m; i += m; }
 
 
 #define kNumPosBitsMax 4
@@ -224,14 +224,14 @@ Out:
 */
 
 
-#ifdef Z7_LZMA_DEC_OPT
+#ifdef _LZMA_DEC_OPT
 
-int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit);
+int MY_FAST_CALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit);
 
 #else
 
 static
-int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
+int MY_FAST_CALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
 {
   CLzmaProb *probs = GET_PROBS;
   unsigned state = (unsigned)p->state;
@@ -263,7 +263,7 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
     IF_BIT_0(prob)
     {
       unsigned symbol;
-      UPDATE_0(prob)
+      UPDATE_0(prob);
       prob = probs + Literal;
       if (processedPos != 0 || checkDicSize != 0)
         prob += (UInt32)3 * ((((processedPos << 8) + dic[(dicPos == 0 ? dicBufSize : dicPos) - 1]) & lpMask) << lc);
@@ -273,7 +273,7 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
       {
         state -= (state < 4) ? state : 3;
         symbol = 1;
-        #ifdef Z7_LZMA_SIZE_OPT
+        #ifdef _LZMA_SIZE_OPT
         do { NORMAL_LITER_DEC } while (symbol < 0x100);
         #else
         NORMAL_LITER_DEC
@@ -292,7 +292,7 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
         unsigned offs = 0x100;
         state -= (state < 10) ? 3 : 6;
         symbol = 1;
-        #ifdef Z7_LZMA_SIZE_OPT
+        #ifdef _LZMA_SIZE_OPT
         do
         {
           unsigned bit;
@@ -321,25 +321,25 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
     }
     
     {
-      UPDATE_1(prob)
+      UPDATE_1(prob);
       prob = probs + IsRep + state;
       IF_BIT_0(prob)
       {
-        UPDATE_0(prob)
+        UPDATE_0(prob);
         state += kNumStates;
         prob = probs + LenCoder;
       }
       else
       {
-        UPDATE_1(prob)
+        UPDATE_1(prob);
         prob = probs + IsRepG0 + state;
         IF_BIT_0(prob)
         {
-          UPDATE_0(prob)
+          UPDATE_0(prob);
           prob = probs + IsRep0Long + COMBINED_PS_STATE;
           IF_BIT_0(prob)
           {
-            UPDATE_0(prob)
+            UPDATE_0(prob);
   
             // that case was checked before with kBadRepCode
             // if (checkDicSize == 0 && processedPos == 0) { len = kMatchSpecLen_Error_Data + 1; break; }
@@ -353,30 +353,30 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
             state = state < kNumLitStates ? 9 : 11;
             continue;
           }
-          UPDATE_1(prob)
+          UPDATE_1(prob);
         }
         else
         {
           UInt32 distance;
-          UPDATE_1(prob)
+          UPDATE_1(prob);
           prob = probs + IsRepG1 + state;
           IF_BIT_0(prob)
           {
-            UPDATE_0(prob)
+            UPDATE_0(prob);
             distance = rep1;
           }
           else
           {
-            UPDATE_1(prob)
+            UPDATE_1(prob);
             prob = probs + IsRepG2 + state;
             IF_BIT_0(prob)
             {
-              UPDATE_0(prob)
+              UPDATE_0(prob);
               distance = rep2;
             }
             else
             {
-              UPDATE_1(prob)
+              UPDATE_1(prob);
               distance = rep3;
               rep3 = rep2;
             }
@@ -389,37 +389,37 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
         prob = probs + RepLenCoder;
       }
       
-      #ifdef Z7_LZMA_SIZE_OPT
+      #ifdef _LZMA_SIZE_OPT
       {
         unsigned lim, offset;
         CLzmaProb *probLen = prob + LenChoice;
         IF_BIT_0(probLen)
         {
-          UPDATE_0(probLen)
+          UPDATE_0(probLen);
           probLen = prob + LenLow + GET_LEN_STATE;
           offset = 0;
           lim = (1 << kLenNumLowBits);
         }
         else
         {
-          UPDATE_1(probLen)
+          UPDATE_1(probLen);
           probLen = prob + LenChoice2;
           IF_BIT_0(probLen)
           {
-            UPDATE_0(probLen)
+            UPDATE_0(probLen);
             probLen = prob + LenLow + GET_LEN_STATE + (1 << kLenNumLowBits);
             offset = kLenNumLowSymbols;
             lim = (1 << kLenNumLowBits);
           }
           else
           {
-            UPDATE_1(probLen)
+            UPDATE_1(probLen);
             probLen = prob + LenHigh;
             offset = kLenNumLowSymbols * 2;
             lim = (1 << kLenNumHighBits);
           }
         }
-        TREE_DECODE(probLen, lim, len)
+        TREE_DECODE(probLen, lim, len);
         len += offset;
       }
       #else
@@ -427,32 +427,32 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
         CLzmaProb *probLen = prob + LenChoice;
         IF_BIT_0(probLen)
         {
-          UPDATE_0(probLen)
+          UPDATE_0(probLen);
           probLen = prob + LenLow + GET_LEN_STATE;
           len = 1;
-          TREE_GET_BIT(probLen, len)
+          TREE_GET_BIT(probLen, len);
-          TREE_GET_BIT(probLen, len)
+          TREE_GET_BIT(probLen, len);
-          TREE_GET_BIT(probLen, len)
+          TREE_GET_BIT(probLen, len);
           len -= 8;
         }
         else
         {
-          UPDATE_1(probLen)
+          UPDATE_1(probLen);
           probLen = prob + LenChoice2;
           IF_BIT_0(probLen)
           {
-            UPDATE_0(probLen)
+            UPDATE_0(probLen);
             probLen = prob + LenLow + GET_LEN_STATE + (1 << kLenNumLowBits);
             len = 1;
-            TREE_GET_BIT(probLen, len)
+            TREE_GET_BIT(probLen, len);
-            TREE_GET_BIT(probLen, len)
+            TREE_GET_BIT(probLen, len);
-            TREE_GET_BIT(probLen, len)
+            TREE_GET_BIT(probLen, len);
           }
           else
           {
-            UPDATE_1(probLen)
+            UPDATE_1(probLen);
             probLen = prob + LenHigh;
-            TREE_DECODE(probLen, (1 << kLenNumHighBits), len)
+            TREE_DECODE(probLen, (1 << kLenNumHighBits), len);
             len += kLenNumLowSymbols * 2;
           }
         }
@@ -464,7 +464,7 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
         UInt32 distance;
         prob = probs + PosSlot +
             ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-        TREE_6_DECODE(prob, distance)
+        TREE_6_DECODE(prob, distance);
         if (distance >= kStartPosModelIndex)
         {
           unsigned posSlot = (unsigned)distance;
@@ -479,7 +479,7 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
               distance++;
               do
               {
-                REV_BIT_VAR(prob, distance, m)
+                REV_BIT_VAR(prob, distance, m);
               }
               while (--numDirectBits);
               distance -= m;
@@ -514,10 +514,10 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
             distance <<= kNumAlignBits;
             {
               unsigned i = 1;
-              REV_BIT_CONST(prob, i, 1)
+              REV_BIT_CONST(prob, i, 1);
-              REV_BIT_CONST(prob, i, 2)
+              REV_BIT_CONST(prob, i, 2);
-              REV_BIT_CONST(prob, i, 4)
+              REV_BIT_CONST(prob, i, 4);
-              REV_BIT_LAST (prob, i, 8)
+              REV_BIT_LAST (prob, i, 8);
               distance |= i;
             }
             if (distance == (UInt32)0xFFFFFFFF)
@@ -592,7 +592,7 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
   }
   while (dicPos < limit && buf < bufLimit);
 
-  NORMALIZE
+  NORMALIZE;
   
   p->buf = buf;
   p->range = range;
@@ -613,7 +613,7 @@ int Z7_FASTCALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
 
 
 
-static void Z7_FASTCALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
 {
   unsigned len = (unsigned)p->remainLen;
   if (len == 0 /* || len >= kMatchSpecLenStart */)
@@ -683,7 +683,7 @@ and we support the following state of (p->checkDicSize):
     (p->checkDicSize == p->prop.dicSize)
 */
 
-static int Z7_FASTCALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
 {
   if (p->checkDicSize == 0)
   {
@@ -767,54 +767,54 @@ static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, const Byt
     else
     {
       unsigned len;
-      UPDATE_1_CHECK
+      UPDATE_1_CHECK;
 
       prob = probs + IsRep + state;
       IF_BIT_0_CHECK(prob)
       {
-        UPDATE_0_CHECK
+        UPDATE_0_CHECK;
         state = 0;
         prob = probs + LenCoder;
         res = DUMMY_MATCH;
       }
       else
       {
-        UPDATE_1_CHECK
+        UPDATE_1_CHECK;
         res = DUMMY_REP;
         prob = probs + IsRepG0 + state;
         IF_BIT_0_CHECK(prob)
         {
-          UPDATE_0_CHECK
+          UPDATE_0_CHECK;
           prob = probs + IsRep0Long + COMBINED_PS_STATE;
           IF_BIT_0_CHECK(prob)
           {
-            UPDATE_0_CHECK
+            UPDATE_0_CHECK;
             break;
           }
           else
           {
-            UPDATE_1_CHECK
+            UPDATE_1_CHECK;
           }
         }
         else
         {
-          UPDATE_1_CHECK
+          UPDATE_1_CHECK;
           prob = probs + IsRepG1 + state;
           IF_BIT_0_CHECK(prob)
           {
-            UPDATE_0_CHECK
+            UPDATE_0_CHECK;
           }
           else
           {
-            UPDATE_1_CHECK
+            UPDATE_1_CHECK;
             prob = probs + IsRepG2 + state;
             IF_BIT_0_CHECK(prob)
             {
-              UPDATE_0_CHECK
+              UPDATE_0_CHECK;
             }
             else
             {
-              UPDATE_1_CHECK
+              UPDATE_1_CHECK;
             }
           }
         }
@@ -826,31 +826,31 @@ static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, const Byt
         const CLzmaProb *probLen = prob + LenChoice;
         IF_BIT_0_CHECK(probLen)
         {
-          UPDATE_0_CHECK
+          UPDATE_0_CHECK;
           probLen = prob + LenLow + GET_LEN_STATE;
           offset = 0;
           limit = 1 << kLenNumLowBits;
         }
         else
         {
-          UPDATE_1_CHECK
+          UPDATE_1_CHECK;
           probLen = prob + LenChoice2;
           IF_BIT_0_CHECK(probLen)
           {
-            UPDATE_0_CHECK
+            UPDATE_0_CHECK;
             probLen = prob + LenLow + GET_LEN_STATE + (1 << kLenNumLowBits);
             offset = kLenNumLowSymbols;
             limit = 1 << kLenNumLowBits;
           }
           else
           {
-            UPDATE_1_CHECK
+            UPDATE_1_CHECK;
             probLen = prob + LenHigh;
             offset = kLenNumLowSymbols * 2;
             limit = 1 << kLenNumHighBits;
           }
         }
-        TREE_DECODE_CHECK(probLen, limit, len)
+        TREE_DECODE_CHECK(probLen, limit, len);
         len += offset;
       }
 
@@ -860,7 +860,7 @@ static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, const Byt
         prob = probs + PosSlot +
             ((len < kNumLenToPosStates - 1 ? len : kNumLenToPosStates - 1) <<
             kNumPosSlotBits);
-        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot)
+        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
         if (posSlot >= kStartPosModelIndex)
         {
           unsigned numDirectBits = ((posSlot >> 1) - 1);
@@ -888,7 +888,7 @@ static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, const Byt
             unsigned m = 1;
             do
             {
-              REV_BIT_CHECK(prob, i, m)
+              REV_BIT_CHECK(prob, i, m);
             }
             while (--numDirectBits);
           }
@@ -897,7 +897,7 @@ static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, const Byt
     }
     break;
   }
-  NORMALIZE_CHECK
+  NORMALIZE_CHECK;
 
   *bufOut = buf;
   return res;
@@ -943,7 +943,7 @@ When the decoder lookahead, and the lookahead symbol is not end_marker, we have
 */
 
 
-#define RETURN_NOT_FINISHED_FOR_FINISH \
+#define RETURN__NOT_FINISHED__FOR_FINISH \
   *status = LZMA_STATUS_NOT_FINISHED; \
   return SZ_ERROR_DATA; // for strict mode
   // return SZ_OK; // for relaxed mode
@@ -1029,7 +1029,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
         }
         if (p->remainLen != 0)
         {
-          RETURN_NOT_FINISHED_FOR_FINISH
+          RETURN__NOT_FINISHED__FOR_FINISH;
         }
         checkEndMarkNow = 1;
       }
@@ -1072,7 +1072,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
             for (i = 0; i < (unsigned)dummyProcessed; i++)
               p->tempBuf[i] = src[i];
             // p->remainLen = kMatchSpecLen_Error_Data;
-            RETURN_NOT_FINISHED_FOR_FINISH
+            RETURN__NOT_FINISHED__FOR_FINISH;
           }
           
           bufLimit = src;
@@ -1150,7 +1150,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
             (*srcLen) += (unsigned)dummyProcessed - p->tempBufSize;
             p->tempBufSize = (unsigned)dummyProcessed;
             // p->remainLen = kMatchSpecLen_Error_Data;
-            RETURN_NOT_FINISHED_FOR_FINISH
+            RETURN__NOT_FINISHED__FOR_FINISH;
           }
         }
 
@@ -1299,8 +1299,8 @@ static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAl
 SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAllocPtr alloc)
 {
   CLzmaProps propNew;
-  RINOK(LzmaProps_Decode(&propNew, props, propsSize))
+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc))
+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
   p->prop = propNew;
   return SZ_OK;
 }
@@ -1309,14 +1309,14 @@ SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAll
 {
   CLzmaProps propNew;
   SizeT dicBufSize;
-  RINOK(LzmaProps_Decode(&propNew, props, propsSize))
+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc))
+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
 
   {
     UInt32 dictSize = propNew.dicSize;
     SizeT mask = ((UInt32)1 << 12) - 1;
          if (dictSize >= ((UInt32)1 << 30)) mask = ((UInt32)1 << 22) - 1;
-    else if (dictSize >= ((UInt32)1 << 22)) mask = ((UInt32)1 << 20) - 1;
+    else if (dictSize >= ((UInt32)1 << 22)) mask = ((UInt32)1 << 20) - 1;;
     dicBufSize = ((SizeT)dictSize + mask) & ~mask;
     if (dicBufSize < dictSize)
       dicBufSize = dictSize;
@@ -1348,8 +1348,8 @@ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
   *status = LZMA_STATUS_NOT_SPECIFIED;
   if (inSize < RC_INIT_SIZE)
     return SZ_ERROR_INPUT_EOF;
-  LzmaDec_CONSTRUCT(&p)
+  LzmaDec_Construct(&p);
-  RINOK(LzmaDec_AllocateProbs(&p, propData, propSize, alloc))
+  RINOK(LzmaDec_AllocateProbs(&p, propData, propSize, alloc));
   p.dic = dest;
   p.dicBufSize = outSize;
   LzmaDec_Init(&p);

common/LZMA/SDK/C/LzmaDec.h

@@ -1,19 +1,19 @@
 /* LzmaDec.h -- LZMA Decoder
-2023-04-02 : Igor Pavlov : Public domain */
+2020-03-19 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_LZMA_DEC_H
+#ifndef __LZMA_DEC_H
-#define ZIP7_INC_LZMA_DEC_H
+#define __LZMA_DEC_H
 
 #include "7zTypes.h"
 
 EXTERN_C_BEGIN
 
-/* #define Z7_LZMA_PROB32 */
+/* #define _LZMA_PROB32 */
-/* Z7_LZMA_PROB32 can increase the speed on some CPUs,
+/* _LZMA_PROB32 can increase the speed on some CPUs,
    but memory usage for CLzmaDec::probs will be doubled in that case */
 
 typedef
-#ifdef Z7_LZMA_PROB32
+#ifdef _LZMA_PROB32
   UInt32
 #else
   UInt16
@@ -25,7 +25,7 @@ typedef
 
 #define LZMA_PROPS_SIZE 5
 
-typedef struct
+typedef struct _CLzmaProps
 {
   Byte lc;
   Byte lp;
@@ -73,8 +73,7 @@ typedef struct
   Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
 } CLzmaDec;
 
-#define LzmaDec_CONSTRUCT(p) { (p)->dic = NULL; (p)->probs = NULL; }
+#define LzmaDec_Construct(p) { (p)->dic = NULL; (p)->probs = NULL; }
-#define LzmaDec_Construct(p) LzmaDec_CONSTRUCT(p)
 
 void LzmaDec_Init(CLzmaDec *p);
 

common/LZMA/SDK/C/LzmaEnc.h

@@ -1,8 +1,8 @@
 /*  LzmaEnc.h -- LZMA Encoder
-2023-04-13 : Igor Pavlov : Public domain */
+2019-10-30 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_LZMA_ENC_H
+#ifndef __LZMA_ENC_H
-#define ZIP7_INC_LZMA_ENC_H
+#define __LZMA_ENC_H
 
 #include "7zTypes.h"
 
@@ -10,7 +10,7 @@ EXTERN_C_BEGIN
 
 #define LZMA_PROPS_SIZE 5
 
-typedef struct
+typedef struct _CLzmaEncProps
 {
   int level;       /* 0 <= level <= 9 */
   UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
@@ -23,13 +23,10 @@ typedef struct
   int fb;          /* 5 <= fb <= 273, default = 32 */
   int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
   int numHashBytes; /* 2, 3 or 4, default = 4 */
-  unsigned numHashOutBits;  /* default = ? */
   UInt32 mc;       /* 1 <= mc <= (1 << 30), default = 32 */
   unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
   int numThreads;  /* 1 or 2, default = 2 */
 
-  // int _pad;
-
   UInt64 reduceSize; /* estimated size of data that will be compressed. default = (UInt64)(Int64)-1.
                         Encoder uses this value to reduce dictionary size */
 
@@ -54,9 +51,7 @@ SRes:
   SZ_ERROR_THREAD - error in multithreading functions (only for Mt version)
 */
 
-typedef struct CLzmaEnc CLzmaEnc;
+typedef void * CLzmaEncHandle;
-typedef CLzmaEnc * CLzmaEncHandle;
-// Z7_DECLARE_HANDLE(CLzmaEncHandle)
 
 CLzmaEncHandle LzmaEnc_Create(ISzAllocPtr alloc);
 void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAllocPtr alloc, ISzAllocPtr allocBig);
@@ -66,17 +61,17 @@ void LzmaEnc_SetDataSize(CLzmaEncHandle p, UInt64 expectedDataSiize);
 SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
 unsigned LzmaEnc_IsWriteEndMark(CLzmaEncHandle p);
 
-SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream,
+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
-    ICompressProgressPtr progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
+    ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
 SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-    int writeEndMark, ICompressProgressPtr progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
+    int writeEndMark, ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
 
 
 /* ---------- One Call Interface ---------- */
 
 SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
     const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-    ICompressProgressPtr progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
+    ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
 
 EXTERN_C_END
 

common/LZMA/SDK/C/Precomp.h

@@ -1,130 +1,12 @@
-/* Precomp.h -- precompilation file
+/* Precomp.h -- StdAfx
-2024-01-25 : Igor Pavlov : Public domain */
+2013-11-12 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_PRECOMP_H
+#ifndef __7Z_PRECOMP_H
-#define ZIP7_INC_PRECOMP_H
+#define __7Z_PRECOMP_H
-
-/*
-  this file must be included before another *.h files and before <windows.h>.
-  this file is included from the following files:
-    C\*.c
-    C\Util\*\Precomp.h   <-  C\Util\*\*.c
-    CPP\Common\Common.h  <-  *\StdAfx.h    <-  *\*.cpp
-
-  this file can set the following macros:
-    Z7_LARGE_PAGES 1
-    Z7_LONG_PATH 1
-    Z7_WIN32_WINNT_MIN  0x0500 (or higher) : we require at least win2000+ for 7-Zip
-    _WIN32_WINNT        0x0500 (or higher)
-    WINVER  _WIN32_WINNT
-    UNICODE 1
-    _UNICODE 1
-*/
 
 #include "Compiler.h"
+/* #include "7zTypes.h" */
 
-// UEFITool: use single-threaded LzFind
+#define _7ZIP_ST
-#define Z7_ST
-
-#ifdef _MSC_VER
-// #pragma warning(disable : 4206) // nonstandard extension used : translation unit is empty
-#if _MSC_VER >= 1912
-// #pragma warning(disable : 5039) // pointer or reference to potentially throwing function passed to 'extern "C"' function under - EHc.Undefined behavior may occur if this function throws an exception.
-#endif
-#endif
-
-/*
-// for debug:
-#define UNICODE 1
-#define _UNICODE 1
-#define  _WIN32_WINNT  0x0500  // win2000
-#ifndef WINVER
-  #define WINVER  _WIN32_WINNT
-#endif
-*/
-
-#ifdef _WIN32
-/*
-  this "Precomp.h" file must be included before <windows.h>,
-  if we want to define _WIN32_WINNT before <windows.h>.
-*/
-
-#ifndef Z7_LARGE_PAGES
-#ifndef Z7_NO_LARGE_PAGES
-#define Z7_LARGE_PAGES 1
-#endif
-#endif
-
-#ifndef Z7_LONG_PATH
-#ifndef Z7_NO_LONG_PATH
-#define Z7_LONG_PATH 1
-#endif
-#endif
-
-#ifndef Z7_DEVICE_FILE
-#ifndef Z7_NO_DEVICE_FILE
-// #define Z7_DEVICE_FILE 1
-#endif
-#endif
-
-// we don't change macros if included after <windows.h>
-#ifndef _WINDOWS_
-
-#ifndef Z7_WIN32_WINNT_MIN
-  #if defined(_M_ARM64) || defined(__aarch64__)
-    // #define Z7_WIN32_WINNT_MIN  0x0a00  // win10
-    #define Z7_WIN32_WINNT_MIN  0x0600  // vista
-  #elif defined(_M_ARM) && defined(_M_ARMT) && defined(_M_ARM_NT)
-    // #define Z7_WIN32_WINNT_MIN  0x0602  // win8
-    #define Z7_WIN32_WINNT_MIN  0x0600  // vista
-  #elif defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(_M_IA64)
-    #define Z7_WIN32_WINNT_MIN  0x0503  // win2003
-  // #elif defined(_M_IX86) || defined(__i386__)
-  //   #define Z7_WIN32_WINNT_MIN  0x0500  // win2000
-  #else // x86 and another(old) systems
-    #define Z7_WIN32_WINNT_MIN  0x0500  // win2000
-    // #define Z7_WIN32_WINNT_MIN  0x0502  // win2003 // for debug
-  #endif
-#endif // Z7_WIN32_WINNT_MIN
-
-
-#ifndef Z7_DO_NOT_DEFINE_WIN32_WINNT
-#ifdef _WIN32_WINNT
-  // #error Stop_Compiling_Bad_WIN32_WINNT
-#else
-  #ifndef Z7_NO_DEFINE_WIN32_WINNT
-Z7_DIAGNOSTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER
-    #define _WIN32_WINNT  Z7_WIN32_WINNT_MIN
-Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_IDENTIFIER
-  #endif
-#endif // _WIN32_WINNT
-
-#ifndef WINVER
-  #define WINVER  _WIN32_WINNT
-#endif
-#endif // Z7_DO_NOT_DEFINE_WIN32_WINNT
-
-
-#ifndef _MBCS
-#ifndef Z7_NO_UNICODE
-// UNICODE and _UNICODE are used by <windows.h> and by 7-zip code.
-
-#ifndef UNICODE
-#define UNICODE 1
-#endif
-
-#ifndef _UNICODE
-Z7_DIAGNOSTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER
-#define _UNICODE 1
-Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_IDENTIFIER
-#endif
-
-#endif // Z7_NO_UNICODE
-#endif // _MBCS
-#endif // _WINDOWS_
-
-// #include "7zWindows.h"
-
-#endif // _WIN32
 
 #endif

common/LZMA/SDK/C/RotateDefs.h

@@ -1,50 +0,0 @@
-/* RotateDefs.h -- Rotate functions
-2023-06-18 : Igor Pavlov : Public domain */
-
-#ifndef ZIP7_INC_ROTATE_DEFS_H
-#define ZIP7_INC_ROTATE_DEFS_H
-
-#ifdef _MSC_VER
-
-#include <stdlib.h>
-
-/* don't use _rotl with old MINGW. It can insert slow call to function. */
- 
-/* #if (_MSC_VER >= 1200) */
-#pragma intrinsic(_rotl)
-#pragma intrinsic(_rotr)
-/* #endif */
-
-#define rotlFixed(x, n) _rotl((x), (n))
-#define rotrFixed(x, n) _rotr((x), (n))
-
-#if (_MSC_VER >= 1300)
-#define Z7_ROTL64(x, n) _rotl64((x), (n))
-#define Z7_ROTR64(x, n) _rotr64((x), (n))
-#else
-#define Z7_ROTL64(x, n) (((x) << (n)) | ((x) >> (64 - (n))))
-#define Z7_ROTR64(x, n) (((x) >> (n)) | ((x) << (64 - (n))))
-#endif
-
-#else
-
-/* new compilers can translate these macros to fast commands. */
-
-#if defined(__clang__) && (__clang_major__ >= 4) \
-  || defined(__GNUC__) && (__GNUC__ >= 5)
-/* GCC 4.9.0 and clang 3.5 can recognize more correct version: */
-#define rotlFixed(x, n) (((x) << (n)) | ((x) >> (-(n) & 31)))
-#define rotrFixed(x, n) (((x) >> (n)) | ((x) << (-(n) & 31)))
-#define Z7_ROTL64(x, n) (((x) << (n)) | ((x) >> (-(n) & 63)))
-#define Z7_ROTR64(x, n) (((x) >> (n)) | ((x) << (-(n) & 63)))
-#else
-/* for old GCC / clang: */
-#define rotlFixed(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-#define rotrFixed(x, n) (((x) >> (n)) | ((x) << (32 - (n))))
-#define Z7_ROTL64(x, n) (((x) << (n)) | ((x) >> (64 - (n))))
-#define Z7_ROTR64(x, n) (((x) >> (n)) | ((x) << (64 - (n))))
-#endif
-
-#endif
-
-#endif

common/LZMA/UefiLzma.h

@@ -0,0 +1,31 @@
+/* LZMA UEFI header file
+
+  Copyright (c) 2009, Intel Corporation. All rights reserved.
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+*/
+
+#ifndef __UEFILZMA_H__
+#define __UEFILZMA_H__
+
+#include "../basetypes.h"
+
+#ifdef _WIN32
+#undef _WIN32
+#endif
+
+#ifdef _WIN64
+#undef _WIN64
+#endif
+
+#define _LZMA_SIZE_OPT
+#define _7ZIP_ST
+
+#endif // __UEFILZMA_H__
+

common/Tiano/EfiTianoCompress.c

@@ -1559,7 +1559,7 @@ Returns: (VOID)
   INT32    i;
   UINT16   Start[18];
 
-  memset(Start, 0, sizeof(Start));
+  Start[1] = 0;
   for (i = 1; i <= 16; i++) {
     Start[i + 1] = (UINT16)((Start[i] + mLenCnt[i]) << 1);
   }

common/basetypes.h

@@ -18,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <stdint.h>
 #include <stddef.h>
 
-// TODO: improve
 typedef size_t USTATUS;
 #define U_SUCCESS                         0
 #define U_INVALID_PARAMETER               1
@@ -76,30 +75,28 @@ typedef size_t USTATUS;
 #define U_UNKNOWN_PATCH_TYPE              53
 #define U_PATCH_OFFSET_OUT_OF_BOUNDS      54
 #define U_INVALID_SYMBOL                  55
-#define U_ZLIB_DECOMPRESSION_FAILED       56
-#define U_INVALID_STORE                   57
 
 #define U_INVALID_MANIFEST                251
 #define U_UNKNOWN_MANIFEST_HEADER_VERSION 252
 #define U_INVALID_ME_PARTITION_TABLE      253
 #define U_INVALID_ME_PARTITION            254
 
-#define U_NOT_IMPLEMENTED                 255
+#define U_NOT_IMPLEMENTED                 0xFF
 
 // EDK2 porting definitions
-typedef uint8_t   BOOLEAN;
+typedef uint8_t      BOOLEAN;
-typedef int8_t    INT8;
+typedef int8_t       INT8;
-typedef uint8_t   UINT8;
+typedef uint8_t      UINT8;
-typedef int16_t   INT16;
+typedef int16_t      INT16;
-typedef uint16_t  UINT16;
+typedef uint16_t     UINT16;
-typedef int32_t   INT32;
+typedef int32_t      INT32;
-typedef uint32_t  UINT32;
+typedef uint32_t     UINT32;
-typedef int64_t   INT64;
+typedef int64_t      INT64;
-typedef uint64_t  UINT64;
+typedef uint64_t     UINT64;
-typedef char      CHAR8;
+typedef char         CHAR8;
-typedef uint16_t  CHAR16;
+typedef uint16_t     CHAR16;
-typedef size_t    UINTN;
+typedef size_t       UINTN;
-typedef ptrdiff_t INTN;
+typedef ptrdiff_t    INTN;
 
 #define CONST  const
 #define VOID   void
@@ -137,7 +134,7 @@ typedef ptrdiff_t INTN;
 #define COMPRESSION_ALGORITHM_LZMA_INTEL_LEGACY      6
 #define COMPRESSION_ALGORITHM_LZMAF86                7
 #define COMPRESSION_ALGORITHM_GZIP                   8
-#define COMPRESSION_ALGORITHM_ZLIB                   9
+
 
 // Item create modes
 #define CREATE_MODE_APPEND    0
@@ -226,4 +223,10 @@ typedef struct EFI_TIME_ {
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
+#if defined(__clang__) || defined(__GNUC__)
+#define ATTRIBUTE_FORMAT_(t,f,a) __attribute__((format(t, f, a)))
+#else
+#define ATTRIBUTE_FORMAT_(t,f,a)
+#endif
+
 #endif // BASETYPES_H

common/bstrlib/bstrlib.h

@@ -22,6 +22,7 @@ extern "C" {
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include "../basetypes.h"
 
 #if !defined (BSTRLIB_VSNP_OK) && !defined (BSTRLIB_NOVSNP)
 # if defined (__TURBOC__) && !defined (__BORLANDC__)
@@ -29,12 +30,6 @@ extern "C" {
 # endif
 #endif
 
-#if defined(__clang__) || defined(__GNUC__)
-#define ATTRIBUTE_FORMAT_(t,f,a) __attribute__((format(t, f, a)))
-#else
-#define ATTRIBUTE_FORMAT_(t,f,a)
-#endif
-
 #define BSTR_ERR (-1)
 #define BSTR_OK (0)
 #define BSTR_BS_BUFF_LENGTH_GET (0)

common/bstrlib/bstrwrap.h

@@ -52,6 +52,7 @@
 #include <stdlib.h>
 #include "bstrlib.h"
 #include "../ubytearray.h"
+#include "../basetypes.h"
 
 #ifdef __cplusplus
 
@@ -372,6 +373,16 @@ struct CBString : public tagbstring {
 	CBString mid(int pos, int len) const { return midstr(pos, len); }
 	CBString chopped(int len) const { return midstr(slen - len, len); }
 	void chop(int len) { trunc(((slen > len) ? slen - len : 0)); }
+	static CBString fromUtf16(const unsigned short* str) {
+		// Naive implementation assuming that only ASCII LE part of UCS2 is used, str may not be aligned.
+		CBString msg;
+		const char *str8 = reinterpret_cast<const char *>(str);
+		while (str8[0]) {
+			msg += str8[0];
+			str8 += 2;
+		}
+		return msg;
+	}
 	CBString leftJustified(int length) { if (length > slen) { return *this + CBString(' ', length - slen); } return *this; }
 };
 extern const CBString operator + (const char *a, const CBString& b);

common/descriptor.cpp

@@ -1,11 +1,11 @@
 /* descriptor.cpp
-
+ 
  Copyright (c) 2015, Nikolaj Schlej. All rights reserved.
  This program and the accompanying materials
  are licensed and made available under the terms and conditions of the BSD License
  which accompanies this distribution.  The full text of the license may be found at
  http://opensource.org/licenses/bsd-license.php
-
+ 
  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
  WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
  */
@@ -72,7 +72,7 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0xEF6019: return UString("Winbond W25Q256");
         case 0xEF7118: return UString("Winbond W25M256");
         case 0xEF7119: return UString("Winbond W25M512");
-
+            
         // Macronix
         case 0xC22013: return UString("Macronix MX25L40");
         case 0xC22014: return UString("Macronix MX25L80");
@@ -94,9 +94,8 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0xC22617: return UString("Macronix MX25L64");
         case 0xC22618: return UString("Macronix MX25L128");
         case 0xC25E16: return UString("Macronix MX25L32");
-        case 0xC27518: return UString("Macronix MX77L12850F");
         case 0xC29517: return UString("Macronix MX25L64");
-
+            
         // Micron
         case 0x202014: return UString("Micron M25P80");
         case 0x202015: return UString("Micron M25P16");
@@ -111,7 +110,6 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0x204017: return UString("Micron XM25QH64C");
         case 0x204018: return UString("Micron XM25QH128C");
         case 0x204019: return UString("Micron XM25QH256C");
-        case 0x204318: return UString("Micron XM25RH128C");
         case 0x207114: return UString("Micron M25PX80");
         case 0x207115: return UString("Micron M25PX16");
         case 0x207116: return UString("Micron M25PX32");
@@ -134,7 +132,7 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0x20BB18: return UString("Micron MT25Q128");
         case 0x20BB19: return UString("Micron MT25Q256");
         case 0x20BB20: return UString("Micron MT25Q512");
-
+            
         // Intel
         case 0x898911: return UString("Intel 25F160S33B8");
         case 0x898912: return UString("Intel 25F320S33B8");
@@ -142,7 +140,7 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0x898915: return UString("Intel 25F160S33T8");
         case 0x898916: return UString("Intel 25F320S33T8");
         case 0x898917: return UString("Intel 25F640S33T8");
-
+            
         // Atmel / Adesto
         case 0x1F3217: return UString("Atmel AT25SF641");
         case 0x1F4216: return UString("Atmel AT25SL321");
@@ -160,14 +158,14 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0x1F7018: return UString("Atmel AT25QF128");
         case 0x1F8600: return UString("Atmel AT25DQ161");
         case 0x1F8800: return UString("Atmel AT25DQ641");
-
+            
         // Microchip
         case 0xBF2541: return UString("Microchip SST25VF016B");
         case 0xBF254A: return UString("Microchip SST25VF032B");
         case 0xBF258D: return UString("Microchip SST25VF040B");
         case 0xBF258E: return UString("Microchip SST25VF080B");
         case 0xBF254B: return UString("Microchip SST25VF064C");
-
+            
         // EON / ESMT
         case 0x1C3013: return UString("EON EN25Q40");
         case 0x1C3014: return UString("EON EN25Q80");
@@ -192,7 +190,7 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0x1C7017: return UString("EON EN25QH64");
         case 0x1C7018: return UString("EON EN25QH128");
         case 0x1C7019: return UString("EON EN25QH256");
-
+            
         // GigaDevice
         case 0xC84014: return UString("GigaDevice GD25x80");
         case 0xC84015: return UString("GigaDevice GD25x16");
@@ -204,25 +202,24 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0xC86017: return UString("GigaDevice GD25Lx64");
         case 0xC86018: return UString("GigaDevice GD25Lx128");
         case 0xC86019: return UString("GigaDevice GD25LQ256C");
-
+            
         // Fidelix
         case 0xF83215: return UString("Fidelix FM25Q16");
         case 0xF83216: return UString("Fidelix FM25Q32");
         case 0xF83217: return UString("Fidelix FM25Q64");
         case 0xF83218: return UString("Fidelix FM25Q128");
-
+            
         // Spansion
         case 0x014015: return UString("Spansion S25FL116K");
         case 0x014016: return UString("Spansion S25FL132K");
         case 0x014017: return UString("Spansion S25FL164K");
-
+            
         // AMIC Technology
         case 0x373015: return UString("AMIC A25L016");
         case 0x373016: return UString("AMIC A25L032");
         case 0x374015: return UString("AMIC A25LQ16");
         case 0x374016: return UString("AMIC A25LQ32A");
-        case 0x374017: return UString("AMIC A25LQ64");
+            
-
         // PMC
         case 0x9DF713: return UString("PMC Pm25LV080B");
         case 0x9DF714: return UString("PMC Pm25LV016B");
@@ -233,7 +230,7 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0x9DF77C: return UString("PMC Pm25LV010A");
         case 0x9DF77D: return UString("PMC Pm25LV020");
         case 0x9DF77E: return UString("PMC Pm25LV040");
-
+            
         // ISSI
         case 0x9D6014: return UString("ISSI Ix25LP080");
         case 0x9D6015: return UString("ISSI Ix25LP016");
@@ -248,6 +245,6 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
         case 0x9D7018: return UString("ISSI Ix25WP128");
         case 0x9D7019: return UString("ISSI Ix25WP256");
     }
-
+    
     return usprintf("Unknown %08Xh", jedecId);
 }

common/descriptor.h

@@ -72,18 +72,43 @@ typedef struct FLASH_DESCRIPTOR_MAP_ {
     UINT32 DescriptorVersion;           // Reserved prior to Coffee Lake
 } FLASH_DESCRIPTOR_MAP;
 
-// Component section structure
+// Component section
 // Flash parameters DWORD structure
 typedef struct FLASH_PARAMETERS_ {
-    UINT16 : 16;
+    UINT8 FirstChipDensity : 4;
+    UINT8 SecondChipDensity : 4;
+    UINT8 : 8;
     UINT8 : 1;
     UINT8 ReadClockFrequency : 3; // Hardcoded value of 20 Mhz (000b) in v1 descriptors
-    UINT8 : 4;
+    UINT8 FastReadEnabled : 1;
-    UINT8 : 8;
+    UINT8 FastReadFrequency : 3;
+    UINT8 FlashWriteFrequency : 3;
+    UINT8 FlashReadStatusFrequency : 3;
+    UINT8 DualOutputFastReadSupported : 1;
+    UINT8 : 1;
 } FLASH_PARAMETERS;
 
+// Flash densities
+#define FLASH_DENSITY_512KB   0x00
+#define FLASH_DENSITY_1MB     0x01
+#define FLASH_DENSITY_2MB     0x02
+#define FLASH_DENSITY_4MB     0x03
+#define FLASH_DENSITY_8MB     0x04
+#define FLASH_DENSITY_16MB    0x05
+#define FLASH_DENSITY_32MB    0x06
+#define FLASH_DENSITY_64MB    0x07
+#define FLASH_DENSITY_UNUSED  0x0F
+
+// Flash frequencies
+#define FLASH_FREQUENCY_20MHZ       0x00
+#define FLASH_FREQUENCY_33MHZ       0x01
+#define FLASH_FREQUENCY_48MHZ       0x02
+#define FLASH_FREQUENCY_50MHZ_30MHZ 0x04
+#define FLASH_FREQUENCY_17MHZ       0x06
+
+// Component section structure
 typedef struct FLASH_DESCRIPTOR_COMPONENT_SECTION_ {
-    FLASH_PARAMETERS FlashParameters;      // Bit field with SPI flash parameters, changes almost every CPU generation, so will remain mostly undefined for now
+    FLASH_PARAMETERS FlashParameters;
     UINT8            InvalidInstruction0;  // Instructions for SPI chip, that must not be executed, like FLASH ERASE
     UINT8            InvalidInstruction1;  //
     UINT8            InvalidInstruction2;  //

common/ffs.cpp

@@ -72,7 +72,7 @@ extern const UByteArray EFI_DXE_APRIORI_FILE_GUID // FC510EE7-FFDC-11D4-BD41-008
 // Volume top file
 extern const UByteArray EFI_FFS_VOLUME_TOP_FILE_GUID // 1BA0062E-C779-4582-8566-336AE8F78F09
 ("\x2E\x06\xA0\x1B\x79\xC7\x82\x45\x85\x66\x33\x6A\xE8\xF7\x8F\x09", 16);
-// Padding file GUID
+// Pad file GUID
 extern const UByteArray EFI_FFS_PAD_FILE_GUID // E4536585-7909-4A60-B5C6-ECDEA6EBFB5
 ("\x85\x65\x53\xE4\x09\x79\x60\x4A\xB5\xC6\xEC\xDE\xA6\xEB\xFB\x54", 16);
 // AMI DXE core file
@@ -81,52 +81,6 @@ extern const UByteArray AMI_CORE_DXE_GUID // 5AE3F37E-4EAE-41AE-8240-35465B5E81E
 // EDK2 DXE core file
 extern const UByteArray EFI_DXE_CORE_GUID // D6A2CB7F-6A18-4E2F-B43B-9920A733700A
 ("\x7F\xCB\xA2\xD6\x18\x6A\x2F\x4E\xB4\x3B\x99\x20\xA7\x33\x70\x0A", 16);
-// AMD compressed raw file
-extern const UByteArray AMD_COMPRESSED_RAW_FILE_GUID //20BC8AC9-94D1-4208-AB28-5D673FD73487
-("\xC9\x8A\xBC\x20\xD1\x94\x08\x42\xAB\x28\x5D\x67\x3F\xD7\x34\x87", 16);
-
-// Insyde Flash Device Map GUIDs
-extern const UByteArray INSYDE_FLASH_MAP_REGION_BOOT_FV_GUID
-("\x56\x6d\xd7\xe3\x8a\x98\x6b\x4d\x89\x13\x64\xf2\xdf\x1d\xf6\xa6", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_BVDT_GUID
-("\xFC\x5D\x41\x32\x06\xD1\xC7\x48\x9E\xB5\x80\x6C\x11\x4D\xD1\x07", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_EC_GUID
-("\xBF\xF3\x3E\xA7\xCC\x33\xA9\x43\xB3\x9C\xA9\x12\xC7\x48\x9A\x57", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_FTW_BACKUP_GUID
-("\xD3\x15\x8E\xB7\xA5\xF0\x48\x42\x8E\x2F\xD3\x15\x7A\xEF\x88\x36", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_FTW_STATE_GUID
-("\x04\x6E\x41\xC8\x34\x99\x79\x40\xBE\x9A\x39\xF8\xD6\x02\x84\x98", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_FV_GUID
-("\x58\xE7\xE8\xB5\xE6\xA7\x8B\x4C\xAB\x85\xFF\x2A\x95\x9B\x99\xBA", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_FLASH_DEVICE_MAP_GUID
-("\xA0\xC1\x78\xF0\x52\xFC\x3F\x4C\xBE\x1F\xD6\x88\x81\x5A\x62\xC0", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_LOGO_GUID
-("\x69\xAB\xCF\xDA\x77\xF9\x84\x47\x8A\xD8\x77\x24\xA6\xF4\xB4\x40", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_MICROCODE_GUID
-("\xF8\x66\x98\xB4\xD2\x8C\xE4\x49\xA1\x6D\xB6\x0F\xBE\xC3\x1C\x4B", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_MSDM_TABLE_GUID
-("\x1A\xEB\x44\xB3\x7E\xF9\x14\x4F\xA1\xE1\x7E\x63\xBC\x40\xC8\xCE", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_MULTI_CONFIG_GUID
-("\x92\xB5\x94\x59\x14\x2F\xD5\x48\xBB\x40\xBD\x27\x96\x9C\x77\x80", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_VAR_DEFAULT_GUID
-("\xA2\xAC\xDD\xD9\x16\x08\xF3\x48\xAD\xED\x6B\x71\x65\x6B\x24\x8A", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_SMBIOS_UPDATE_GUID
-("\xDC\xFE\x64\x89\xE7\x6F\x1E\x4E\xA5\x5E\xFF\x82\x1D\x71\xFF\xCF", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_VAR_GUID
-("\x74\x53\x3C\x77\xD1\x81\x43\x4D\xB2\x93\xF3\xD7\x4F\x18\x1D\x6B", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_UNKNOWN_GUID
-("\xE5\x65\x1D\x20\x23\xBE\x75\x48\x80\xF8\xB1\xD4\x79\x5E\x7E\x08", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_UNUSED_GUID
-("\x20\xB0\xC8\x13\x27\x4F\x3B\x45\x8F\x80\x1B\xFC\xA1\x87\x38\x0F", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_USB_OPTION_ROM_GUID
-("\x0F\xF3\x7B\x60\x2B\x5F\xA2\x4D\xAE\xED\x56\xF9\xBD\xCD\x2D\x21", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_DXE_FV_GUID
-("\xCE\xBA\xD0\x1F\x0A\x6F\x85\x40\x90\x1E\xF6\x21\x03\x85\xCB\x6F", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_PEI_FV_GUID
-("\xC5\x06\x14\xCF\xEC\x3F\xEB\x47\xA6\xC3\xB7\x1A\x3E\xE0\x0B\x95", 16);
-extern const UByteArray INSYDE_FLASH_MAP_REGION_UNSIGNED_FV_GUID
-("\xB6\x16\xA0\xF2\x14\xE8\x2E\x40\xA3\x95\x46\xD3\xCF\x75\x26\x4A", 16);
-
 // GUIDs of GUID-defined sections
 extern const UByteArray EFI_GUIDED_SECTION_CRC32 // FC1BCDB0-7D31-49AA-936A-A4600D9DD083
 ("\xB0\xCD\x1B\xFC\x31\x7D\xAA\x49\x93\x6A\xA4\x60\x0D\x9D\xD0\x83", 16);
@@ -136,16 +90,10 @@ extern const UByteArray EFI_GUIDED_SECTION_LZMA // EE4E5898-3914-4259-9D6E-DC7BD
 ("\x98\x58\x4E\xEE\x14\x39\x59\x42\x9D\x6E\xDC\x7B\xD7\x94\x03\xCF", 16);
 extern const UByteArray EFI_GUIDED_SECTION_LZMA_HP // 0ED85E23-F253-413F-A03C-901987B04397
 ("\x23\x5E\xD8\x0E\x53\xF2\x3F\x41\xA0\x3C\x90\x19\x87\xB0\x43\x97", 16);
-extern const UByteArray EFI_GUIDED_SECTION_LZMA_MS // BD9921EA-ED91-404A-8B2F-B4D724747C8C
-("\xEA\x21\x99\xBD\x91\xED\x4A\x40\x8B\x2F\xB4\xD7\x24\x74\x7C\x8C", 16);
 extern const UByteArray EFI_GUIDED_SECTION_LZMAF86 // D42AE6BD-1352-4BFB-909A-CA72A6EAE889
 ("\xBD\xE6\x2A\xD4\x52\x13\xFB\x4B\x90\x9A\xCA\x72\xA6\xEA\xE8\x89", 16);
 extern const UByteArray EFI_GUIDED_SECTION_GZIP // 1D301FE9-BE79-4353-91C2-D23BC959AE0C
 ("\xE9\x1F\x30\x1D\x79\xBE\x53\x43\x91\xC2\xD2\x3B\xC9\x59\xAE\x0C", 16);
-extern const UByteArray EFI_GUIDED_SECTION_ZLIB_AMD // CE3233F5-2CD6-4D87-9152-4A238BB6D1C4
-("\xF5\x33\x32\xCE\xD6\x2C\x87\x4D\x91\x52\x4A\x23\x8B\xB6\xD1\xC4", 16);
-extern const UByteArray EFI_GUIDED_SECTION_ZLIB_AMD2 // 991EFAC0-E260-416B-A4B8-3B153072B804
-("\xC0\xFA\x1E\x99\x60\xE2\x6B\x41\xA4\xB8\x3B\x15\x30\x72\xB8\x04", 16);
 extern const UByteArray EFI_FIRMWARE_CONTENTS_SIGNED_GUID // 0F9D89E8-9259-4F76-A5AF-0C89E34023DF
 ("\xE8\x89\x9D\x0F\x59\x92\x76\x4F\xA5\xAF\x0C\x89\xE3\x40\x23\xDF", 16);
 extern const UByteArray EFI_CERT_TYPE_RSA2048_SHA256_GUID // A7717414-C616-4977-9420-844712A735BF
@@ -159,40 +107,6 @@ extern const UByteArray PROTECTED_RANGE_VENDOR_HASH_FILE_GUID_PHOENIX // 389CC6F
 extern const UByteArray PROTECTED_RANGE_VENDOR_HASH_FILE_GUID_AMI // CBC91F44-A4BC-4A5B-8696-703451D0B053
 ("\x44\x1F\xC9\xCB\xBC\xA4\x5B\x4A\x86\x96\x70\x34\x51\xD0\xB0\x53", 16);
 
-// AMI ROM Hole files
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_0 //05CA01FC-0FC1-11DC-9011-00173153EBA8
-("\xFC\x01\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_1 //05CA01FD-0FC1-11DC-9011-00173153EBA8
-("\xFD\x01\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_2 //05CA01FE-0FC1-11DC-9011-00173153EBA8
-("\xFE\x01\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_3 //05CA01FF-0FC1-11DC-9011-00173153EBA8
-("\xFF\x01\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_4 //05CA0200-0FC1-11DC-9011-00173153EBA8
-("\x00\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_5 //05CA0201-0FC1-11DC-9011-00173153EBA8
-("\x01\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_6 //05CA0202-0FC1-11DC-9011-00173153EBA8
-("\x02\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_7 //05CA0203-0FC1-11DC-9011-00173153EBA8
-("\x03\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_8 //05CA0204-0FC1-11DC-9011-00173153EBA8
-("\x04\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_9 //05CA0205-0FC1-11DC-9011-00173153EBA8
-("\x05\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_10 //05CA0206-0FC1-11DC-9011-00173153EBA8
-("\x06\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_11 //05CA0207-0FC1-11DC-9011-00173153EBA8
-("\x07\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_12 //05CA0208-0FC1-11DC-9011-00173153EBA8
-("\x08\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_13 //05CA0209-0FC1-11DC-9011-00173153EBA8
-("\x09\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_14 //05CA020A-0FC1-11DC-9011-00173153EBA8
-("\x0A\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-extern const UByteArray AMI_ROM_HOLE_FILE_GUID_15 //05CA020B-0FC1-11DC-9011-00173153EBA8
-("\x0B\x02\xCA\x05\xC1\x0F\xDC\x11\x90\x11\x00\x17\x31\x53\xEB\xA8", 16);
-
 const std::vector<UByteArray> FFSv2Volumes({
     EFI_FIRMWARE_FILE_SYSTEM_GUID,
     EFI_FIRMWARE_FILE_SYSTEM2_GUID,
@@ -211,9 +125,6 @@ const UINT8 ffsAlignmentTable[] =
 const UINT8 ffsAlignment2Table[] =
 { 17, 18, 19, 20, 21, 22, 23, 24 };
 
-extern const UByteArray RECOVERY_STARTUP_AP_DATA_X86_128K // jmp far F000:FFD0, EAD0FF00F0
-("\xEA\xD0\xFF\x00\xF0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x27\x2D", RECOVERY_STARTUP_AP_DATA_X86_SIZE);
-
 VOID uint32ToUint24(UINT32 size, UINT8* ffsSize)
 {
     ffsSize[2] = (UINT8)((size) >> 16U);
@@ -326,52 +237,36 @@ UString sectionTypeToUString(const UINT8 type)
 UString bpdtEntryTypeToUString(const UINT16 type)
 {
     switch (type) {
-        case BPDT_ENTRY_TYPE_SMIP:        return UString("OEM SMIP");
+        case BPDT_ENTRY_TYPE_OEM_SMIP:           return UString("OEM SMIP");
-        case BPDT_ENTRY_TYPE_RBEP:        return UString("ROM Boot Extensions");
+        case BPDT_ENTRY_TYPE_OEM_RBE:            return UString("CSE RBE");
-        case BPDT_ENTRY_TYPE_FTPR:        return UString("Bring Up");
+        case BPDT_ENTRY_TYPE_CSE_BUP:            return UString("CSE BUP");
-        case BPDT_ENTRY_TYPE_UCOD:        return UString("Microcode");
+        case BPDT_ENTRY_TYPE_UCODE:              return UString("uCode");
-        case BPDT_ENTRY_TYPE_IBBP:        return UString("IBB");
+        case BPDT_ENTRY_TYPE_IBB:                return UString("IBB");
-        case BPDT_ENTRY_TYPE_S_BPDT:      return UString("Secondary BPDT");
+        case BPDT_ENTRY_TYPE_SBPDT:              return UString("S-BPDT");
-        case BPDT_ENTRY_TYPE_OBBP:        return UString("OBB");
+        case BPDT_ENTRY_TYPE_OBB:                return UString("OBB");
-        case BPDT_ENTRY_TYPE_NFTP:        return UString("Main");
+        case BPDT_ENTRY_TYPE_CSE_MAIN:           return UString("CSE Main");
-        case BPDT_ENTRY_TYPE_ISHC:        return UString("ISH");
+        case BPDT_ENTRY_TYPE_ISH:                return UString("ISH");
-        case BPDT_ENTRY_TYPE_DLMP:        return UString("Debug Launch Module");
+        case BPDT_ENTRY_TYPE_CSE_IDLM:           return UString("CSE IDLM");
-        case BPDT_ENTRY_TYPE_UEBP:        return UString("IFP Bypass");
+        case BPDT_ENTRY_TYPE_IFP_OVERRIDE:       return UString("IFP Override");
-        case BPDT_ENTRY_TYPE_UTOK:        return UString("Debug Tokens");
+        case BPDT_ENTRY_TYPE_DEBUG_TOKENS:       return UString("Debug Tokens");
-        case BPDT_ENTRY_TYPE_UFS_PHY:     return UString("UFS PHY Config");
+        case BPDT_ENTRY_TYPE_USF_PHY_CONFIG:     return UString("USF Phy Config");
-        case BPDT_ENTRY_TYPE_UFS_GPP_LUN: return UString("UFS GPP LUN");
+        case BPDT_ENTRY_TYPE_USF_GPP_LUN_ID:     return UString("USF GPP LUN ID");
-        case BPDT_ENTRY_TYPE_PMCP:        return UString("PMC");
+        case BPDT_ENTRY_TYPE_PMC:                return UString("PMC");
-        case BPDT_ENTRY_TYPE_IUNP:        return UString("iUnit");
+        case BPDT_ENTRY_TYPE_IUNIT:              return UString("iUnit");
-        case BPDT_ENTRY_TYPE_NVMC:        return UString("NVM Config");
+        case BPDT_ENTRY_TYPE_NVM_CONFIG:         return UString("NVM Config");
-        case BPDT_ENTRY_TYPE_UEP:         return UString("Unified Emulation");
+        case BPDT_ENTRY_TYPE_UEP:                return UString("UEP");
-        case BPDT_ENTRY_TYPE_WCOD:        return UString("WLAN Microcode");
+        case BPDT_ENTRY_TYPE_WLAN_UCODE:         return UString("WLAN uCode");
-        case BPDT_ENTRY_TYPE_LOCL:        return UString("LOCL Sprites");
+        case BPDT_ENTRY_TYPE_LOCL_SPRITES:       return UString("LOCL Sprites");
-        case BPDT_ENTRY_TYPE_OEMP:        return UString("OEM Key Manifest");
+        case BPDT_ENTRY_TYPE_OEM_KEY_MANIFEST:   return UString("OEM Key Manifest");
-        case BPDT_ENTRY_TYPE_FITC:        return UString("fitc.cfg");
+        case BPDT_ENTRY_TYPE_DEFAULTS:           return UString("Defaults");
-        case BPDT_ENTRY_TYPE_PAVP:        return UString("PAVP");
+        case BPDT_ENTRY_TYPE_PAVP:               return UString("PAVP");
-        case BPDT_ENTRY_TYPE_IOMP:        return UString("TCSS FW IOM");
+        case BPDT_ENTRY_TYPE_TCSS_FW_IOM:        return UString("TCSS FW IOM");
-        case BPDT_ENTRY_TYPE_XPHY:        return UString("TCSS FW PHY");
+        case BPDT_ENTRY_TYPE_TCSS_FW_PHY:        return UString("TCSS FW PHY");
-        case BPDT_ENTRY_TYPE_TBTP:        return UString("TCSS TBT");
+        case BPDT_ENTRY_TYPE_TBT:                return UString("TCSS TBT");
-        case BPDT_ENTRY_TYPE_PLTS:        return UString("Platform Settings");
+        case BPDT_ENTRY_TYPE_USB_PHY:            return UString("USB PHY");
-        case BPDT_ENTRY_TYPE_RES27:       return UString("Reserved 27");
+        case BPDT_ENTRY_TYPE_PCHC:               return UString("PCHC");
-        case BPDT_ENTRY_TYPE_RES28:       return UString("Reserved 28");
+        case BPDT_ENTRY_TYPE_SAMF:               return UString("SAMF");
-        case BPDT_ENTRY_TYPE_RES29:       return UString("Reserved 29");
+        case BPDT_ENTRY_TYPE_PPHY:               return UString("PPHY");
-        case BPDT_ENTRY_TYPE_RES30:       return UString("Reserved 30");
-        case BPDT_ENTRY_TYPE_DPHY:        return UString("Dekel PHY");
-        case BPDT_ENTRY_TYPE_PCHC:        return UString("PCH Config");
-        case BPDT_ENTRY_TYPE_ISIF:        return UString("ISI FW");
-        case BPDT_ENTRY_TYPE_ISIC:        return UString("ISI Config");
-        case BPDT_ENTRY_TYPE_HBMI:        return UString("HBM IO");
-        case BPDT_ENTRY_TYPE_OMSM:        return UString("OOB MSM");
-        case BPDT_ENTRY_TYPE_GTGP:        return UString("GT-GPU");
-        case BPDT_ENTRY_TYPE_MDFI:        return UString("MDF IO");
-        case BPDT_ENTRY_TYPE_PUNP:        return UString("PUnit");
-        case BPDT_ENTRY_TYPE_PHYP:        return UString("GSC PHY");
-        case BPDT_ENTRY_TYPE_SAMF:        return UString("SAM FW");
-        case BPDT_ENTRY_TYPE_PPHY:        return UString("PPHY");
-        case BPDT_ENTRY_TYPE_GBST:        return UString("GBST");
-        case BPDT_ENTRY_TYPE_TCCP:        return UString("TCC");
-        case BPDT_ENTRY_TYPE_PSEP:        return UString("PSE");
     }
     return usprintf("Unknown %04Xh", type);
 }