Update windows-arm.yml

.github/workflows/windows-arm.yml

@@ -0,0 +1,147 @@
+# 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: arm32
+                arch_compilename: amd64_arm
+                vcpkg_arch: arm-windows-static
+                cmake_arch: ARM
+                sdk_version: '10.0.17763.0'
+              - arch: arm64
+                arch_compilename: amd64_arm64
+                vcpkg_arch: arm64-windows-static
+                cmake_arch: ARM64
+                sdk_version: '10.0.17763.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: Cache OpenSSL Binaries
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ${{ github.workspace }}-OpenSSL-MSVC-${{ matrix.arch }}
+          key: openssl-1.1.1-${{ matrix.arch }}-${{ hashFiles('**/CMakeLists.txt') }}
+
+      - name: Checkout and Compile OpenSSL v1.1.1
+        shell: pwsh
+        run: |
+            git clone https://github.com/UMSKT/openssl --branch OpenSSL_1_1_1-stable --depth 1 openssl-src
+            cd openssl-src
+            
+            # 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"
+
+            $vcTarget = ""
+            if ("${{ matrix.arch}}" -eq "arm32") {
+              $vcTarget = "VC-WIN32-ARM"
+            } else {
+              $vcTarget = "VC-WIN64-ARM"
+            }
+            
+            # Configure OpenSSL
+            perl Configure $vcTarget no-shared no-asm no-engine --prefix="$env:GITHUB_WORKSPACE/OpenSSL-MSVC-${{ matrix.arch }}"
+            
+            # Build using MSVC ARM32 tools
+            cmd /c "call `"$vcvarsall`" ${{matrix.arch_compilename}} && nmake && nmake install_sw"
+            cd ..
+
+      - name: Save OpenSSL Binaries
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ github.workspace }}/OpenSSL-MSVC-${{ matrix.arch }}
+          key: openssl-1.1.1-${{ matrix.arch }}-${{ hashFiles('**/CMakeLists.txt') }}
+
+      - name: Set OpenSSL Environment
+        shell: pwsh
+        run: |
+          echo "OPENSSL_ROOT=$env:GITHUB_WORKSPACE/OpenSSL-MSVC-${{ matrix.arch }}" | 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,8 +50,29 @@ jobs:
           $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
           [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
 
+      - name: Checkout Source Tree
+        uses: actions/checkout@v4
+
+      - name: Cache OpenSSL 1.1.1 (32-bit)
+        uses: actions/cache/restore@v4
+        if: matrix.arch == 'x86'
+        id: cache-openssl-32
+        with:
+          path: |
+            ${{ github.workspace }}/OpenSSL-TDM-32
+          key: openssl-1.1.1-x86-${{ hashFiles('**/CMakeLists.txt') }}
+
+      - name: Cache OpenSSL 1.1.1 (64-bit)
+        uses: actions/cache/restore@v4
+        if: matrix.arch == 'x64'
+        id: cache-openssl-64
+        with:
+          path: |
+            ${{ github.workspace }}/OpenSSL-TDM-64
+          key: openssl-1.1.1-x64-${{ hashFiles('**/CMakeLists.txt') }}
+
       - name: Setup MSYS2
-        if: matrix.arch != 'arm64'
+        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' }}
@@ -64,42 +84,15 @@ jobs:
             perl
             git
 
-      - name: Setup MSVC for ARM64
+      - name: Checkout and Compile OpenSSL 1.1.1
-        if: matrix.arch == 'arm64'
+        if: steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: arm64
-
-      - name: Checkout Source Tree
-        uses: actions/checkout@v4
-
-      - name: Cache OpenSSL 3.1.2 (32-bit)
-        uses: actions/cache/restore@v4
-        if: matrix.arch == 'x86'
-        id: cache-openssl-32
-        with:
-          path: |
-            ${{ github.workspace }}/OpenSSL-TDM-32
-          key: openssl-3.1.2-x86-${{ hashFiles('**/CMakeLists.txt') }}
-
-      - name: Cache OpenSSL 3.1.2 (64-bit)
-        uses: actions/cache/restore@v4
-        if: matrix.arch == 'x64'
-        id: cache-openssl-64
-        with:
-          path: |
-            ${{ github.workspace }}/OpenSSL-TDM-64
-          key: openssl-3.1.2-x64-${{ hashFiles('**/CMakeLists.txt') }}
-
-      - 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'
         shell: msys2 {0}
         run: |
           # Clone UMSKT's OpenSSL fork
           echo "Cloning UMSKT OpenSSL fork..."
-          git clone https://github.com/UMSKT/openssl.git --depth 1 openssl-3.1.2
+          git clone https://github.com/UMSKT/openssl.git --branch OpenSSL_1_1_1-stable --depth 1 openssl-1.1.1
 
-      - name: Checkout and Compile OpenSSL 3.1.2 (32-bit)
+      - name: Checkout and Compile OpenSSL 1.1.1 (32-bit)
         if: matrix.arch == 'x86' && steps.cache-openssl-32.outputs.cache-hit != 'true'
         shell: msys2 {0}
         run: |
@@ -111,8 +104,8 @@ jobs:
           export PATH="/c/TDM-GCC-64/bin:$PATH"
           export MSYSTEM=MINGW32
           echo "Compiling 32-bit OpenSSL..."
-          cd openssl-3.1.2
+          cd openssl-1.1.1
-          /usr/bin/perl Configure mingw --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-32 --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-32 no-tests no-sse2 no-asm no-threads -DOPENSSL_DEV_NO_ATOMICS -mno-mmx -mno-sse -mno-sse2 -march=i386 -mtune=generic
+          /usr/bin/perl Configure mingw --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-32 --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-32 no-tests no-sse2 no-asm no-threads -DOPENSSL_DEV_NO_ATOMICS -mno-mmx -mno-sse -mno-sse2 -march=i686 -mtune=generic
           mingw32-make -j
           mingw32-make install_sw
           cd ..
@@ -129,19 +122,19 @@ jobs:
           export PATH="/c/TDM-GCC-64/bin:$PATH"
           export MSYSTEM=MINGW64
           echo "Compiling 64-bit OpenSSL..."
-          cd openssl-3.1.2
+          cd openssl-1.1.1
           /usr/bin/perl Configure mingw64 --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-64 --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-64 no-tests no-asm -DOPENSSL_DEV_NO_ATOMICS -mno-mmx
           mingw32-make -j
           mingw32-make install_sw
           cd ..
       
-      - name: Save OpenSSL 3.1.2 (32-bit)
+      - name: Save OpenSSL 1.1.1 (32-bit)
         if: matrix.arch == 'x86' && steps.cache-openssl-32.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
         with:
           path: |
             ${{ github.workspace }}/OpenSSL-TDM-32
-          key: openssl-3.1.2-x86-${{ hashFiles('**/CMakeLists.txt') }}
+          key: openssl-1.1.1-x86-${{ hashFiles('**/CMakeLists.txt') }}
 
       - name: Save OpenSSL 3.1.2 (64-bit)
         if: matrix.arch == 'x64' && steps.cache-openssl-64.outputs.cache-hit != 'true'
@@ -149,7 +142,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/OpenSSL-TDM-64
-          key: openssl-3.1.2-x64-${{ hashFiles('**/CMakeLists.txt') }}
+          key: openssl-1.1.1-x64-${{ hashFiles('**/CMakeLists.txt') }}
 
       - name: Set OpenSSL Environment (32-bit)
         if: matrix.arch == 'x86'
@@ -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
+      - name: Configure UMSKT
-        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'
         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)
+      - name: Build UMSKT
-        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'
         shell: pwsh
         run: |
           $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
           mingw32-make
 
-      - name: Build UMSKT (MSVC ARM64)
+      - name: Run tests
-        if: matrix.arch == 'arm64'
-        shell: pwsh
-        run: |
-          cmake --build . --config Release
-
-      - name: Run tests (x86/x64)
-        if: matrix.arch != 'arm64'
         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' }}
+          path: 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

CMakeLists.txt

@@ -35,11 +35,11 @@ if (WIN32 AND NOT MSVC)
     
     # Match resource architecture with target architecture
     if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-        set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -F pe-i386")
+        set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -F pe-i386 --target=pe-i386")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i386 -mtune=generic -mno-sse -mno-sse2 -mno-mmx -mno-3dnow")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686 -mtune=generic -mno-sse -mno-sse2 -mno-mmx -mno-3dnow")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i386 -mtune=generic -mno-sse -mno-sse2 -mno-mmx -mno-3dnow")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i686 -mtune=generic -mno-sse -mno-sse2 -mno-mmx -mno-3dnow")
     else()
-        set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -F pe-x86-64")
+        set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -F pe-x86-64 --target=pe-x86-64")
     endif()
     
     set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff -I${CMAKE_CURRENT_SOURCE_DIR}/src/windows <DEFINES> -i <SOURCE> -o <OBJECT>")

README.md

@@ -4,11 +4,13 @@
 
 [![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://umskt.zulipchat.com)
 [![libera.chat - #mspid](https://img.shields.io/badge/libera.chat-%23mspid-brightgreen)](https://web.libera.chat/gamja/?nick=Guest?#mspid)
-[![Discord](https://dcbadge.vercel.app/api/server/cUZxfNNSdt?style=flat)](https://discord.gg/PpBSpuphWM)
+[![Discord](https://img.shields.io/discord/1154155510887620729?label=discord&color=%235865F2)](https://discord.gg/PpBSpuphWM)
 
 **Build status**
 
-[![C/C++ CI (Windows)](https://github.com/UMSKT/UMSKT/actions/workflows/windows.yml/badge.svg)](../../actions/workflows/windows.yml)
+[![C/C++ CI (Windows x86+64)](https://github.com/UMSKT/UMSKT/actions/workflows/windows-x86-x64.yml/badge.svg)](../../actions/workflows/windows-x86-x64.yml)
+
+[![C/C++ CI (Windows ARM)](https://github.com/UMSKT/UMSKT/actions/workflows/windows-arm.yml/badge.svg)](../../actions/workflows/windows-arm.yml)
 
 [![C/C++ CI (macOS)](https://github.com/UMSKT/UMSKT/actions/workflows/macos.yml/badge.svg)](../../actions/workflows/macos.yml)
 
@@ -44,6 +46,33 @@ In light of the recent exponential interest in this project I've decided to put
 
 ------
 
+### System Requirements
+#### MS-DOS
+* i386 processor or better
+* MS-DOS 6.22 or later
+* Any DOS-based version of Windows
+* Windows NT 4.0 or later (via NTVDM)
+#### Windows (x86/x64)
+* i686 processor or better
+* Windows XP or later
+
+> [!WARNING]
+> Processors barely meeting the minimum system requirements for XP may not work. Use the MS-DOS version via NTVDM in that case.
+
+#### Windows (ARM32/64)
+* Windows 11 21H2 or later
+
+> [!NOTE]
+> This is just all we can test. Try to get it to run on Windows RT, make an issue if it doesn't run and we'll try to fix it.
+#### macOS
+* Apple Silicon or x86_64 processor
+* Latest version of macOS
+#### Linux
+* modern ARM, x86, or x86_64 processor
+* Latest version of your Linux distro
+
+------
+
 ### **Usage**
 #### 1. Download the latest version of UMSKT
 
@@ -54,15 +83,14 @@ In light of the recent exponential interest in this project I've decided to put
 * *(GitHub account \*not\* required)*
     * Download the latest release for your operating system and architecture from [the releases page](../../releases)
 
-* **Note:** Before continuing, please ensure you have the `umskt` executable extracted and on UNIX-like systems, have execution permissions (`chmod +x umskt`).
+> [!IMPORTANT]
+> Before continuing, please ensure you have the `umskt` executable extracted and on UNIX-like systems, have execution permissions (`chmod +x umskt`).
 
-#### 2. Install OpenSSL. 
+#### 2. Run `umskt` to generate a key, or add `--help` or `-h` to see more options.
-For Windows, click [here](https://slproweb.com/products/Win32OpenSSL.html) and choose the right version. For other operating systems, consult your package manager.
+> [!IMPORTANT]
-*Note: This only applies if the build you download has OpenSSL embedded (static library) or not. You can usually tell if the download size is measured in KB or MB. If it's MB, you don't need this.*
+> On macOS, like all unsigned executables, you'll need to hold Ctrl while right clicking and selecting Open to actually open it.
 
-#### 3. Run `umskt` to generate a key, or add `--help` or `-h` to see more options.
+#### 3. *(Activation step for `Retail` and `OEM` only)*
-*Note: on macOS, like all unsigned executables, you'll need to hold Ctrl while right clicking and selecting Open to actually open it.*
-#### 4. *(Activation step for `Retail` and `OEM` only)*
 * After installation, you will be prompted to activate Windows.
 
 

src/libumskt/confid/confid.cpp

@@ -85,7 +85,7 @@ inline QWORD ConfirmationID::__umul128(QWORD a, QWORD b, QWORD* hi)
     *hi = __umulh(a, b);
     return a * b;
 }
-#elif defined(__i386__) || defined(_M_IX86) || defined(__arm__) || defined(__EMSCRIPTEN__)
+#elif defined(__i386__) || defined(_M_IX86) || defined(__arm__) || defined(__EMSCRIPTEN__) || defined(_M_ARM)
 inline QWORD ConfirmationID::__umul128(QWORD multiplier, QWORD multiplicand, QWORD *product_hi) {
     // multiplier   = ab = a * 2^32 + b
     // multiplicand = cd = c * 2^32 + d