From 85f1d5949da29fc2488036d93bf78fde25c9ee44 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:32:07 +0000 Subject: [PATCH 1/9] Update windows.yml --- .github/workflows/windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2149669..6c16aad 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,13 +34,13 @@ jobs: - name: Build xpmgr (x86) run: | - windres icon.rc icon.res - C:\TDM-GCC-64\bin\g++.exe -m32 -o build\x86\xpmgr_x86 xpmgr.cpp icon.res -lole32 -luuid -loleaut32 + windres icon.rc -O coff -o build\icon.res + C:\TDM-GCC-64\bin\g++.exe -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\icon.res -lole32 -luuid -loleaut32 - name: Build xpmgr (x64) run: | - windres icon.rc icon.res - C:\TDM-GCC-64\bin\g++.exe -o build\x64\xpmgr_x64 xpmgr.cpp icon.res -lole32 -luuid -loleaut32 + windres icon.rc -O coff -o build\icon.res + C:\TDM-GCC-64\bin\g++.exe -o build\x64\xpmgr_x64 xpmgr.cpp build\icon.res -lole32 -luuid -loleaut32 - name: Upload build artifact (x86) uses: actions/upload-artifact@v3.1.2 From fde2df096c30434ba26d4dd1480ca94ac39f7981 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:38:05 +0000 Subject: [PATCH 2/9] Update windows.yml --- .github/workflows/windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6c16aad..c759fe2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,13 +34,13 @@ jobs: - name: Build xpmgr (x86) run: | - windres icon.rc -O coff -o build\icon.res - C:\TDM-GCC-64\bin\g++.exe -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\icon.res -lole32 -luuid -loleaut32 + windres icon.rc -O coff -F pe-i386 -o build\x86\icon_x86.res + C:\TDM-GCC-64\bin\g++.exe -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\x86\icon_x86.res -lole32 -luuid -loleaut32 - name: Build xpmgr (x64) run: | - windres icon.rc -O coff -o build\icon.res - C:\TDM-GCC-64\bin\g++.exe -o build\x64\xpmgr_x64 xpmgr.cpp build\icon.res -lole32 -luuid -loleaut32 + windres icon.rc -O coff -o build\x64\icon_x64.res + C:\TDM-GCC-64\bin\g++.exe -o build\x64\xpmgr_x64 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32 - name: Upload build artifact (x86) uses: actions/upload-artifact@v3.1.2 From ad583bca9286cea6400ffee88c272b817ee9aaed Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:42:08 +0000 Subject: [PATCH 3/9] Update README.md --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7142e8f..a00538a 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,13 @@ Use `xpmgr_debug_[arch].exe` if you're encountering an error (or nothing's happe https://github.com/UMSKT/xpmgr/releases ## Building -Make sure Visual Studio 2017 or later is installed, with the v141_xp toolchain. Then, `git clone`, open in VS, build, done. +Make sure Visual Studio 2017 or later is installed. Then, install [TDM-GCC](https://jmeubank.github.io/tdm-gcc/about/). Then, run, at the source folder: +``` +mkdir build +mkdir build\x86 +mkdir build\x64 +windres icon.rc -O coff -F pe-i386 -o build\x64\icon_x64.res +g++ -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32 +windres icon.rc -O coff -o build\x86\icon_x86.res +g++ -o build\x64\xpmgr_x64 xpmgr.cpp build\x86\icon_x86.res -lole32 -luuid -loleaut32 +``` From e644550344d4bf61528b3addb7b1ad421b21b812 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:44:42 +0000 Subject: [PATCH 4/9] Update windows.yml --- .github/workflows/windows.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c759fe2..d37f130 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,24 +23,22 @@ jobs: Start-Process '7z' -ArgumentList 'x C:\TDM-GCC-64\*.tar -oC:\TDM-GCC-64 -y' -Wait $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine) - tree /f C:\TDM-GCC-64 - name: Setup folder directories run: | mkdir build mkdir build\x86 mkdir build\x64 - tree /f D:\a\ - name: Build xpmgr (x86) run: | - windres icon.rc -O coff -F pe-i386 -o build\x86\icon_x86.res - C:\TDM-GCC-64\bin\g++.exe -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\x86\icon_x86.res -lole32 -luuid -loleaut32 + windres icon.rc -O coff -F pe-i386 -o build\x86\icon_x86.res -v + C:\TDM-GCC-64\bin\g++.exe -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\x86\icon_x86.res -lole32 -luuid -loleaut32 -v - name: Build xpmgr (x64) run: | - windres icon.rc -O coff -o build\x64\icon_x64.res - C:\TDM-GCC-64\bin\g++.exe -o build\x64\xpmgr_x64 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32 + windres icon.rc -O coff -o build\x64\icon_x64.res -v + C:\TDM-GCC-64\bin\g++.exe -o build\x64\xpmgr_x64 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32 -v - name: Upload build artifact (x86) uses: actions/upload-artifact@v3.1.2 From ccb0a99a81f14231f05692cfb7f3e43653d60bb6 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:49:37 +0000 Subject: [PATCH 5/9] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index a00538a..0e3e341 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,6 @@ If you have an Itanium version of Windows XP or Server 2003, Windows Product Act If you're trying to manage products other than Windows, you need `xpmgr_x86.exe`, regardless of your architecture. -Use `xpmgr_debug_[arch].exe` if you're encountering an error (or nothing's happening). It won't fix the error, but it will give better insight as to why the error's happening. - `--GetProductID`: Gets the product ID (ex: `76477-755-3803223-21229`). `--SetProductKey`: Sets the product key (tested to work with dashes). If already activated, this should give an error instead. From a829a21a175adfc266529651c2a9308aac3084b8 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 02:04:41 +0000 Subject: [PATCH 6/9] Remove unneeded file --- resource.h | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 resource.h diff --git a/resource.h b/resource.h deleted file mode 100644 index 788c1fe..0000000 --- a/resource.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by xpmgr.rc -// -#define IDI_ICON1 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif From 0dce831512461daf1b0235cd5ad5261062d0669c Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 02:04:55 +0000 Subject: [PATCH 7/9] Remove misplaced test file --- test.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test.txt diff --git a/test.txt b/test.txt deleted file mode 100644 index 8786c78..0000000 --- a/test.txt +++ /dev/null @@ -1,3 +0,0 @@ -14037188531115461057117122732036502128316172554233 - -115654-870803-633253-538651-586936-689612-768696 \ No newline at end of file From 650f94babfe3542934d86722382bc46a9f38dcd8 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 16:41:51 +0000 Subject: [PATCH 8/9] fix build instructions --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e3e341..5ee2ad4 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ Make sure Visual Studio 2017 or later is installed. Then, install [TDM-GCC](http mkdir build mkdir build\x86 mkdir build\x64 -windres icon.rc -O coff -F pe-i386 -o build\x64\icon_x64.res +windres icon.rc -O coff -o build\x64\icon_x64.res g++ -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32 -windres icon.rc -O coff -o build\x86\icon_x86.res +windres icon.rc -O coff -F pe-i386 -o build\x86\icon_x86.res g++ -o build\x64\xpmgr_x64 xpmgr.cpp build\x86\icon_x86.res -lole32 -luuid -loleaut32 ``` From 7ca11132b8878ce2fe0d3665f45e1d01ec34fe19 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 16:51:39 +0000 Subject: [PATCH 9/9] fixed again --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5ee2ad4..803ac59 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ Make sure Visual Studio 2017 or later is installed. Then, install [TDM-GCC](http mkdir build mkdir build\x86 mkdir build\x64 +windres icon.rc -F pe-i386 -O coff -o build\x86\icon_x86.res +g++ -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\x86\icon_x86.res -lole32 -luuid -loleaut32 windres icon.rc -O coff -o build\x64\icon_x64.res -g++ -m32 -o build\x86\xpmgr_x86 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32 -windres icon.rc -O coff -F pe-i386 -o build\x86\icon_x86.res -g++ -o build\x64\xpmgr_x64 xpmgr.cpp build\x86\icon_x86.res -lole32 -luuid -loleaut32 +g++ -o build\x64\xpmgr_x64 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32 ```