Update README.md

.github/workflows/windows.yml

@@ -10,32 +10,44 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-
-      - name: Install v141_xp
-        uses: thepwrtank18/[email protected]
-        with:
-          components: Microsoft.VisualStudio.Component.WinXP
-          
       - name: Checkout Source Tree
         uses: actions/checkout@v3
 
-      - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1
+      - name: Setup TDM-GCC
+        run: |
+          choco install 7zip --version 22.1 -y
+          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'
+          New-Item -ItemType Directory -Path 'C:\TDM-GCC-64'
+          Start-Process '7z' -ArgumentList 'e C:\Windows\temp\TDM-GCC-64.exe -oC:\TDM-GCC-64 -y' -Wait
+          Start-Process '7z' -ArgumentList 'e C:\TDM-GCC-64\*.tar.xz -oC:\TDM-GCC-64 -y' -Wait
+          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)
+        
+      - name: Setup folder directories
+        run: |
+          mkdir build
+          mkdir build\x86
+          mkdir build\x64
 
       - name: Build xpmgr (x86)
-        run: msbuild xpmgr.vcxproj /P:Configuration=Release /P:Platform=Win32
+        run: |
+          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: msbuild xpmgr.vcxproj /P:Configuration=Release /P:Platform=x64
+        run: |
+          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/[email protected]
         with:
           name: xpmgr (x86)
-          path: .\Win32\Release
+          path: .\build\x86
           
       - name: Upload build artifact (x64)
         uses: actions/[email protected]
         with:
           name: xpmgr (x64)
-          path: .\x64\Release
+          path: .\build\x64

.gitignore

@@ -32,6 +32,8 @@ bld/
 [Oo]ut/
 [Ll]og/
 [Ll]ogs/
+[Bb]uild/
+cmake-build-debug/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/xpmgr.iml" filepath="$PROJECT_DIR$/.idea/xpmgr.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/xpmgr.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />

README.md

@@ -10,7 +10,7 @@ If you have Windows XP Professional x64 Edition or an x64 version of Windows Ser
 
 If you have an Itanium version of Windows XP or Server 2003, Windows Product Activation is not on those editions, so there is no need for this tool.
 
-In general, don't use `xpmgr_debug_[arch].exe` unless you have a reason why.
+If you're trying to manage products other than Windows, you need `xpmgr_x86.exe`, regardless of your architecture.
 
 `--GetProductID`: Gets the product ID (ex: `76477-755-3803223-21229`).
 
@@ -24,7 +24,9 @@ In general, don't use `xpmgr_debug_[arch].exe` unless you have a reason why.
 
 `--GetEvalLeft`: Gets the number of days before the evaluation period expires, in days. In non-evaluation copies of Windows, this should give an error instead.
 
-`--Office2003`: This provides **EXPERIMENTAL** support for Office 2003. When this parameter is used, all other parameters except `--GetInstallationID` and `--SetConfirmationID` are disabled, and those two (attempt) to go what they do on Office 2003, rather than Windows. Most likely, it will crash.
+`--Office2003`: This provides **EXPERIMENTAL** support for Office 2003. When this parameter is used, all other parameters except `--GetInstallationID` and `--SetConfirmationID` are disabled, and those two (attempt) to go what they do on Office 2003, rather than Windows.
+
+`--BypassInstallCheck`: Disables the check to see if Office 2003 is installed. Intended for debugging purposes only. If it doesn't work without this enabled, it probably won't work with it either.
 
 `--GetUsage`: Outputs all the commands you can use.
 
@@ -32,4 +34,18 @@ In general, don't use `xpmgr_debug_[arch].exe` unless you have a reason why.
 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 -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++ -o build\x64\xpmgr_x64 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32
+```
+
+Or, if you like one-liners:
+```
+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++ -o build\x64\xpmgr_x64 xpmgr.cpp build\x64\icon_x64.res -lole32 -luuid -loleaut32
+```

icon.rc

@@ -0,0 +1 @@
+id ICON "xpmgr.ico"

resource.h

@@ -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

xpmgr.cpp

@@ -2,13 +2,10 @@ typedef struct IUnknown IUnknown;
 
 #include <windows.h>
 #include <iostream>
-#include <comutil.h>
+#include <comdef.h>
 #include <regex>
 #include <TlHelp32.h>
 
-#pragma comment(lib, "comsuppw.lib")
-#pragma comment(lib, "kernel32.lib")
-
 // Check windows
 #if _WIN32 || _WIN64
 #if _WIN64
@@ -226,7 +223,11 @@ static BOOL XP_LoadLicenseManager()
 	if (!XP_ComInitialized) {
 		HRESULT status = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
 		if (FAILED(status)) {
-			std::cout << "An error occurred at CoInitializeEx: ", status;
+            const char* errorString = "An error occurred at CoInitializeEx:";
+            int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+            char* result = new char[bufferSize + 1];
+            snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+			std::cout << result;
 			return FALSE;
 		}
 		XP_ComInitialized = TRUE;
@@ -246,7 +247,11 @@ static BOOL XP_LoadLicenseManager()
 			}
 		}
 		if (!good) {
-			std::cout << "An error occurred at CoCreateInstance: " + status;
+            const char* errorString = "An error occurred at CoCreateInstance:";
+            int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+            char* result = new char[bufferSize + 1];
+            snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+            std::cout << result;
 			return FALSE;
 		}
 	}
@@ -258,7 +263,11 @@ static BOOL O2003_LoadLicenseManager()
 	if (!O2003_ComInitialized) {
 		HRESULT status = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
 		if (FAILED(status)) {
-			std::cout << "An error occurred at CoInitializeEx: ", status;
+            const char* errorString = "An error occurred at CoInitializeEx:";
+            int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+            char* result = new char[bufferSize + 1];
+            snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+            std::cout << result;
 			return FALSE;
 		}
 		O2003_ComInitialized = TRUE;
@@ -278,7 +287,11 @@ static BOOL O2003_LoadLicenseManager()
 			}
 		}
 		if (!good) {
-			std::cout << "An error occurred at CoCreateInstance: " + status;
+            const char* errorString = "An error occurred at CoCreateInstance:";
+            int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+            char* result = new char[bufferSize + 1];
+            snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+            std::cout << result;
 			return FALSE;
 		}
 	}
@@ -286,7 +299,7 @@ static BOOL O2003_LoadLicenseManager()
 }
 
 #pragma region Internals
-bool RegistryKeyExists(HKEY rootKey, const wchar_t* keyPath) {
+bool RegistryKeyExists(HKEY rootKey, const char* keyPath) {
 	HKEY hKey;
 	LSTATUS result = RegOpenKeyEx(rootKey, keyPath, 0, KEY_READ, &hKey);
 
@@ -353,12 +366,53 @@ OLECHAR SizeToOLECHAR(size_t value)
 	return oChar;
 }
 
+BSTR ConvertToBSTR(const std::string& str) {
+    int size = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), -1, NULL, 0);
+    BSTR bstr = SysAllocStringLen(NULL, size - 1);
+    MultiByteToWideChar(CP_UTF8, 0, str.c_str(), -1, bstr, size);
+    return bstr;
+}
+
+std::string ConvertToStdString(BSTR bstr) {
+    int size = WideCharToMultiByte(CP_UTF8, 0, bstr, -1, NULL, 0, NULL, NULL);
+    char* buffer = new char[size];
+    WideCharToMultiByte(CP_UTF8, 0, bstr, -1, buffer, size, NULL, NULL);
+
+    std::string result(buffer);
+    delete[] buffer;
+
+    return result;
+}
+
+BSTR ConvertCharToBSTR(const char* charString) {
+    int size = MultiByteToWideChar(CP_UTF8, 0, charString, -1, NULL, 0);
+    BSTR bstr = SysAllocStringLen(NULL, size - 1);
+    MultiByteToWideChar(CP_UTF8, 0, charString, -1, bstr, size);
+    return bstr;
+}
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+void safeStrncat(char* destination, const char* source, size_t size) {
+    size_t destLen = strlen(destination);
+    size_t srcLen = strlen(source);
+
+    if (destLen + srcLen < size) {
+        // fuck off Microsoft
+        strncat(destination, source, size - destLen - 1); // -1 for the null terminator
+    } else {
+        // Handle buffer overflow error
+        std::cout << "An error occurred at safeStrncat: Buffer overflow during strncat operation." << std::endl;
+    }
+}
+#pragma clang diagnostic pop
+
 bool IsProcessRunning(const wchar_t* processName)
 {
 	HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
 	if (snapshot == INVALID_HANDLE_VALUE)
 	{
-		std::cerr << "Failed to create process snapshot." << std::endl;
+		std::cout << "An error occurred at IsProcessRunning: Failed to create process snapshot." << std::endl;
 		return false;
 	}
 
@@ -367,7 +421,7 @@ bool IsProcessRunning(const wchar_t* processName)
 	if (!Process32FirstW(snapshot, &processEntry))
 	{
 		CloseHandle(snapshot);
-		std::cerr << "Failed to retrieve process information." << std::endl;
+		std::cout << "An error occurred at IsProcessRunning: Failed to retrieve process information." << std::endl;
 		return false;
 	}
 
@@ -445,7 +499,14 @@ static BSTR XP_GetWPALeft() {
 	if (FAILED(status)) {
 		XP_LicenseAgent->Release();
 		XP_LicenseAgent = NULL;
-		return SysAllocString(L"An error occurred at GetExpirationInfo: " + status);
+        const char* errorString = "An error occurred at CoInitializeEx:";
+        int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        char* result = new char[bufferSize + 1];
+        snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, result, -1, nullptr, 0);
+        OLECHAR* wideResult = new OLECHAR[wideCharSize];
+        MultiByteToWideChar(CP_UTF8, 0, result, -1, wideResult, wideCharSize);
+		return SysAllocString(wideResult);
 	}
 	if (dwWPALeft == 0x7FFFFFFF) {
 		return SysAllocString(L"An error occurred at GetWPALeft: Windows is activated");
@@ -463,7 +524,14 @@ static BSTR XP_GetEvalLeft() {
 	if (FAILED(status)) {
 		XP_LicenseAgent->Release();
 		XP_LicenseAgent = NULL;
-		return SysAllocString(L"An error occurred at GetExpirationInfo: " + status);
+        const char* errorString = "An error occurred at GetExpirationInfo:";
+        int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        char* result = new char[bufferSize + 1];
+        snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, result, -1, nullptr, 0);
+        OLECHAR* wideResult = new OLECHAR[wideCharSize];
+        MultiByteToWideChar(CP_UTF8, 0, result, -1, wideResult, wideCharSize);
+        return SysAllocString(wideResult);
 	}
 	if (dwEvalLeft == 0x7FFFFFFF) {
 		return SysAllocString(L"An error occurred at GetEvalLeft: Not an evaluation copy");
@@ -483,7 +551,14 @@ static BSTR XP_VerifyCheckDigits(BSTR cidChunk) {
 	LONG pbValue;
 	HRESULT status = XP_LicenseAgent->VerifyCheckDigits(cidChunk, &pbValue);
 	if (FAILED(status) || !pbValue) {
-		return SysAllocString(L"An error occurred at XP_VerifyCheckDigits: " + pbValue);
+        char errorMessage[70] = "An error occurred at XP_VerifyCheckDigits:";
+        char pbValueChar[20];
+        snprintf(errorMessage, sizeof(errorMessage), "%ld", pbValue);
+        safeStrncat(errorMessage, pbValueChar, sizeof(errorMessage));
+        int len = MultiByteToWideChar(CP_UTF8, 0, errorMessage, -1, NULL, 0);
+        OLECHAR* oleCharString = new OLECHAR[len];
+        MultiByteToWideChar(CP_UTF8, 0, errorMessage, -1, oleCharString, len);
+		return SysAllocString(oleCharString);
 	}
 	return SysAllocString(L"Successfully verified CID chunk");
 }
@@ -508,7 +583,7 @@ static BSTR XP_SetConfirmationID(BSTR confirmationID) {
 	for (size_t i = 0; i < inputString.length(); i += 6) {
 		std::string substring = inputString.substr(i, 6);
 		const char* cstr = substring.c_str();
-		if (0 != wcscmp(XP_VerifyCheckDigits(_com_util::ConvertStringToBSTR(cstr)), L"Successfully verified CID chunk")) {
+		if (0 != wcscmp(XP_VerifyCheckDigits(ConvertCharToBSTR(cstr)), L"Successfully verified CID chunk")) {
 			return SysAllocString(L"An error occurred at XP_VerifyCheckDigits: Check for misspelling");
 		}
 	}
@@ -516,7 +591,15 @@ static BSTR XP_SetConfirmationID(BSTR confirmationID) {
 	ULONG dwRetCode;
 	HRESULT status = XP_LicenseAgent->DepositConfirmationId(confirmationID, &dwRetCode);
 	if (FAILED(status) || dwRetCode) {
-		return SysAllocString(L"An error occurred at DepositConfirmationId: " + status + dwRetCode);
+        const char* errorString = "An error occurred at DepositConfirmationId:";
+        int bufferSize = snprintf(nullptr, 0, "%s 0x%08X %lu", errorString, static_cast<unsigned int>(status), dwRetCode);
+        char* result = new char[bufferSize + 1];
+        snprintf(result, bufferSize + 1, "%s 0x%08X %lu", errorString, static_cast<unsigned int>(status), dwRetCode);
+
+        int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, result, -1, nullptr, 0);
+        OLECHAR* wideResult = new OLECHAR[wideCharSize];
+        MultiByteToWideChar(CP_UTF8, 0, result, -1, wideResult, wideCharSize);
+        return SysAllocString(wideResult);
 	}
 
 	system("rundll32 setupapi,InstallHinfSection DEL_OOBE_ACTIVATE 132 syssetup.inf"); // remove activation shortcuts
@@ -540,7 +623,14 @@ static BSTR XP_GetInstallationID() {
 	BSTR installationID = NULL;
 	HRESULT status = XP_LicenseAgent->GenerateInstallationId(&installationID);
 	if (FAILED(status) || !installationID) {
-		return SysAllocString(L"An error occurred at GenerateInstallationId: " + status);
+        const char* errorString = "An error occurred at GenerateInstallationId:";
+        int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        char* result = new char[bufferSize + 1];
+        snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, result, -1, nullptr, 0);
+        OLECHAR* wideResult = new OLECHAR[wideCharSize];
+        MultiByteToWideChar(CP_UTF8, 0, result, -1, wideResult, wideCharSize);
+        return SysAllocString(wideResult);
 	}
 	else {
 		return installationID;
@@ -566,7 +656,14 @@ static BSTR XP_SetProductKey(LPWSTR productKey) {
 
 	HRESULT status = XP_LicenseAgent->SetProductKey(productKey);
 	if (FAILED(status)) {
-		return SysAllocString(L"An error occurred at SetProductKey: " + status);
+        const char* errorString = "An error occurred at SetProductKey:";
+        int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        char* result = new char[bufferSize + 1];
+        snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, result, -1, nullptr, 0);
+        OLECHAR* wideResult = new OLECHAR[wideCharSize];
+        MultiByteToWideChar(CP_UTF8, 0, result, -1, wideResult, wideCharSize);
+        return SysAllocString(wideResult);
 	}
 	else {
 		return SysAllocString(L"Successfully set product key");
@@ -582,7 +679,14 @@ static BSTR XP_GetProductID() {
 
 	HRESULT status = XP_LicenseAgent->GetProductID(&productID);
 	if (FAILED(status)) {
-		return SysAllocString(L"An error occurred at GetProductID: " + status);
+        const char* errorString = "An error occurred at GetProductID:";
+        int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        char* result = new char[bufferSize + 1];
+        snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, result, -1, nullptr, 0);
+        OLECHAR* wideResult = new OLECHAR[wideCharSize];
+        MultiByteToWideChar(CP_UTF8, 0, result, -1, wideResult, wideCharSize);
+        return SysAllocString(wideResult);
 	}
 	else {
 		return productID;
@@ -601,7 +705,15 @@ static BSTR O2003_VerifyCheckDigits(BSTR cidChunk) {
 	int pbValue;
 	HRESULT status = O2003_LicenseAgent->VerifyCheckDigits(cidChunk, &pbValue);
 	if (FAILED(status) || !pbValue) {
-		return SysAllocString(L"An error occurred at XP_VerifyCheckDigits: " + pbValue);
+
+        wchar_t error[] = L"An error occurred at XP_VerifyCheckDigits:";
+        std::wstring numberStr = std::to_wstring(pbValue);
+        std::wstring result = error + numberStr;
+        wchar_t buffer[100];
+
+        swprintf(buffer, sizeof(buffer) / sizeof(buffer[0]), L"%s 0x%X %d", error, status, pbValue);
+
+		return SysAllocString(buffer);
 	}
 	return SysAllocString(L"Successfully verified CID chunk");
 }
@@ -623,7 +735,7 @@ static BSTR O2003_SetConfirmationID(BSTR confirmationID) {
 	for (size_t i = 0; i < inputString.length(); i += 6) {
 		std::string substring = inputString.substr(i, 6);
 		const char* cstr = substring.c_str();
-		if (0 != wcscmp(XP_VerifyCheckDigits(_com_util::ConvertStringToBSTR(cstr)), L"Successfully verified CID chunk")) {
+		if (0 != wcscmp(XP_VerifyCheckDigits(ConvertToBSTR(cstr)), L"Successfully verified CID chunk")) {
 			return SysAllocString(L"An error occurred at XP_VerifyCheckDigits: Check for misspelling");
 		}
 	}
@@ -631,7 +743,14 @@ static BSTR O2003_SetConfirmationID(BSTR confirmationID) {
 	ULONG dwRetCode;
 	HRESULT status = O2003_LicenseAgent->DepositConfirmationId(confirmationID, &dwRetCode);
 	if (FAILED(status) || dwRetCode) {
-		return SysAllocString(L"An error occurred at DepositConfirmationId: " + status + dwRetCode);
+        const char* errorString = "An error occurred at DepositConfirmationId:";
+        int bufferSize = snprintf(nullptr, 0, "%s 0x%08X %lu", errorString, static_cast<unsigned int>(status), dwRetCode);
+        char* result = new char[bufferSize + 1];
+        snprintf(result, bufferSize + 1, "%s 0x%08X %lu", errorString, static_cast<unsigned int>(status), dwRetCode);
+        int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, result, -1, nullptr, 0);
+        OLECHAR* wideResult = new OLECHAR[wideCharSize];
+        MultiByteToWideChar(CP_UTF8, 0, result, -1, wideResult, wideCharSize);
+        return SysAllocString(wideResult);
 	}
 
 	return SysAllocString(L"Successfully set confirmation ID");
@@ -652,7 +771,14 @@ static BSTR O2003_GetInstallationID() {
 	HRESULT status = O2003_LicenseAgent->GenerateInstallationId(&installationID);
 	std::cout << "DEBUG: GenerateInstallationID executed";
 	if (FAILED(status) || !installationID) {
-		return SysAllocString(L"An error occurred at GenerateInstallationId: " + status);
+        const char* errorString = "An error occurred at GenerateInstallationId:";
+        int bufferSize = snprintf(nullptr, 0, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        char* result = new char[bufferSize + 1];
+        snprintf(result, bufferSize + 1, "%s 0x%08X", errorString, static_cast<unsigned int>(status));
+        int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, result, -1, nullptr, 0);
+        OLECHAR* wideResult = new OLECHAR[wideCharSize];
+        MultiByteToWideChar(CP_UTF8, 0, result, -1, wideResult, wideCharSize);
+        return SysAllocString(wideResult);
 	}
 	else {
 		return installationID;
@@ -661,6 +787,8 @@ static BSTR O2003_GetInstallationID() {
 #pragma endregion
 
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 int main(int argc, char* argv[])
 {
 	const char* text =
@@ -683,7 +811,11 @@ int main(int argc, char* argv[])
 
 	if (cmdOptionExists(argv, argv + argc, "--Office2003")) {
 #ifdef ENVIRONMENT32
-		if (RegistryKeyExists(HKEY_CLASSES_ROOT, L"CLSID\\{000C0114-0000-0000-C000-000000000046}")) {
+
+        if (cmdOptionExists(argv, argv + argc, "--BypassInstallCheck")) {
+            specifiedProduct = "Office2003";
+        }
+        else if (RegistryKeyExists(HKEY_CLASSES_ROOT, "CLSID\\{000C0114-0000-0000-C000-000000000046}")) {
 			specifiedProduct = "Office2003";
 		}
 		else {
@@ -705,7 +837,7 @@ int main(int argc, char* argv[])
 	specifiedProduct = "WindowsNT5x";
 #endif
 
-	if (specifiedProduct == "WindowsNT5x") {
+	if (std::strcmp(specifiedProduct, "WindowsNT5x") == 0) {
 		SYSTEM_INFO systemInfo;
 		GetNativeSystemInfo(&systemInfo);
 #ifdef ENVIRONMENT32
@@ -748,53 +880,53 @@ int main(int argc, char* argv[])
 	}
 
 	if (cmdOptionExists(argv, argv + argc, "--GetInstallationID")) {
-		if (specifiedProduct == "Office2003") {
-			std::cout << _com_util::ConvertBSTRToString(O2003_GetInstallationID());
+		if (std::strcmp(specifiedProduct, "Office2003") == 0) {
+			std::cout << ConvertToStdString(O2003_GetInstallationID());
 			return 0;
 		}
-		std::cout << _com_util::ConvertBSTRToString(XP_GetInstallationID());
+		std::cout << ConvertToStdString(XP_GetInstallationID());
 		return 0;
 	}
 	else if (cmdOptionExists(argv, argv + argc, "--SetConfirmationID")) {
-		if (specifiedProduct == "Office2003") {
-			std::cout << _com_util::ConvertBSTRToString(O2003_SetConfirmationID(_com_util::ConvertStringToBSTR(getCmdOption(argv, argv + argc, "--SetConfirmationID"))));
+		if (std::strcmp(specifiedProduct, "Office2003") == 0) {
+			std::cout << ConvertToStdString(O2003_SetConfirmationID(ConvertCharToBSTR(getCmdOption(argv, argv + argc, "--SetConfirmationID"))));
 			return 0;
 		}
-		std::cout << _com_util::ConvertBSTRToString(XP_SetConfirmationID(_com_util::ConvertStringToBSTR(getCmdOption(argv, argv + argc, "--SetConfirmationID"))));
+		std::cout << ConvertToStdString(XP_SetConfirmationID(ConvertCharToBSTR(getCmdOption(argv, argv + argc, "--SetConfirmationID"))));
 		return 0;
 	}
 
 	else if (cmdOptionExists(argv, argv + argc, "--GetWPALeft")) {
-		if (specifiedProduct != "WindowsNT5x") {
+		if (std::strcmp(specifiedProduct, "WindowsNT5x") != 0) {
 			std::cout << "An error occurred at specifiedProduct: This command is for Windows management only.";
 			return 0;
 		}
-		std::cout << _com_util::ConvertBSTRToString(XP_GetWPALeft());
+		std::cout << ConvertToStdString(XP_GetWPALeft());
 		return 0;
 	}
 	else if (cmdOptionExists(argv, argv + argc, "--GetEvalLeft")) {
-		if (specifiedProduct != "WindowsNT5x") {
+		if (std::strcmp(specifiedProduct, "WindowsNT5x") != 0) {
 			std::cout << "An error occurred at specifiedProduct: This command is for Windows management only.";
 			return 0;
 		}
-		std::cout << _com_util::ConvertBSTRToString(XP_GetEvalLeft());
+		std::cout << ConvertToStdString(XP_GetEvalLeft());
 		return 0;
 	}
 
 	else if (cmdOptionExists(argv, argv + argc, "--SetProductKey")) {
-		if (specifiedProduct != "WindowsNT5x") {
+		if (std::strcmp(specifiedProduct, "WindowsNT5x") != 0) {
 			std::cout << "An error occurred at specifiedProduct: This command is for Windows management only.";
 			return 0;
 		}
-		std::cout << _com_util::ConvertBSTRToString(XP_SetProductKey(convertCharArrayToLPCWSTR(getCmdOption(argv, argv + argc, "--SetProductKey"))));
+		std::cout << ConvertToStdString(XP_SetProductKey(convertCharArrayToLPCWSTR(getCmdOption(argv, argv + argc, "--SetProductKey"))));
 		return 0;
 	}
 	else if (cmdOptionExists(argv, argv + argc, "--GetProductID")) {
-		if (specifiedProduct != "WindowsNT5x") {
+		if (std::strcmp(specifiedProduct, "WindowsNT5x") != 0) {
 			std::cout << "An error occurred at specifiedProduct: This command is for Windows management only.";
 			return 0;
 		}
-		std::cout << _com_util::ConvertBSTRToString(XP_GetProductID());
+		std::cout << ConvertToStdString(XP_GetProductID());
 		return 0;
 	}
 	else {
@@ -802,5 +934,5 @@ int main(int argc, char* argv[])
 		std::cout << text;
 		return 0;
 	}
-	return 0;
-}
+}
+#pragma clang diagnostic pop

xpmgr.sln

@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.6.33723.286
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpmgr", "xpmgr.vcxproj", "{F76E79ED-B941-49F6-A040-F560AA2B9E09}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release with UPX|x64 = Release with UPX|x64
-		Release with UPX|x86 = Release with UPX|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Debug|x64.ActiveCfg = Debug|x64
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Debug|x64.Build.0 = Debug|x64
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Debug|x86.ActiveCfg = Debug|Win32
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Debug|x86.Build.0 = Debug|Win32
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Release with UPX|x64.ActiveCfg = Release with UPX|x64
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Release with UPX|x64.Build.0 = Release with UPX|x64
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Release with UPX|x86.ActiveCfg = Release with UPX|Win32
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Release with UPX|x86.Build.0 = Release with UPX|Win32
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Release|x64.ActiveCfg = Release|x64
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Release|x64.Build.0 = Release|x64
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Release|x86.ActiveCfg = Release|Win32
-		{F76E79ED-B941-49F6-A040-F560AA2B9E09}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {92A0AD49-0BA8-4EFD-9F27-F8EA47684B07}
-	EndGlobalSection
-EndGlobal

xpmgr.vcxproj

@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release with UPX|Win32">
-      <Configuration>Release with UPX</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release with UPX|x64">
-      <Configuration>Release with UPX</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{f76e79ed-b941-49f6-a040-f560aa2b9e09}</ProjectGuid>
-    <RootNamespace>xpmgr</RootNamespace>
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release with UPX|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release with UPX|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release with UPX|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release with UPX|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetExt>.exe</TargetExt>
-    <TargetName>$(ProjectName)_x64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release with UPX|x64'">
-    <TargetExt>.exe</TargetExt>
-    <TargetName>$(ProjectName)_x64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>$(ProjectName)_x86</TargetName>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release with UPX|Win32'">
-    <TargetName>$(ProjectName)_x86</TargetName>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)_debug_x64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)_debug_x86</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release with UPX|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>"$(SolutionDir)BuildTools\upx.exe" "$(TargetPath)" --ultra-brute --best --compress-icons=3 -o"$(TargetDir)xpmgr_upx_x86.exe"
-del "$(TargetPath)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release with UPX|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>"$(SolutionDir)BuildTools\upx.exe" "$(TargetPath)" --ultra-brute --best --compress-icons=3 -o"$(TargetDir)xpmgr_upx_x64.exe"
-del "$(TargetPath)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="xpmgr.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="xpmgr.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="xpmgr.ico" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

xpmgr.vcxproj.filters

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="xpmgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="xpmgr.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="xpmgr.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-</Project>