mirror of
https://github.com/Neo-Desktop/WindowsXPKg
synced 2025-07-26 06:00:21 +03:00
Compare commits
28 Commits
change-ico
...
smol
Author | SHA1 | Date | |
---|---|---|---|
ebc9059cb0 | |||
df22eccb0b | |||
f02a2abb34 | |||
83d9039efe | |||
2e426e32dd | |||
848519b9ac | |||
47812ea933 | |||
7f8544cb1b | |||
3d6bf59057 | |||
424f966e32 | |||
b2f072cbe6 | |||
95a13c127d | |||
5586c29557 | |||
f1db4cf517 | |||
da2a83b483 | |||
3002e98c1d | |||
76049370c3 | |||
ab09ab904c | |||
d85e10cf90 | |||
a93fcda3e0 | |||
df25a47ec2 | |||
ec6d12760e | |||
972eef88b6 | |||
3d94685209 | |||
e45776479d | |||
8ac486f806 | |||
cbc1af3306 | |||
50279dee5a |
120
.github/workflows/dos-djgpp.yml
vendored
120
.github/workflows/dos-djgpp.yml
vendored
@ -18,7 +18,7 @@
|
||||
# @FileCreated by Neo on 06/19/2023
|
||||
# @Maintainer Neo
|
||||
|
||||
name: C/C++ CI (DOS DJGPP)
|
||||
name: DOS DJGPP
|
||||
|
||||
on:
|
||||
push:
|
||||
@ -188,3 +188,121 @@ jobs:
|
||||
with:
|
||||
name: UMSKT-DOS-x86
|
||||
path: build/actions_upload
|
||||
compress:
|
||||
needs: build
|
||||
if: success()
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
steps:
|
||||
- name: Setup test environment
|
||||
run: |
|
||||
sudo apt -y update
|
||||
sudo apt -y install dosbox
|
||||
|
||||
- name: Download artifact
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: UMSKT-DOS-x86
|
||||
path: .
|
||||
|
||||
- name: Install UPX
|
||||
uses: crazy-max/ghaction-upx@v3
|
||||
with:
|
||||
install-only: true
|
||||
|
||||
- name: Compress binary
|
||||
shell: pwsh
|
||||
run: |
|
||||
upx umskt.exe --best --ultra-brute -v
|
||||
|
||||
- name: Setup DOSBox test environment
|
||||
run: |
|
||||
mkdir -p dosbox_test
|
||||
cp umskt.exe dosbox_test/
|
||||
# Download DPMI server directly
|
||||
# wget https://github.com/UMSKT/winactiontest/raw/refs/heads/main/CWSDPMI.EXE -O dosbox_test/CWSDPMI.EXE
|
||||
# Create test batch file
|
||||
cat > dosbox_test/test.bat << EOL
|
||||
@echo off
|
||||
echo Running test 1...
|
||||
umskt.exe -b 2C -c 365 -s 069420 > TEST1.TXT
|
||||
if errorlevel 1 goto error
|
||||
echo Running test 2...
|
||||
umskt.exe -i 253286028742154311079061239762245184619981623171292574 > TEST2.TXT
|
||||
if errorlevel 1 goto error
|
||||
echo Tests completed > DONE.TXT
|
||||
goto end
|
||||
:error
|
||||
echo Test failed > ERROR.TXT
|
||||
:end
|
||||
exit
|
||||
EOL
|
||||
# Create DOSBox configuration
|
||||
cat > dosbox_test/dosbox.conf << EOL
|
||||
[sdl]
|
||||
nosound=true
|
||||
[cpu]
|
||||
cputype=386
|
||||
core=dynamic
|
||||
cycles=max
|
||||
[autoexec]
|
||||
mount c .
|
||||
c:
|
||||
test.bat
|
||||
exit
|
||||
EOL
|
||||
|
||||
- name: Run tests in DOSBox
|
||||
|
||||
run: |
|
||||
cd dosbox_test
|
||||
timeout 30s dosbox -conf dosbox.conf -nogui -exit
|
||||
# Check if the test completed successfully
|
||||
if [ ! -f DONE.TXT ]; then
|
||||
echo "Tests did not complete successfully"
|
||||
if [ -f ERROR.TXT ]; then
|
||||
echo "Test execution failed"
|
||||
fi
|
||||
if [ -f TEST1.TXT ]; then
|
||||
echo "Test 1 output:"
|
||||
cat TEST1.TXT
|
||||
fi
|
||||
if [ -f TEST2.TXT ]; then
|
||||
echo "Test 2 output:"
|
||||
cat TEST2.TXT
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
# Verify test outputs
|
||||
if [ ! -f TEST1.TXT ] || [ ! -f TEST2.TXT ]; then
|
||||
echo "Test output files missing"
|
||||
exit 1
|
||||
fi
|
||||
# Check test results - looking for key format patterns
|
||||
if ! grep -qE '[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}' TEST1.TXT || \
|
||||
! grep -qE '[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}' TEST2.TXT; then
|
||||
echo "Tests failed - unexpected output format"
|
||||
echo "Test 1 output:"
|
||||
cat TEST1.TXT
|
||||
echo "Test 2 output:"
|
||||
cat TEST2.TXT
|
||||
exit 1
|
||||
else
|
||||
echo "All tests passed successfully"
|
||||
echo "Test 1 output:"
|
||||
cat TEST1.TXT
|
||||
echo "Test 2 output:"
|
||||
cat TEST2.TXT
|
||||
fi
|
||||
|
||||
- name: Move executable to upload directory
|
||||
run: |
|
||||
mkdir actions_upload
|
||||
mv umskt.exe actions_upload/
|
||||
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4.6.2
|
||||
with:
|
||||
name: UMSKT-DOS-x86-Compressed
|
||||
path: actions_upload
|
||||
|
2
.github/workflows/freebsd.yml
vendored
2
.github/workflows/freebsd.yml
vendored
@ -18,7 +18,7 @@
|
||||
# @FileCreated by techguy16 on 07/23/2023
|
||||
# @Maintainer techguy16
|
||||
|
||||
name: C/C++ CI (FreeBSD)
|
||||
name: FreeBSD
|
||||
|
||||
on:
|
||||
#push:
|
||||
|
2
.github/workflows/linux.yml
vendored
2
.github/workflows/linux.yml
vendored
@ -18,7 +18,7 @@
|
||||
# @FileCreated by TheTank20 on 06/13/2023
|
||||
# @Maintainer Neo
|
||||
|
||||
name: C/C++ CI (Linux)
|
||||
name: Linux
|
||||
|
||||
on:
|
||||
push:
|
||||
|
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -18,7 +18,7 @@
|
||||
# @FileCreated by techguy16 on 07/23/2023
|
||||
# @Maintainer techguy16
|
||||
|
||||
name: C/C++ CI (macOS)
|
||||
name: macOS
|
||||
|
||||
on:
|
||||
push:
|
||||
|
2
.github/workflows/windows-arm.yml
vendored
2
.github/workflows/windows-arm.yml
vendored
@ -18,7 +18,7 @@
|
||||
# @FileCreated by TheTank20 on 07/08/2025
|
||||
# @Maintainer Neo
|
||||
|
||||
name: C/C++ CI (Windows ARM)
|
||||
name: Windows ARM
|
||||
|
||||
on:
|
||||
push:
|
||||
|
81
.github/workflows/windows-x86-x64.yml
vendored
81
.github/workflows/windows-x86-x64.yml
vendored
@ -18,7 +18,7 @@
|
||||
# @FileCreated by TheTank20 on 07/08/2025
|
||||
# @Maintainer Neo
|
||||
|
||||
name: C/C++ CI (Windows x86+64)
|
||||
name: Windows x86+64
|
||||
|
||||
on:
|
||||
push:
|
||||
@ -98,9 +98,9 @@ jobs:
|
||||
cd openssl-1.1.1
|
||||
|
||||
if [[ ${{ matrix.arch }} == "x86" ]]; then
|
||||
/usr/bin/perl Configure mingw --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-${{ matrix.arch }} --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
|
||||
/usr/bin/perl Configure mingw --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-${{ matrix.arch }} --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 -Os -s -fno-exceptions -fno-rtti -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -fno-stack-protector
|
||||
else
|
||||
/usr/bin/perl Configure mingw64 --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-${{ matrix.arch }} --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-64 no-tests no-asm -DOPENSSL_DEV_NO_ATOMICS -mno-mmx
|
||||
/usr/bin/perl Configure mingw64 --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-${{ matrix.arch }} --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-64 no-tests no-asm -DOPENSSL_DEV_NO_ATOMICS -mno-mmx -Os -s -fno-exceptions -fno-rtti -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -fno-stack-protector
|
||||
fi
|
||||
mingw32-make -j
|
||||
mingw32-make install_sw
|
||||
@ -158,3 +158,78 @@ jobs:
|
||||
with:
|
||||
name: UMSKT-WinNT-${{ matrix.arch }}
|
||||
path: umskt.exe
|
||||
|
||||
compress:
|
||||
needs: build
|
||||
if: success()
|
||||
runs-on: windows-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- arch: x86
|
||||
- arch: x64
|
||||
steps:
|
||||
- name: Setup TDM-GCC
|
||||
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'
|
||||
Write-Host Creating directory...
|
||||
New-Item -ItemType Directory -Path 'C:\TDM-GCC-64'
|
||||
Write-Host Copying files [Set 1/3]...
|
||||
Start-Process '7z' -ArgumentList 'e C:\Windows\temp\TDM-GCC-64.exe -oC:\TDM-GCC-64 -y' -Wait
|
||||
Write-Host Copying files [Set 2/3]...
|
||||
Start-Process '7z' -ArgumentList 'e C:\TDM-GCC-64\*.tar.xz -oC:\TDM-GCC-64 -y' -Wait
|
||||
Write-Host Copying files [Set 3/3]...
|
||||
Start-Process '7z' -ArgumentList 'x C:\TDM-GCC-64\*.tar -oC:\TDM-GCC-64 -y' -Wait
|
||||
Write-Host Adding environment variables...
|
||||
$env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
|
||||
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
|
||||
|
||||
- name: Setup UPX
|
||||
run: |
|
||||
Invoke-WebRequest -Uri 'https://github.com/upx/upx/releases/download/v5.0.2/upx-5.0.2-win64.zip' -OutFile 'C:\Windows\temp\upx.zip'
|
||||
Write-Host Creating directory...
|
||||
New-Item -ItemType Directory -Path 'C:\UPX'
|
||||
Write-Host Copying files...
|
||||
Expand-Archive -Path 'C:\Windows\temp\upx.zip' -DestinationPath 'C:\UPX'
|
||||
Write-Host Adding environment variables...
|
||||
$env:PATH = 'C:\UPX\upx-5.0.2-win64;' + $env:PATH
|
||||
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
|
||||
|
||||
- name: Download ${{matrix.arch}} artifact
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: UMSKT-WinNT-${{ matrix.arch }}
|
||||
path: .
|
||||
- name: Compress binaries
|
||||
shell: pwsh
|
||||
run: |
|
||||
# Strip symbols
|
||||
strip .\umskt.exe
|
||||
|
||||
# Remove resources
|
||||
llvm-objcopy --remove-section .rsrc umskt.exe umskt_comp.exe
|
||||
|
||||
# Compress with UPX
|
||||
& "C:\UPX\upx-5.0.2-win64\upx.exe" --best --ultra-brute .\umskt_comp.exe
|
||||
|
||||
# Replace original EXE
|
||||
Remove-Item .\umskt.exe
|
||||
Rename-Item -Path .\umskt_comp.exe -NewName umskt.exe
|
||||
|
||||
|
||||
|
||||
- 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
|
||||
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4.6.2
|
||||
with:
|
||||
name: UMSKT-WinNT-${{ matrix.arch }}-Compressed
|
||||
path: umskt.exe
|
||||
|
@ -27,6 +27,11 @@ if (WIN32 AND NOT MSVC)
|
||||
set(CMAKE_CXX_COMPILER "C:/TDM-GCC-64/bin/g++.exe" CACHE FILEPATH "C++ Compiler" FORCE)
|
||||
message(STATUS "[UMSKT] Forcing use of TDM-GCC in C:/TDM-GCC-64")
|
||||
|
||||
# Add size optimization flags for GCC
|
||||
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os -s -fno-exceptions -fno-rtti -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -fno-stack-protector")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -s -fno-exceptions -fno-rtti -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -fno-stack-protector")
|
||||
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -Wl,--gc-sections -Wl,--strip-all")
|
||||
|
||||
# Configure windres for resource compilation
|
||||
set(CMAKE_RC_COMPILER "C:/TDM-GCC-64/bin/windres.exe")
|
||||
set(CMAKE_RC_COMPILER_INIT windres)
|
||||
@ -123,13 +128,13 @@ ENDIF()
|
||||
IF(MSVC)
|
||||
SET(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
||||
IF(NOT BUILD_SHARED_LIBS)
|
||||
SET(CMAKE_CXX_FLAGS_RELEASE "/MT")
|
||||
SET(CMAKE_CXX_FLAGS_RELEASE "/MT /Os /GL /GS- /Gy")
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG "/MTd")
|
||||
ELSE()
|
||||
SET(CMAKE_CXX_FLAGS_RELEASE "/MD")
|
||||
SET(CMAKE_CXX_FLAGS_RELEASE "/MD /Os /GL /GS- /Gy")
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG "/MDd")
|
||||
ENDIF()
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "/INCREMENTAL:NO /NODEFAULTLIB:MSVCRT")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "/INCREMENTAL:NO /NODEFAULTLIB:MSVCRT /OPT:REF /OPT:ICF")
|
||||
SET(CMAKE_ENABLE_EXPORTS ON)
|
||||
SET(UMSKT_EXE_WINDOWS_EXTRA src/windows/umskt.rc)
|
||||
SET(UMSKT_EXE_WINDOWS_DLL src/windows/dllmain.cpp)
|
||||
|
32
README.md
32
README.md
@ -1,24 +1,26 @@
|
||||
# Universal MS Key Toolkit (UMSKT)
|
||||
<p align="center"><img src="https://avatars.githubusercontent.com/u/135211890?s=128&c=0" alt="umskt logo"/></p>
|
||||
|
||||
<h1 align="center"><b>U</b>niversal <b>MS</b> <b>K</b>ey <b>T</b>oolkit (UMSKT)</h1>
|
||||
|
||||
<p align="center">An open source toolkit designed to generate licence keys for MS products circa 1998 - 2006</p>
|
||||
<hr />
|
||||
|
||||
**Connect with us**
|
||||
|
||||
[](https://umskt.zulipchat.com)
|
||||
[](https://web.libera.chat/gamja/?nick=Guest?#mspid)
|
||||
[](https://discord.gg/PpBSpuphWM)
|
||||
[](https://web.libera.chat/gamja/?nick=Guest?#mspid)
|
||||
[](https://umskt.zulipchat.com)
|
||||
|
||||
**Build status**
|
||||
----
|
||||
|
||||
[](../../actions/workflows/windows-x86-x64.yml)
|
||||
|
||||
[](../../actions/workflows/windows-arm.yml)
|
||||
|
||||
[](../../actions/workflows/macos.yml)
|
||||
|
||||
[](../../actions/workflows/linux.yml)
|
||||
|
||||
[](../../actions/workflows/freebsd.yml)
|
||||
|
||||
[](../../actions/workflows/dos-djgpp.yml)
|
||||
| CI Build status |
|
||||
| ------------ |
|
||||
| [](../../actions/workflows/windows-x86-x64.yml) |
|
||||
| [](../../actions/workflows/windows-arm.yml) |
|
||||
| [](../../actions/workflows/macos.yml) |
|
||||
| [](../../actions/workflows/linux.yml) |
|
||||
| [](../../actions/workflows/freebsd.yml) |
|
||||
| [](../../actions/workflows/dos-djgpp.yml) |
|
||||
|
||||
------
|
||||
|
||||
|
31
src/cli.cpp
31
src/cli.cpp
@ -61,7 +61,7 @@ void CLI::showHelp(char *argv[]) {
|
||||
fmt::print("\t-v --verbose\tenable verbose output\n");
|
||||
fmt::print("\t-n --number\tnumber of keys to generate (defaults to 1)\n");
|
||||
fmt::print("\t-f --file\tspecify which keys file to load\n");
|
||||
fmt::print("\t-i --instid\tinstallation ID used to generate confirmation ID\n");
|
||||
fmt::print("\t-i --instid\tinstallation ID used to generate confirmation ID (reads from stdin if no argument provided)\n");
|
||||
fmt::print("\t-m --mode\tproduct family to activate.\n\t\t\tvalid options are \"WINDOWS\", \"OFFICEXP\", \"OFFICE2K3\", \"OFFICE2K7\" or \"PLUSDME\"\n\t\t\t(defaults to \"WINDOWS\")\n");
|
||||
fmt::print("\t-p --productid\tthe product ID of the Program to activate. only required for Office 2K3 and Office 2K7 programs\n");
|
||||
fmt::print("\t-b --binkid\tspecify which BINK identifier to load (defaults to 2E)\n");
|
||||
@ -168,14 +168,14 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
|
||||
options->keysFilename = argv[i+1];
|
||||
i++;
|
||||
} else if (arg == "-i" || arg == "--instid") {
|
||||
if (i == argc - 1) {
|
||||
options->error = true;
|
||||
break;
|
||||
}
|
||||
|
||||
options->instid = argv[i+1];
|
||||
options->applicationMode = MODE_CONFIRMATION_ID;
|
||||
i++;
|
||||
if (i == argc - 1 || argv[i+1][0] == '-') {
|
||||
// No argument provided, will read from stdin later
|
||||
options->instid = "";
|
||||
} else {
|
||||
options->instid = argv[i+1];
|
||||
i++;
|
||||
}
|
||||
} else if (arg == "-m" || arg == "--mode") {
|
||||
std::string mode = argv[i+1];
|
||||
char *p = &mode[0];
|
||||
@ -369,6 +369,12 @@ bool CLI::stripKey(const char *in_key, char out_key[PK_LENGTH]) {
|
||||
return (i == PK_LENGTH);
|
||||
}
|
||||
|
||||
std::string CLI::readFromStdin() {
|
||||
std::string input;
|
||||
std::getline(std::cin, input);
|
||||
return input;
|
||||
}
|
||||
|
||||
CLI::CLI(Options options, json keys) {
|
||||
this->options = options;
|
||||
this->keys = keys;
|
||||
@ -572,7 +578,14 @@ int CLI::BINK2002Validate() {
|
||||
|
||||
int CLI::ConfirmationID() {
|
||||
char confirmation_id[49];
|
||||
int err = ConfirmationID::Generate(this->options.instid.c_str(), confirmation_id, options.activationMode, options.productid, options.overrideVersion);
|
||||
std::string instid = this->options.instid;
|
||||
|
||||
// If instid is empty, read from stdin
|
||||
if (instid.empty()) {
|
||||
instid = readFromStdin();
|
||||
}
|
||||
|
||||
int err = ConfirmationID::Generate(instid.c_str(), confirmation_id, options.activationMode, options.productid, options.overrideVersion);
|
||||
|
||||
switch (err) {
|
||||
case ERR_TOO_SHORT:
|
||||
|
Reference in New Issue
Block a user