Refactor and cleanup

Iemand005 · Iemand005 · commit 5ae6b4da9aa8 · 2025-05-22T02:52:38.000+02:00
diff --git a/MetroUnlocker.sln b/MetroUnlocker.sln
@@ -5,6 +5,11 @@ VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetroUnlocker", "MetroUnlocker\MetroUnlocker.csproj", "{D27EB145-0B58-43AD-BB94-BE000D236D38}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C9C14067-F9A1-4D85-A1D2-162E91B71CC3}"
+	ProjectSection(SolutionItems) = preProject
+		DependencyGraph.dgml = DependencyGraph.dgml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/MetroUnlocker/App.cs b/MetroUnlocker/App.cs
@@ -17,38 +17,38 @@ namespace MetroUnlocker
 {
     public partial class App : Form
     {
-        public const string AppxKey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\Appx";
+        public const string AppxRegistryKey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\Appx";
 
-        string trustedAppsPolicyName = "AllowAllTrustedApps";
-        string developmentPolicyName = "AllowDevelopmentWithoutDevLicense";
-        string specialProfilesPolicyName = "AllowDeploymentInSpecialProfiles";
+        string TrustedAppsPolicyName = "AllowAllTrustedApps";
+        string DevelopmentPolicyName = "AllowDevelopmentWithoutDevLicense";
+        string SpecialProfilesPolicyName = "AllowDeploymentInSpecialProfiles";
 
         public bool LOBEnabled
         {
-            get { return GetGroupPolicy(trustedAppsPolicyName); }
-            set { SetGroupPolicy(trustedAppsPolicyName, value); }
+            get { return GetGroupPolicy(TrustedAppsPolicyName); }
+            set { SetGroupPolicy(TrustedAppsPolicyName, value); }
         }
 
         public bool DevelopmentEnabled
         {
-            get { return GetGroupPolicy(developmentPolicyName); }
-            set { SetGroupPolicy(developmentPolicyName, value); }
+            get { return GetGroupPolicy(DevelopmentPolicyName); }
+            set { SetGroupPolicy(DevelopmentPolicyName, value); }
         }
 
         public bool SpecialProfilesEnabled
         {
-            get { return GetGroupPolicy(specialProfilesPolicyName); }
-            set { SetGroupPolicy(specialProfilesPolicyName, value); }
+            get { return GetGroupPolicy(SpecialProfilesPolicyName); }
+            set { SetGroupPolicy(SpecialProfilesPolicyName, value); }
         }
 
         public void SetGroupPolicy(string policyName, bool enabled)
         {
-            Registry.SetValue(AppxKey, policyName, enabled ? 1 : 0, RegistryValueKind.DWord);
+            Registry.SetValue(AppxRegistryKey, policyName, enabled ? 1 : 0, RegistryValueKind.DWord);
         }
 
         public bool GetGroupPolicy(string policyName)
         {
-            object value = Registry.GetValue(AppxKey, policyName, 0);
+            object value = Registry.GetValue(AppxRegistryKey, policyName, 0);
             return value is int ? (int)value == 1 : false;
         }
 
diff --git a/MetroUnlocker/Common.cs b/MetroUnlocker/Common.cs
@@ -45,9 +45,6 @@ public static class Constants
 
     public static class Utils
     {
-        [DllImport("kernel32.dll")]
-        public static extern uint GetSystemDefaultLCID();
-
         public static string GetArchitecture()
         {
             string arch = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE", EnvironmentVariableTarget.Machine).ToUpperInvariant();
diff --git a/MetroUnlocker/LibTSForge/Crypto/CryptoUtils.cs b/MetroUnlocker/LibTSForge/Crypto/CryptoUtils.cs
@@ -6,13 +6,13 @@ namespace MetroUnlocker.LibTSForge.Crypto
 {
     public static class CryptoUtils
     {
-        public static byte[] GenerateRandomKey(int len)
+        public static byte[] GenerateRandomKey(int length)
         {
-            byte[] rand = new byte[len];
-            Random r = new Random();
-            r.NextBytes(rand);
+            byte[] randomKey = new byte[length];
+            Random random = new Random();
+            random.NextBytes(randomKey);
 
-            return rand;
+            return randomKey;
         }
 
         public static byte[] AESEncrypt(byte[] data, byte[] key)
diff --git a/MetroUnlocker/LibTSForge/Crypto/PhysicalStoreCrypto.cs b/MetroUnlocker/LibTSForge/Crypto/PhysicalStoreCrypto.cs
@@ -47,19 +47,19 @@ public static byte[] EncryptPhysicalStore(byte[] data, bool production, Physical
             byte[] aesKey = Encoding.UTF8.GetBytes("Boop Foxyz nose!");
             byte[] hmacKey = CryptoUtils.GenerateRandomKey(0x10);
 
-            byte[] encAesKey = CryptoUtils.RSAEncrypt(rsaKey, aesKey);
-            byte[] aesKeySig = CryptoUtils.RSASign(rsaKey, encAesKey);
-            byte[] hmacSig = CryptoUtils.HMACSign(hmacKey, data);
+            byte[] encryptedAesKey = CryptoUtils.RSAEncrypt(rsaKey, aesKey);
+            byte[] aesKeySignature = CryptoUtils.RSASign(rsaKey, encryptedAesKey);
+            byte[] hmacSignature = CryptoUtils.HMACSign(hmacKey, data);
 
             byte[] decData = new byte[] { };
-            decData = decData.Concat(hmacKey).Concat(hmacSig).Concat(BitConverter.GetBytes(0)).Concat(data).ToArray();
+            decData = decData.Concat(hmacKey).Concat(hmacSignature).Concat(BitConverter.GetBytes(0)).Concat(data).ToArray();
             byte[] encData = CryptoUtils.AESEncrypt(decData, aesKey);
 
             BinaryWriter bw = new BinaryWriter(new MemoryStream());
             bw.Write(versionTable[version]);
             bw.Write(Encoding.UTF8.GetBytes("UNTRUSTSTORE"));
-            bw.Write(aesKeySig);
-            bw.Write(encAesKey);
+            bw.Write(aesKeySignature);
+            bw.Write(encryptedAesKey);
             bw.Write(encData);
 
             return bw.GetBytes();
diff --git a/MetroUnlocker/LibTSForge/Modifiers/ProductKeyInstaller.cs b/MetroUnlocker/LibTSForge/Modifiers/ProductKeyInstaller.cs
@@ -22,7 +22,7 @@ public static void InstallGeneratedProductKey(PhysicalStoreVersion version, bool
             Guid instPkeyId = SLApi.GetInstalledProductKeyId(actId);
             if (instPkeyId != Guid.Empty) SLApi.UninstallProductKey(instPkeyId);
 
-            if (pkey.Algorithm != PKeyAlgorithm.PKEY2009)
+            if (pkey.Algorithm != ProductKeyAlgorithm.ProductKey2009)
                 throw new Exception("The key algorithm isn't 2009");
             
             uint status = SLApi.InstallProductKey(pkey);
diff --git a/MetroUnlocker/LibTSForge/PhysicalStore/PhysicalStore.cs b/MetroUnlocker/LibTSForge/PhysicalStore/PhysicalStore.cs
@@ -90,92 +90,33 @@ public void AddBlock(ModernBlock block)
 
         public void AddBlocks(IEnumerable<ModernBlock> blocks)
         {
-            foreach (ModernBlock block in blocks)
-            {
-                AddBlock(block);
-            }
+            foreach (ModernBlock block in blocks) AddBlock(block);
         }
 
         public ModernBlock GetBlock(string key, string value)
         {
-            List<ModernBlock> blocks = Data[key];
-
-            foreach (ModernBlock block in blocks)
-            {
-                if (block.ValueAsString == value)
-                {
-                    return new ModernBlock
-                    {
-                        Type = block.Type,
-                        Flags = block.Flags,
-                        Key = Utils.EncodeString(key),
-                        Value = block.Value,
-                        Data = block.Data
-                    };
-                }
-            }
-
-            return null;
+            if (!Data.ContainsKey(key)) return null;
+            return Data[key].Find(block => block.ValueAsString == value);
         }
 
         public ModernBlock GetBlock(string key, uint value)
         {
-            List<ModernBlock> blocks = Data[key];
-
-            foreach (ModernBlock block in blocks)
-            {
-                if (block.ValueAsInteger == value)
-                {
-                    return new ModernBlock
-                    {
-                        Type = block.Type,
-                        Flags = block.Flags,
-                        Key = Utils.EncodeString(key),
-                        Value = block.Value,
-                        Data = block.Data
-                    };
-                }
-            }
-
-            return null;
+            if (!Data.ContainsKey(key)) return null;
+            return Data[key].Find(block => block.ValueAsInteger == value);
         }
 
         public void SetBlock(string key, string value, byte[] data)
         {
-            List<ModernBlock> blocks = Data[key];
-
-            for (int i = 0; i < blocks.Count; i++)
-            {
-                ModernBlock block = blocks[i];
-
-                if (block.ValueAsString == value)
-                {
-                    block.Data = data;
-                    blocks[i] = block;
-                    break;
-                }
-            }
-
-            Data[key] = blocks;
+            if (!Data.ContainsKey(key)) return;
+            int index = Data[key].FindIndex(block => block.ValueAsString == value);
+            Data[key][index].Data = data;
         }
 
         public void SetBlock(string key, uint value, byte[] data)
         {
-            List<ModernBlock> blocks = Data[key];
-
-            for (int i = 0; i < blocks.Count; i++)
-            {
-                ModernBlock block = blocks[i];
-
-                if (block.ValueAsInteger == value)
-                {
-                    block.Data = data;
-                    blocks[i] = block;
-                    break;
-                }
-            }
-
-            Data[key] = blocks;
+            if (!Data.ContainsKey(key)) return;
+            int index = Data[key].FindIndex(block => block.ValueAsInteger == value);
+            Data[key][index].Data = data;
         }
 
         public void SetBlock(string key, string value, string data)
@@ -200,40 +141,12 @@ public void SetBlock(string key, uint value, uint data)
 
         public void DeleteBlock(string key, string value)
         {
-            if (Data.ContainsKey(key))
-            {
-                List<ModernBlock> blocks = Data[key];
-
-                foreach (ModernBlock block in blocks)
-                {
-                    if (block.ValueAsString == value)
-                    {
-                        blocks.Remove(block);
-                        break;
-                    }
-                }
-
-                Data[key] = blocks;
-            }
+            Data[key].Remove(GetBlock(key, value));
         }
 
         public void DeleteBlock(string key, uint value)
         {
-            if (Data.ContainsKey(key))
-            {
-                List<ModernBlock> blocks = Data[key];
-
-                foreach (ModernBlock block in blocks)
-                {
-                    if (block.ValueAsInteger == value)
-                    {
-                        blocks.Remove(block);
-                        break;
-                    }
-                }
-
-                Data[key] = blocks;
-            }
+            Data[key].Remove(GetBlock(key, value));
         }
 
         public static string GetPath()
diff --git a/MetroUnlocker/LibTSForge/SPP/NativeMethods.cs b/MetroUnlocker/LibTSForge/SPP/NativeMethods.cs
@@ -0,0 +1,91 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using System.Runtime.InteropServices;
+
+namespace MetroUnlocker.LibTSForge.SPP
+{
+    public enum SLIDType
+    {
+        Application,
+        ProductSku,
+        LicenseFile,
+        License,
+        ProductKey,
+        AllLicenses,
+        AllLicenseFiles,
+        StoreToken,
+        Last
+    }
+
+    public enum SLDataType
+    {
+        None,
+        String,
+        DWord,
+        Binary,
+        MultiString,
+        Sum
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct SLLicensingStatus
+    {
+        public Guid SkuId;
+        public uint Status;
+        public uint GraceTimeDWord;
+        public uint TotalGraceDaysDWord;
+        public uint ReasonHResult;
+        public ulong ValidityExpiration;
+    }
+
+    public class NativeMethods
+    {
+        [DllImport("kernel32.dll")]
+        internal static extern uint GetSystemDefaultLCID();
+
+        [DllImport("sppc.dll", CharSet = CharSet.Unicode, PreserveSig = false)]
+        internal static extern void SLOpen(out IntPtr hSLC);
+
+        [DllImport("sppc.dll", CharSet = CharSet.Unicode, PreserveSig = false)]
+        internal static extern void SLClose(IntPtr hSLC);
+
+        [DllImport("sppc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLInstallProofOfPurchase(IntPtr hSLC, string pwszPKeyAlgorithm, string pwszPKeyString, uint cbPKeySpecificData, byte[] pbPKeySpecificData, ref Guid PKeyId);
+
+        [DllImport("sppc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLUninstallProofOfPurchase(IntPtr hSLC, ref Guid PKeyId);
+
+        [DllImport("sppc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLGenerateOfflineInstallationId(IntPtr hSLC, ref Guid pProductSkuId, ref string ppwszInstallationId);
+
+        [DllImport("sppc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLDepositOfflineConfirmationId(IntPtr hSLC, ref Guid pProductSkuId, string pwszInstallationId, string pwszConfirmationId);
+
+        [DllImport("sppc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLGetSLIDList(IntPtr hSLC, SLIDType eQueryIdType, ref Guid pQueryId, SLIDType eReturnIdType, out uint pnReturnIds, out IntPtr ppReturnIds);
+
+        [DllImport("sppc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLGetInstalledProductKeyIds(IntPtr hSLC, ref Guid pProductSkuId, out uint pnProductKeyIds, out IntPtr ppProductKeyIds);
+
+        [DllImport("slc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLConsumeWindowsRight(uint unknown);
+
+        [DllImport("slc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLGetProductSkuInformation(IntPtr hSLC, ref Guid pProductSkuId, string pwszValueName, out SLDataType peDataType, out uint pcbValue, out IntPtr ppbValue);
+
+        [DllImport("slc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLGetProductSkuInformation(IntPtr hSLC, ref Guid pProductSkuId, string pwszValueName, IntPtr peDataType, out uint pcbValue, out IntPtr ppbValue);
+
+        [DllImport("slc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLGetLicense(IntPtr hSLC, ref Guid pLicenseFileId, out uint pcbLicenseFile, out IntPtr ppbLicenseFile);
+
+        [DllImport("slc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLSetCurrentProductKey(IntPtr hSLC, ref Guid pProductSkuId, ref Guid pProductKeyId);
+
+        [DllImport("slc.dll", CharSet = CharSet.Unicode)]
+        internal static extern uint SLFireEvent(IntPtr hSLC, string pwszEventId, ref Guid pApplicationId);
+    }
+}
diff --git a/MetroUnlocker/LibTSForge/SPP/ProductKey.cs b/MetroUnlocker/LibTSForge/SPP/ProductKey.cs
diff --git a/MetroUnlocker/LibTSForge/SPP/ProductKeyConfig.cs b/MetroUnlocker/LibTSForge/SPP/ProductKeyConfig.cs
diff --git a/MetroUnlocker/LibTSForge/SPP/SLAPI.cs b/MetroUnlocker/LibTSForge/SPP/SLAPI.cs
diff --git a/MetroUnlocker/MetroUnlocker.csproj b/MetroUnlocker/MetroUnlocker.csproj

Original file line number	Diff line number	Diff line change
`@@ -17,38 +17,38 @@ namespace MetroUnlocker`
`17`	`17`	`{`
`18`	`18`	`public partial class App : Form`
`19`	`19`	`{`
`20`		`- public const string AppxKey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\Appx";`
	`20`	`+ public const string AppxRegistryKey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\Appx";`
`21`	`21`
`22`		`- string trustedAppsPolicyName = "AllowAllTrustedApps";`
`23`		`- string developmentPolicyName = "AllowDevelopmentWithoutDevLicense";`
`24`		`- string specialProfilesPolicyName = "AllowDeploymentInSpecialProfiles";`
	`22`	`+ string TrustedAppsPolicyName = "AllowAllTrustedApps";`
	`23`	`+ string DevelopmentPolicyName = "AllowDevelopmentWithoutDevLicense";`
	`24`	`+ string SpecialProfilesPolicyName = "AllowDeploymentInSpecialProfiles";`
`25`	`25`
`26`	`26`	`public bool LOBEnabled`
`27`	`27`	`{`
`28`		`- get { return GetGroupPolicy(trustedAppsPolicyName); }`
`29`		`- set { SetGroupPolicy(trustedAppsPolicyName, value); }`
	`28`	`+ get { return GetGroupPolicy(TrustedAppsPolicyName); }`
	`29`	`+ set { SetGroupPolicy(TrustedAppsPolicyName, value); }`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public bool DevelopmentEnabled`
`33`	`33`	`{`
`34`		`- get { return GetGroupPolicy(developmentPolicyName); }`
`35`		`- set { SetGroupPolicy(developmentPolicyName, value); }`
	`34`	`+ get { return GetGroupPolicy(DevelopmentPolicyName); }`
	`35`	`+ set { SetGroupPolicy(DevelopmentPolicyName, value); }`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public bool SpecialProfilesEnabled`
`39`	`39`	`{`
`40`		`- get { return GetGroupPolicy(specialProfilesPolicyName); }`
`41`		`- set { SetGroupPolicy(specialProfilesPolicyName, value); }`
	`40`	`+ get { return GetGroupPolicy(SpecialProfilesPolicyName); }`
	`41`	`+ set { SetGroupPolicy(SpecialProfilesPolicyName, value); }`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public void SetGroupPolicy(string policyName, bool enabled)`
`45`	`45`	`{`
`46`		`- Registry.SetValue(AppxKey, policyName, enabled ? 1 : 0, RegistryValueKind.DWord);`
	`46`	`+ Registry.SetValue(AppxRegistryKey, policyName, enabled ? 1 : 0, RegistryValueKind.DWord);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public bool GetGroupPolicy(string policyName)`
`50`	`50`	`{`
`51`		`- object value = Registry.GetValue(AppxKey, policyName, 0);`
	`51`	`+ object value = Registry.GetValue(AppxRegistryKey, policyName, 0);`
`52`	`52`	`return value is int ? (int)value == 1 : false;`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,6 @@ public static class Constants`
`45`	`45`
`46`	`46`	`public static class Utils`
`47`	`47`	`{`
`48`		`- [DllImport("kernel32.dll")]`
`49`		`- public static extern uint GetSystemDefaultLCID();`
`50`		`-`
`51`	`48`	`public static string GetArchitecture()`
`52`	`49`	`{`
`53`	`50`	`string arch = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE", EnvironmentVariableTarget.Machine).ToUpperInvariant();`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@ namespace MetroUnlocker.LibTSForge.Crypto`
`6`	`6`	`{`
`7`	`7`	`public static class CryptoUtils`
`8`	`8`	`{`
`9`		`- public static byte[] GenerateRandomKey(int len)`
	`9`	`+ public static byte[] GenerateRandomKey(int length)`
`10`	`10`	`{`
`11`		`- byte[] rand = new byte[len];`
`12`		`- Random r = new Random();`
`13`		`- r.NextBytes(rand);`
	`11`	`+ byte[] randomKey = new byte[length];`
	`12`	`+ Random random = new Random();`
	`13`	`+ random.NextBytes(randomKey);`
`14`	`14`
`15`		`- return rand;`
	`15`	`+ return randomKey;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public static byte[] AESEncrypt(byte[] data, byte[] key)`