mirror of
https://github.com/massgravel/Microsoft-Activation-Scripts.git
synced 2025-12-05 03:34:54 +01:00
Fixed an issue with TSforge caused by updated pkeyconfig on 22631.5840. Thanks to WitherOrNot for the fix.
This commit is contained in:
WindowsAddict
parent
a8f6d051a6
commit
caffa62abe
2 changed files with 80 additions and 62 deletions
|
|
@ -6322,7 +6322,7 @@ using System.Xml.Linq;
|
|||
}
|
||||
#endif
|
||||
|
||||
// Common.cs
|
||||
// LibTSforge/Common.cs
|
||||
namespace LibTSforge
|
||||
{
|
||||
using System;
|
||||
|
|
@ -6564,7 +6564,7 @@ namespace LibTSforge
|
|||
}
|
||||
|
||||
|
||||
// SPP/PKeyConfig.cs
|
||||
// LibTSforge/SPP/PKeyConfig.cs
|
||||
namespace LibTSforge.SPP
|
||||
{
|
||||
using System;
|
||||
|
|
@ -6590,7 +6590,7 @@ namespace LibTSforge.SPP
|
|||
|
||||
public bool Contains(int n)
|
||||
{
|
||||
return Start <= n && End <= n;
|
||||
return Start <= n && n <= End;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6720,10 +6720,19 @@ namespace LibTSforge.SPP
|
|||
string refActIdStr = configNode.SelectSingleNode("./p:ActConfigId", nsmgr).InnerText;
|
||||
Guid refActId = new Guid(refActIdStr);
|
||||
int group = int.Parse(configNode.SelectSingleNode("./p:RefGroupId", nsmgr).InnerText);
|
||||
List<KeyRange> keyRanges = ranges[refActIdStr];
|
||||
List<KeyRange> keyRanges;
|
||||
ranges.TryGetValue(refActIdStr, out keyRanges);
|
||||
|
||||
if (keyRanges == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (keyRanges.Count > 0 && !Products.ContainsKey(refActId))
|
||||
{
|
||||
PKeyAlgorithm algorithm;
|
||||
algorithms.TryGetValue(group, out algorithm);
|
||||
|
||||
ProductConfig productConfig = new ProductConfig
|
||||
{
|
||||
GroupId = group,
|
||||
|
|
@ -6731,7 +6740,7 @@ namespace LibTSforge.SPP
|
|||
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],
|
||||
Algorithm = algorithm,
|
||||
Ranges = keyRanges,
|
||||
ActivationId = refActId
|
||||
};
|
||||
|
|
@ -6781,7 +6790,7 @@ namespace LibTSforge.SPP
|
|||
}
|
||||
|
||||
|
||||
// SPP/ProductKey.cs
|
||||
// LibTSforge/SPP/ProductKey.cs
|
||||
namespace LibTSforge.SPP
|
||||
{
|
||||
using System;
|
||||
|
|
@ -7097,7 +7106,7 @@ namespace LibTSforge.SPP
|
|||
}
|
||||
|
||||
|
||||
// SPP/SLAPI.cs
|
||||
// LibTSforge/SPP/SLAPI.cs
|
||||
namespace LibTSforge.SPP
|
||||
{
|
||||
using System;
|
||||
|
|
@ -7510,7 +7519,7 @@ namespace LibTSforge.SPP
|
|||
}
|
||||
|
||||
|
||||
// SPP/SPPUtils.cs
|
||||
// LibTSforge/SPP/SPPUtils.cs
|
||||
namespace LibTSforge.SPP
|
||||
{
|
||||
using Microsoft.Win32;
|
||||
|
|
@ -7847,7 +7856,7 @@ namespace LibTSforge.SPP
|
|||
}
|
||||
|
||||
|
||||
// SPP/SPSys.cs
|
||||
// LibTSforge/SPP/SPSys.cs
|
||||
namespace LibTSforge.SPP
|
||||
{
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
|
@ -7894,7 +7903,7 @@ namespace LibTSforge.SPP
|
|||
}
|
||||
|
||||
|
||||
// Crypto/CryptoUtils.cs
|
||||
// LibTSforge/Crypto/CryptoUtils.cs
|
||||
namespace LibTSforge.Crypto
|
||||
{
|
||||
using System;
|
||||
|
|
@ -8029,7 +8038,7 @@ namespace LibTSforge.Crypto
|
|||
}
|
||||
|
||||
|
||||
// Crypto/Keys.cs
|
||||
// LibTSforge/Crypto/Keys.cs
|
||||
namespace LibTSforge.Crypto
|
||||
{
|
||||
public static class Keys
|
||||
|
|
@ -8119,7 +8128,7 @@ namespace LibTSforge.Crypto
|
|||
}
|
||||
|
||||
|
||||
// Crypto/PhysStoreCrypto.cs
|
||||
// LibTSforge/Crypto/PhysStoreCrypto.cs
|
||||
namespace LibTSforge.Crypto
|
||||
{
|
||||
using System;
|
||||
|
|
@ -8204,7 +8213,7 @@ namespace LibTSforge.Crypto
|
|||
}
|
||||
|
||||
|
||||
// Modifiers/GenPKeyInstall.cs
|
||||
// LibTSforge/Modifiers/GenPKeyInstall.cs
|
||||
namespace LibTSforge.Modifiers
|
||||
{
|
||||
using System;
|
||||
|
|
@ -8415,7 +8424,7 @@ namespace LibTSforge.Modifiers
|
|||
}
|
||||
|
||||
|
||||
// Modifiers/GracePeriodReset.cs
|
||||
// LibTSforge/Modifiers/GracePeriodReset.cs
|
||||
namespace LibTSforge.Modifiers
|
||||
{
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -8448,7 +8457,7 @@ namespace LibTSforge.Modifiers
|
|||
}
|
||||
|
||||
|
||||
// Modifiers/KeyChangeLockDelete.cs
|
||||
// LibTSforge/Modifiers/KeyChangeLockDelete.cs
|
||||
namespace LibTSforge.Modifiers
|
||||
{
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -8488,7 +8497,7 @@ namespace LibTSforge.Modifiers
|
|||
}
|
||||
|
||||
|
||||
// Modifiers/KMSHostCharge.cs
|
||||
// LibTSforge/Modifiers/KMSHostCharge.cs
|
||||
namespace LibTSforge.Modifiers
|
||||
{
|
||||
using System;
|
||||
|
|
@ -8649,7 +8658,7 @@ namespace LibTSforge.Modifiers
|
|||
}
|
||||
|
||||
|
||||
// Modifiers/RearmReset.cs
|
||||
// LibTSforge/Modifiers/RearmReset.cs
|
||||
namespace LibTSforge.Modifiers
|
||||
{
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -8705,7 +8714,7 @@ namespace LibTSforge.Modifiers
|
|||
}
|
||||
|
||||
|
||||
// Modifiers/SetIIDParams.cs
|
||||
// LibTSforge/Modifiers/SetIIDParams.cs
|
||||
namespace LibTSforge.Modifiers
|
||||
{
|
||||
using PhysicalStore;
|
||||
|
|
@ -8774,7 +8783,7 @@ namespace LibTSforge.Modifiers
|
|||
}
|
||||
|
||||
|
||||
// Modifiers/TamperedFlagsDelete.cs
|
||||
// LibTSforge/Modifiers/TamperedFlagsDelete.cs
|
||||
namespace LibTSforge.Modifiers
|
||||
{
|
||||
using System.Linq;
|
||||
|
|
@ -8824,7 +8833,7 @@ namespace LibTSforge.Modifiers
|
|||
}
|
||||
|
||||
|
||||
// Modifiers/UniqueIdDelete.cs
|
||||
// LibTSforge/Modifiers/UniqueIdDelete.cs
|
||||
namespace LibTSforge.Modifiers
|
||||
{
|
||||
using System;
|
||||
|
|
@ -8883,7 +8892,7 @@ namespace LibTSforge.Modifiers
|
|||
}
|
||||
|
||||
|
||||
// Activators/KMS4K.cs
|
||||
// LibTSforge/Activators/KMS4K.cs
|
||||
namespace LibTSforge.Activators
|
||||
{
|
||||
using System;
|
||||
|
|
@ -9094,7 +9103,7 @@ namespace LibTSforge.Activators
|
|||
}
|
||||
|
||||
|
||||
// Activators/ZeroCID.cs
|
||||
// LibTSforge/Activators/ZeroCID.cs
|
||||
namespace LibTSforge.Activators
|
||||
{
|
||||
using System;
|
||||
|
|
@ -9283,7 +9292,7 @@ namespace LibTSforge.Activators
|
|||
}
|
||||
|
||||
|
||||
// TokenStore/Common.cs
|
||||
// LibTSforge/TokenStore/Common.cs
|
||||
namespace LibTSforge.TokenStore
|
||||
{
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -9353,7 +9362,7 @@ namespace LibTSforge.TokenStore
|
|||
}
|
||||
|
||||
|
||||
// TokenStore/ITokenStore.cs
|
||||
// LibTSforge/TokenStore/ITokenStore.cs
|
||||
namespace LibTSforge.TokenStore
|
||||
{
|
||||
using System;
|
||||
|
|
@ -9373,7 +9382,7 @@ namespace LibTSforge.TokenStore
|
|||
}
|
||||
|
||||
|
||||
// TokenStore/TokenStoreModern.cs
|
||||
// LibTSforge/TokenStore/TokenStoreModern.cs
|
||||
namespace LibTSforge.TokenStore
|
||||
{
|
||||
using System;
|
||||
|
|
@ -9659,7 +9668,7 @@ namespace LibTSforge.TokenStore
|
|||
}
|
||||
|
||||
|
||||
// PhysicalStore/Common.cs
|
||||
// LibTSforge/PhysicalStore/Common.cs
|
||||
namespace LibTSforge.PhysicalStore
|
||||
{
|
||||
using System.Runtime.InteropServices;
|
||||
|
|
@ -9690,7 +9699,7 @@ namespace LibTSforge.PhysicalStore
|
|||
}
|
||||
|
||||
|
||||
// PhysicalStore/IPhysicalStore.cs
|
||||
// LibTSforge/PhysicalStore/IPhysicalStore.cs
|
||||
namespace LibTSforge.PhysicalStore
|
||||
{
|
||||
using System;
|
||||
|
|
@ -9785,7 +9794,7 @@ namespace LibTSforge.PhysicalStore
|
|||
}
|
||||
|
||||
|
||||
// PhysicalStore/PhysicalStoreModern.cs
|
||||
// LibTSforge/PhysicalStore/PhysicalStoreModern.cs
|
||||
namespace LibTSforge.PhysicalStore
|
||||
{
|
||||
using System;
|
||||
|
|
@ -10203,7 +10212,7 @@ namespace LibTSforge.PhysicalStore
|
|||
}
|
||||
|
||||
|
||||
// PhysicalStore/PhysicalStoreVista.cs
|
||||
// LibTSforge/PhysicalStore/PhysicalStoreVista.cs
|
||||
namespace LibTSforge.PhysicalStore
|
||||
{
|
||||
using System;
|
||||
|
|
@ -10562,7 +10571,7 @@ namespace LibTSforge.PhysicalStore
|
|||
}
|
||||
|
||||
|
||||
// PhysicalStore/PhysicalStoreWin7.cs
|
||||
// LibTSforge/PhysicalStore/PhysicalStoreWin7.cs
|
||||
namespace LibTSforge.PhysicalStore
|
||||
{
|
||||
using System;
|
||||
|
|
@ -10939,7 +10948,7 @@ namespace LibTSforge.PhysicalStore
|
|||
}
|
||||
|
||||
|
||||
// PhysicalStore/VariableBag.cs
|
||||
// LibTSforge/PhysicalStore/VariableBag.cs
|
||||
namespace LibTSforge.PhysicalStore
|
||||
{
|
||||
using System;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue