fix vista kms4k, add reset support

6 files changed, 42 insertions, 16 deletions

diff --git a/LibTSforge/Activators/KMS4K.cs b/LibTSforge/Activators/KMS4K.cs
index 315e082..01b7395 100644
--- a/LibTSforge/Activators/KMS4K.cs
+++ b/LibTSforge/Activators/KMS4K.cs
@@ -1,6 +1,7 @@
 namespace LibTSforge.Activators
 {
     using System;
+    using System.IO;
     using LibTSforge.PhysicalStore;
     using LibTSforge.SPP;
 
@@ -62,12 +63,18 @@ namespace LibTSforge.Activators
                 {
                     VistaTimer vistaTimer = new VistaTimer();
                     vistaTimer.Time = time2;
-                    vistaTimer.Expiry = expiry;
+                    vistaTimer.Expiry = Constants.TimerMax;
 
                     string vistaTimerName = string.Format("msft:sl/timer/VLExpiration/VOLUME/{0}/{1}", appId, actId);
 
                     store.DeleteBlock(key, vistaTimerName);
-                    store.DeleteBlock(key, "45E81E65-6944-422E-9C02-D83F7E5F5A58");
+                    store.DeleteBlock(key, actId.ToString());
+
+                    BinaryWriter writer = new BinaryWriter(new MemoryStream());
+                    writer.Write(Constants.KMSv4Response.Length);
+                    writer.Write(Constants.KMSv4Response);
+                    writer.Write(Constants.UniversalHWIDBlock);
+                    byte[] kmsData = writer.GetBytes();
 
                     store.AddBlocks(new PSBlock[]
                     {
@@ -84,8 +91,8 @@ namespace LibTSforge.Activators
                             Type = BlockType.NAMED,
                             Flags = 0,
                             KeyAsStr = key,
-                            ValueAsStr = "45E81E65-6944-422E-9C02-D83F7E5F5A58",
-                            Data = new Guid().ToByteArray()
+                            ValueAsStr = actId.ToString(),
+                            Data = kmsData
                         }
                     });
                 }
@@ -191,7 +198,7 @@ namespace LibTSforge.Activators
                 }
             }
 
-                SPPUtils.RestartSPP(version);
+            SPPUtils.RestartSPP(version);
             SLApi.FireStateChangedEvent(appId);
             Logger.WriteLine("Activated using KMS4k successfully.");
         }
diff --git a/LibTSforge/Common.cs b/LibTSforge/Common.cs
index 6973f6f..a1b4294 100644
--- a/LibTSforge/Common.cs
+++ b/LibTSforge/Common.cs
@@ -87,8 +87,8 @@ namespace LibTSforge
             0x92, 0xA6, 0x56, 0x96
         };
 
-        // 2^31 - 1 minutes
-        public static ulong TimerMax = (ulong)TimeSpan.FromMinutes(2147483647).Ticks;
+        // 2^31 - 8 minutes
+        public static ulong TimerMax = (ulong)TimeSpan.FromMinutes(2147483640).Ticks;
 
         public static readonly string ZeroCID = new string('0', 48);
     }
diff --git a/LibTSforge/Modifiers/KeyChangeLockDelete.cs b/LibTSforge/Modifiers/KeyChangeLockDelete.cs
index 5150a41..3883d3c 100644
--- a/LibTSforge/Modifiers/KeyChangeLockDelete.cs
+++ b/LibTSforge/Modifiers/KeyChangeLockDelete.cs
@@ -5,11 +5,14 @@ namespace LibTSforge.Modifiers
     using LibTSforge.PhysicalStore;
     using LibTSforge.SPP;
     using LibTSforge;
+    using System;
 
     public static class KeyChangeLockDelete
     {
         public static void Delete(PSVersion version, bool production)
         {
+            if (version == PSVersion.Vista) throw new NotSupportedException("This feature is not supported on Windows Vista/Server 2008.");
+
             SPPUtils.KillSPP(version);
             Logger.WriteLine("Writing TrustedStore data...");
             using (IPhysicalStore store = SPPUtils.GetStore(version, production))
diff --git a/LibTSforge/Modifiers/RearmReset.cs b/LibTSforge/Modifiers/RearmReset.cs
index a17c005..4b611b6 100644
--- a/LibTSforge/Modifiers/RearmReset.cs
+++ b/LibTSforge/Modifiers/RearmReset.cs
@@ -2,6 +2,7 @@ namespace LibTSforge.Modifiers
 {
     using System;
     using System.Collections.Generic;
+    using System.Data;
     using System.Linq;
     using LibTSforge.PhysicalStore;
     using LibTSforge.SPP;
@@ -18,7 +19,11 @@ namespace LibTSforge.Modifiers
             {
                 List<PSBlock> blocks;
 
-                if (version == PSVersion.Win7)
+                if (version == PSVersion.Vista)
+                {
+                    blocks = store.FindBlocks("740D70D8-6448-4b2f-9063-4A7A463600C5").ToList();
+                }
+                else if (version == PSVersion.Win7)
                 {
                     blocks = store.FindBlocks(0xA0000).ToList();
                 }
@@ -29,7 +34,11 @@ namespace LibTSforge.Modifiers
 
                 foreach (PSBlock block in blocks)
                 {
-                    if (version == PSVersion.Win7)
+                    if (version == PSVersion.Vista)
+                    {
+                        store.DeleteBlock(block.KeyAsStr, block.ValueAsStr);
+                    }
+                    else if (version == PSVersion.Win7)
                     {
                         store.SetBlock(block.KeyAsStr, block.ValueAsInt, new byte[8]);
                     }
diff --git a/LibTSforge/Modifiers/TamperedFlagsDelete.cs b/LibTSforge/Modifiers/TamperedFlagsDelete.cs
index 55ba1ec..ecd9267 100644
--- a/LibTSforge/Modifiers/TamperedFlagsDelete.cs
+++ b/LibTSforge/Modifiers/TamperedFlagsDelete.cs
@@ -15,21 +15,24 @@ namespace LibTSforge.Modifiers
 
             using (IPhysicalStore store = SPPUtils.GetStore(version, production))
             {
-                if (version != PSVersion.Win7)
+                if  (version == PSVersion.Vista)
                 {
-                    string recreatedFlag = "__##USERSEP-RESERVED##__$$RECREATED-FLAG$$";
-                    string recoveredFlag = "__##USERSEP-RESERVED##__$$RECOVERED-FLAG$$";
-
-                    DeleteFlag(store, recreatedFlag);
-                    DeleteFlag(store, recoveredFlag);
+                    DeleteFlag(store, "6BE8425B-E3CF-4e86-A6AF-5863E3DCB606");
                 }
-                else
+                else if (version == PSVersion.Win7)
                 {
                     SetFlag(store, 0xA0001);
                 }
+                else
+                {
+                    DeleteFlag(store, "__##USERSEP-RESERVED##__$$RECREATED-FLAG$$");
+                    DeleteFlag(store, "__##USERSEP-RESERVED##__$$RECOVERED-FLAG$$");
+                }
 
                 Logger.WriteLine("Successfully cleared the tamper state.");
             }
+
+            SPPUtils.RestartSPP(version);
         }
 
         private static void DeleteFlag(IPhysicalStore store, string flag)
diff --git a/LibTSforge/SPP/SPPUtils.cs b/LibTSforge/SPP/SPPUtils.cs
index f1aa32f..08dbe03 100644
--- a/LibTSforge/SPP/SPPUtils.cs
+++ b/LibTSforge/SPP/SPPUtils.cs
@@ -252,6 +252,8 @@ namespace LibTSforge.SPP
                 File.WriteAllBytes(filePath, PhysStoreCrypto.DecryptPhysicalStore(encrData, production, version));
             }
 
+            RestartSPP(version);
+
             Logger.WriteLine("Store dumped successfully to '" + filePath + "'.");
         }
 
@@ -269,6 +271,8 @@ namespace LibTSforge.SPP
                 store.WriteRaw(File.ReadAllBytes(filePath));
             }
 
+            RestartSPP(version);
+
             Logger.WriteLine("Loaded store file succesfully.");
         }
     }