ARM32 support for Windows RT (#135)

.github/workflows/windows-arm.yml

@@ -0,0 +1,182 @@
+# This file is a part of the UMSKT Project
+#
+# Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# @FileCreated by TheTank20 on 07/08/2025
+# @Maintainer Neo
+
+name: C/C++ CI (Windows ARM)
+
+on:
+  push:
+    branches: [ "*" ]
+    paths-ignore: [ '**.md', 'doc/**', '.idea/**']
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+        fail-fast: false
+        matrix:
+            include:
+              - arch: arm
+                arch_compilename: amd64_arm
+                vcpkg_arch: arm-windows-static
+                cmake_arch: ARM
+                sdk_version: '10.0.19041.0'
+              - arch: arm64
+                arch_compilename: arm64
+                vcpkg_arch: arm64-windows-static
+                cmake_arch: ARM64
+                sdk_version: '10.0.22621.0'
+    steps:
+      - name: Setup MSVC for ${{ matrix.arch }}
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.arch_compilename }}
+          sdk: ${{ matrix.sdk_version }}
+
+      - name: Checkout Source Tree
+        uses: actions/checkout@v4
+
+      - name: Setup vcpkg
+        if: matrix.arch == 'arm64'
+        shell: pwsh
+        run: |
+          git clone https://github.com/Microsoft/vcpkg.git
+          cd vcpkg
+          .\bootstrap-vcpkg.bat
+          echo "VCPKG_ROOT=$env:GITHUB_WORKSPACE/vcpkg" | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo "VCPKG_DEFAULT_BINARY_CACHE=$env:GITHUB_WORKSPACE/vcpkg/bincache" | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo "VCPKG_BINARY_SOURCES=clear;default,readwrite" | Out-File -FilePath $env:GITHUB_ENV -Append
+
+      - name: Cache vcpkg packages
+        if: matrix.arch == 'arm64'
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ github.workspace }}/vcpkg/bincache
+            ${{ github.workspace }}/vcpkg/installed
+            ${{ github.workspace }}/vcpkg/packages
+          key: vcpkg-${{ matrix.arch }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('**/*.cmake') }}
+          restore-keys: |
+            vcpkg-${{ matrix.arch }}-${{ hashFiles('**/CMakeLists.txt') }}-
+            vcpkg-${{ matrix.arch }}-
+
+      - name: Cache OpenSSL Binaries
+        if: matrix.arch == 'arm'
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ github.workspace }}/openssl-install
+          key: openssl-${{ matrix.arch }}-${{ hashFiles('**/CMakeLists.txt') }}
+          restore-keys: |
+
+      - name: Install OpenSSL
+        shell: pwsh
+        run: |
+          if ("${{ matrix.arch }}" -eq "arm") {
+            # For ARM32, build OpenSSL from source
+            $opensslVersion = "1.1.1w"
+            $opensslDir = "openssl-src"
+            
+            # Download OpenSSL source
+            Invoke-WebRequest -Uri "https://www.openssl.org/source/openssl-$opensslVersion.tar.gz" -OutFile "openssl.tar.gz"
+            tar -xf openssl.tar.gz
+            Rename-Item -Path "openssl-$opensslVersion" -NewName $opensslDir
+            cd $opensslDir
+            
+            # Install Perl if needed
+            choco install strawberryperl -y
+            
+            # Configure and build OpenSSL for ARM32
+            $env:PATH = "C:\Strawberry\perl\bin;$env:PATH"
+            
+            # First set up Visual Studio environment
+            $vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath
+            $vcvarsall = Join-Path $vsPath "VC\Auxiliary\Build\vcvarsall.bat"
+            
+            # Configure OpenSSL
+            perl Configure VC-WIN32-ARM no-shared no-asm no-engine --prefix="$env:GITHUB_WORKSPACE/openssl-install"
+            
+            # Build using MSVC ARM32 tools
+            cmd /c "call `"$vcvarsall`" amd64_arm && nmake && nmake install_sw"
+            cd ..
+          } else {
+            # For ARM64, use vcpkg as before
+            New-Item -ItemType Directory -Force -Path $env:VCPKG_DEFAULT_BINARY_CACHE
+            & "$env:VCPKG_ROOT\vcpkg.exe" install openssl:${{ matrix.vcpkg_arch }} --clean-after-build
+            echo "OPENSSL_ROOT_DIR=$env:VCPKG_ROOT/installed/${{ matrix.vcpkg_arch }}" | Out-File -FilePath $env:GITHUB_ENV -Append
+          }
+      
+      - name: Save OpenSSL Binaries
+        if: matrix.arch == 'arm'
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ github.workspace }}/openssl-install
+          key: openssl-${{ matrix.arch }}-${{ hashFiles('**/CMakeLists.txt') }}
+
+      - name: Set OpenSSL Environment
+        if: matrix.arch == 'arm'
+        shell: pwsh
+        run: |
+          echo "OPENSSL_ROOT=$env:GITHUB_WORKSPACE/openssl-install" | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo "OPENSSL_LIBDIR=lib" | Out-File -FilePath $env:GITHUB_ENV -Append
+
+      - name: Configure UMSKT
+        shell: pwsh
+        run: |
+          cmake -G "Visual Studio 17 2022" `
+            -A ${{ matrix.cmake_arch }} `
+            -DWINDOWS_ARM=ON `
+            -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" `
+            -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_arch }} `
+            .
+
+      - name: Build UMSKT
+        shell: pwsh
+        run: |
+          cmake --build . --config Release
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4.6.2
+        with:
+          name: UMSKT-WinNT-${{ matrix.arch }}
+          path: Release/umskt.exe
+
+  test-arm64:
+    needs: build
+    if: success()
+    runs-on: windows-11-arm
+    strategy:
+      matrix:
+        arch: [arm64]
+    steps:
+      - name: Download ARM64 artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: UMSKT-WinNT-${{ matrix.arch }}
+          path: .
+
+      - name: Run tests
+        shell: pwsh
+        run: |
+          Write-Host Test 1 - generating key
+          .\umskt.exe -b 2C -c 365 -s 069420 -v
+          Write-Host Test 2 - generatng confid
+          .\umskt.exe -i 253286028742154311079061239762245184619981623171292574 

.github/workflows/windows-x86-x64.yml

@@ -15,10 +15,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# @FileCreated by TheTank20 on 06/13/2023
+# @FileCreated by TheTank20 on 07/08/2025
 # @Maintainer Neo
 
-name: C/C++ CI (Windows)
+name: C/C++ CI (Windows x86+64)
 
 on:
   push:
@@ -32,10 +32,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [x64, x86, arm64]
+        arch: [x64, x86]
     steps:
       - name: Setup TDM-GCC
-        if: matrix.arch != 'arm64'
         run: |
           Write-Host Downloading TDM-GCC v10.3.0...
           Invoke-WebRequest -Uri 'https://github.com/jmeubank/tdm-gcc/releases/download/v10.3.0-tdm64-2/tdm64-gcc-10.3.0-2.exe' -OutFile 'C:\Windows\temp\TDM-GCC-64.exe'
@@ -51,12 +50,6 @@ jobs:
           $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
           [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
 
-      - name: Setup MSVC for ARM64
-        if: matrix.arch == 'arm64'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: arm64
-
       - name: Checkout Source Tree
         uses: actions/checkout@v4
 
@@ -79,7 +72,7 @@ jobs:
           key: openssl-3.1.2-x64-${{ hashFiles('**/CMakeLists.txt') }}
 
       - name: Setup MSYS2
-        if: matrix.arch != 'arm64' && steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true'
+        if: steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true'
         uses: msys2/setup-msys2@v2
         with:
           msystem: ${{ matrix.arch == 'x86' && 'MINGW32' || 'MINGW64' }}
@@ -92,7 +85,7 @@ jobs:
             git
 
       - name: Checkout and Compile OpenSSL 3.1.2
-        if: matrix.arch != 'arm64' && steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true'
+        if: steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true'
         shell: msys2 {0}
         run: |
           # Clone UMSKT's OpenSSL fork
@@ -167,39 +160,7 @@ jobs:
           echo "OPENSSL_LIBDIR=lib" | Out-File -FilePath $env:GITHUB_ENV -Append
           echo "CMAKE_FLAGS=-m64" | Out-File -FilePath $env:GITHUB_ENV -Append
 
-      - name: Setup vcpkg for ARM64
-        if: matrix.arch == 'arm64'
-        shell: pwsh
-        run: |
-          git clone https://github.com/Microsoft/vcpkg.git
-          cd vcpkg
-          .\bootstrap-vcpkg.bat
-          echo "VCPKG_ROOT=$env:GITHUB_WORKSPACE/vcpkg" | Out-File -FilePath $env:GITHUB_ENV -Append
-          echo "VCPKG_DEFAULT_BINARY_CACHE=$env:GITHUB_WORKSPACE/vcpkg/bincache" | Out-File -FilePath $env:GITHUB_ENV -Append
-          echo "VCPKG_BINARY_SOURCES=clear;default,readwrite" | Out-File -FilePath $env:GITHUB_ENV -Append
-
-      - name: Cache vcpkg packages
-        if: matrix.arch == 'arm64'
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ github.workspace }}/vcpkg/bincache
-            ${{ github.workspace }}/vcpkg/installed
-            ${{ github.workspace }}/vcpkg/packages
-          key: vcpkg-arm64-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('**/*.cmake') }}
-          restore-keys: |
-            vcpkg-arm64-${{ hashFiles('**/CMakeLists.txt') }}-
-            vcpkg-arm64-
-
-      - name: Install OpenSSL for ARM64
-        if: matrix.arch == 'arm64'
-        shell: pwsh
-        run: |
-          New-Item -ItemType Directory -Force -Path $env:VCPKG_DEFAULT_BINARY_CACHE
-          & "$env:VCPKG_ROOT\vcpkg.exe" install openssl:arm64-windows-static --clean-after-build
-
-      - name: Configure UMSKT (TDM-GCC ${{ matrix.arch }})
-        if: matrix.arch != 'arm64'
+      - name: Configure UMSKT
         shell: pwsh
         run: |
           $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
@@ -217,32 +178,13 @@ jobs:
             -DCMAKE_CXX_FLAGS="$env:CMAKE_FLAGS" `
             .
 
-      - name: Configure UMSKT (MSVC ARM64)
-        if: matrix.arch == 'arm64'
-        shell: pwsh
-        run: |
-          cmake -G "Visual Studio 17 2022" `
-            -A ARM64 `
-            -DWINDOWS_ARM=ON `
-            -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" `
-            -DVCPKG_TARGET_TRIPLET=arm64-windows-static `
-            .
-
-      - name: Build UMSKT (TDM-GCC ${{ matrix.arch }})
-        if: matrix.arch != 'arm64'
+      - name: Build UMSKT
         shell: pwsh
         run: |
           $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
           mingw32-make
 
-      - name: Build UMSKT (MSVC ARM64)
-        if: matrix.arch == 'arm64'
-        shell: pwsh
-        run: |
-          cmake --build . --config Release
-
-      - name: Run tests (x86/x64)
-        if: matrix.arch != 'arm64'
+      - name: Run tests
         shell: pwsh
         run: |
           Write-Host Test 1 - generating key
@@ -254,23 +196,4 @@ jobs:
         uses: actions/upload-artifact@v4.6.2
         with:
           name: UMSKT-WinNT-${{ matrix.arch }}
-          path: ${{ matrix.arch == 'arm64' && 'Release/umskt.exe' || 'umskt.exe' }}
-
-  test-arm64:
-    needs: build
-    if: success()
-    runs-on: windows-11-arm
-    steps:
-      - name: Download ARM64 artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: UMSKT-WinNT-arm64
-          path: .
-
-      - name: Run tests (ARM64)
-        shell: pwsh
-        run: |
-          Write-Host Test 1 - generating key
-          .\umskt.exe -b 2C -c 365 -s 069420 -v
-          Write-Host Test 2 - generatng confid
-          .\umskt.exe -i 253286028742154311079061239762245184619981623171292574
+          path: umskt.exe