massgrave/TSforge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic cleanup

Browse Source
This commit is contained in:
Lyssa 2025-04-02 14:06:52 +04:00
parent 07f43e2613
commit b8558d8fb2
10 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LibTSforge/Activators/KMS4K.cs
View File

@ -61,9 +61,11 @@ namespace LibTSforge.Activators
if (version == PSVersion.Vista)
{
VistaTimer vistaTimer = new VistaTimer();
vistaTimer.Time = time2;
vistaTimer.Expiry = Constants.TimerMax;
VistaTimer vistaTimer = new VistaTimer
{
Time = time2,
Expiry = Constants.TimerMax
};
string vistaTimerName = string.Format("msft:sl/timer/VLExpiration/VOLUME/{0}/{1}", appId, actId);

6
LibTSforge/Common.cs
View File

@ -1,16 +1,10 @@
namespace LibTSforge
{
using Microsoft.Win32;
using System;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.ServiceProcess;
using System.Text;
using LibTSforge.Crypto;
using LibTSforge.PhysicalStore;
using LibTSforge.SPP;
using LibTSforge.TokenStore;
public enum PSVersion
{

2
LibTSforge/Crypto/PhysStoreCrypto.cs
View File

@ -2,10 +2,8 @@ namespace LibTSforge.Crypto
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
public static class PhysStoreCrypto

1
LibTSforge/Modifiers/GracePeriodReset.cs
View File

@ -1,6 +1,5 @@
namespace LibTSforge.Modifiers
{
using System;
using System.Collections.Generic;
using System.Linq;
using LibTSforge.PhysicalStore;

2
LibTSforge/Modifiers/RearmReset.cs
View File

@ -1,8 +1,6 @@
namespace LibTSforge.Modifiers
{
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using LibTSforge.PhysicalStore;
using LibTSforge.SPP;

1
LibTSforge/Modifiers/TamperedFlagsDelete.cs
View File

@ -1,6 +1,5 @@
namespace LibTSforge.Modifiers
{
using System;
using System.Linq;
using LibTSforge.PhysicalStore;
using LibTSforge.SPP;

3
LibTSforge/PhysicalStore/VariableBag.cs
View File

@ -3,7 +3,6 @@ namespace LibTSforge.PhysicalStore
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.CompilerServices;
public enum CRCBlockType : uint
{
@ -155,7 +154,7 @@ namespace LibTSforge.PhysicalStore
public class VariableBag
{
public List<CRCBlock> Blocks = new List<CRCBlock>();
private PSVersion Version;
private readonly PSVersion Version;
public void Deserialize(byte[] data)
{

36
LibTSforge/SPP/PKeyConfig.cs
View File

@ -75,7 +75,7 @@ namespace LibTSforge.SPP
public class PKeyConfig
{
public Dictionary<Guid, ProductConfig> Products = new Dictionary<Guid, ProductConfig>();
private List<Guid> loadedPkeyConfigs = new List<Guid>();
private readonly List<Guid> loadedPkeyConfigs = new List<Guid>();
public void LoadConfig(Guid actId)
{
@ -136,12 +136,14 @@ namespace LibTSforge.SPP
ranges[refActIdStr] = new List<KeyRange>();
}
KeyRange keyRange = new KeyRange();
keyRange.Start = int.Parse(rangeNode.SelectSingleNode("./p:Start", nsmgr).InnerText);
keyRange.End = int.Parse(rangeNode.SelectSingleNode("./p:End", nsmgr).InnerText);
keyRange.EulaType = rangeNode.SelectSingleNode("./p:EulaType", nsmgr).InnerText;
keyRange.PartNumber = rangeNode.SelectSingleNode("./p:PartNumber", nsmgr).InnerText;
keyRange.Valid = rangeNode.SelectSingleNode("./p:IsValid", nsmgr).InnerText.ToLower() == "true";
KeyRange keyRange = new KeyRange
{
Start = int.Parse(rangeNode.SelectSingleNode("./p:Start", nsmgr).InnerText),
End = int.Parse(rangeNode.SelectSingleNode("./p:End", nsmgr).InnerText),
EulaType = rangeNode.SelectSingleNode("./p:EulaType", nsmgr).InnerText,
PartNumber = rangeNode.SelectSingleNode("./p:PartNumber", nsmgr).InnerText,
Valid = rangeNode.SelectSingleNode("./p:IsValid", nsmgr).InnerText.ToLower() == "true"
};
ranges[refActIdStr].Add(keyRange);
}
@ -155,15 +157,17 @@ namespace LibTSforge.SPP
if (keyRanges.Count > 0 && !Products.ContainsKey(refActId))
{
ProductConfig productConfig = new ProductConfig();
productConfig.GroupId = group;
productConfig.Edition = configNode.SelectSingleNode("./p:EditionId", nsmgr).InnerText;
productConfig.Description = configNode.SelectSingleNode("./p:ProductDescription", nsmgr).InnerText;
productConfig.Channel = configNode.SelectSingleNode("./p:ProductKeyType", nsmgr).InnerText;
productConfig.Randomized = configNode.SelectSingleNode("./p:ProductKeyType", nsmgr).InnerText.ToLower() == "true";
productConfig.Algorithm = algorithms[group];
productConfig.Ranges = keyRanges;
productConfig.ActivationId = refActId;
ProductConfig productConfig = new ProductConfig
{
GroupId = group,
Edition = configNode.SelectSingleNode("./p:EditionId", nsmgr).InnerText,
Description = configNode.SelectSingleNode("./p:ProductDescription", nsmgr).InnerText,
Channel = configNode.SelectSingleNode("./p:ProductKeyType", nsmgr).InnerText,
Randomized = configNode.SelectSingleNode("./p:ProductKeyType", nsmgr).InnerText.ToLower() == "true",
Algorithm = algorithms[group],
Ranges = keyRanges,
ActivationId = refActId
};
Products[refActId] = productConfig;
}

7
LibTSforge/SPP/SPSys.cs
View File

@ -2,10 +2,7 @@ namespace LibTSforge.SPP
{
using Microsoft.Win32.SafeHandles;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
public class SPSys
{
@ -24,7 +21,7 @@ namespace LibTSforge.SPP
{
SafeFileHandle file = CreateFileSafe(@"\\.\SpDevice");
IntPtr buffer = Marshal.AllocHGlobal(1);
int bytesReturned = 0;
int bytesReturned;
DeviceIoControl(file, 0x80006008, IntPtr.Zero, 0, buffer, 1, out bytesReturned, IntPtr.Zero);
bool running = Marshal.ReadByte(buffer) != 0;
Marshal.FreeHGlobal(buffer);
@ -36,7 +33,7 @@ namespace LibTSforge.SPP
{
SafeFileHandle file = CreateFileSafe(@"\\.\SpDevice");
IntPtr buffer = Marshal.AllocHGlobal(4);
int bytesReturned = 0;
int bytesReturned;
DeviceIoControl(file, start ? 0x8000a000 : 0x8000a004, IntPtr.Zero, 0, buffer, 4, out bytesReturned, IntPtr.Zero);
int result = Marshal.ReadInt32(buffer);
Marshal.FreeHGlobal(buffer);

5
LibTSforge/TokenStore/TokenStoreModern.cs
View File

@ -25,17 +25,16 @@ namespace LibTSforge.TokenStore
if (TokensFile.Length < BLOCK_SIZE) return;
TokensFile.Seek(0x24, SeekOrigin.Begin);
uint nextBlock = 0;
uint nextBlock;
BinaryReader reader = new BinaryReader(TokensFile);
do
{
uint curOffset = reader.ReadUInt32();
nextBlock = reader.ReadUInt32();
for (int i = 0; i < ENTRIES_PER_BLOCK; i++)
{
curOffset = reader.ReadUInt32();
uint curOffset = reader.ReadUInt32();
bool populated = reader.ReadUInt32() == 1;
uint contentOffset = reader.ReadUInt32();
uint contentLength = reader.ReadUInt32();