hack fix for arm64 in absence of better solutions

This commit is contained in:
Wither OrNot 2025-04-04 00:21:07 -04:00
parent aa0801c643
commit e86f43a286
2 changed files with 15 additions and 10 deletions

View File

@ -32,6 +32,11 @@ namespace LibTSforge.SPP
get { return BitConverter.GetBytes(klow).Concat(BitConverter.GetBytes(khigh)).ToArray(); } get { return BitConverter.GetBytes(klow).Concat(BitConverter.GetBytes(khigh)).ToArray(); }
} }
public ProductKey()
{
}
public ProductKey(int serial, ulong security, bool upgrade, PKeyAlgorithm algorithm, ProductConfig config, KeyRange range) public ProductKey(int serial, ulong security, bool upgrade, PKeyAlgorithm algorithm, ProductConfig config, KeyRange range)
{ {
Group = config.GroupId; Group = config.GroupId;
@ -254,7 +259,9 @@ namespace LibTSforge.SPP
int serialLow = Serial % 1000000; int serialLow = Serial % 1000000;
BinaryWriter writer = new BinaryWriter(new MemoryStream()); BinaryWriter writer = new BinaryWriter(new MemoryStream());
writer.Write(new Guid("B8731595-A2F6-430B-A799-FBFFB81A8D73").ToByteArray()); string algoId = Algorithm == PKeyAlgorithm.PKEY2005 ? "B8731595-A2F6-430B-A799-FBFFB81A8D73" : "660672EF-7809-4CFD-8D54-41B7FB738988";
writer.Write(new Guid(algoId).ToByteArray());
writer.Write(Group); writer.Write(Group);
writer.Write(serialHigh); writer.Write(serialHigh);
writer.Write(serialLow); writer.Write(serialLow);

View File

@ -113,7 +113,7 @@ namespace LibTSforge.SPP
} }
catch (InvalidOperationException ex) catch (InvalidOperationException ex)
{ {
Logger.WriteLine("Warning: Starting slsvc failed, retrying. Details:" + ex.Message); Logger.WriteLine("Warning: Starting slsvc failed, retrying. Details: " + ex.Message);
System.Threading.Thread.Sleep(500); System.Threading.Thread.Sleep(500);
continue; continue;
} }
@ -161,11 +161,10 @@ namespace LibTSforge.SPP
default: default:
return Path.Combine( return Path.Combine(
Environment.ExpandEnvironmentVariables( Environment.ExpandEnvironmentVariables(
(string)RegistryKey.OpenRemoteBaseKey(RegistryHive.LocalMachine, Environment.MachineName) (string)Registry.GetValue(
.OpenSubKey("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SoftwareProtectionPlatform") @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform",
.GetValue(
"TokenStore", "TokenStore",
string.Empty @"C:\Windows\System32\spp\store\2.0"
) )
), ),
"data.dat" "data.dat"
@ -190,11 +189,10 @@ namespace LibTSforge.SPP
default: default:
return Path.Combine( return Path.Combine(
Environment.ExpandEnvironmentVariables( Environment.ExpandEnvironmentVariables(
(string)RegistryKey.OpenRemoteBaseKey(RegistryHive.LocalMachine, Environment.MachineName) (string)Registry.GetValue(
.OpenSubKey("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SoftwareProtectionPlatform") @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform",
.GetValue(
"TokenStore", "TokenStore",
string.Empty @"C:\Windows\System32\spp\store\2.0"
) )
), ),
"tokens.dat" "tokens.dat"