Added patch to re-enable Dynamic Resources

Author: LennardF1989

patcher/HitmanPatcher.Core/AOBScanner.cs

@@ -68,6 +68,15 @@ public static bool TryGetHitmanVersionByScanning(Process process,
                     tasks =>
                         tasks.Select(task => task.Result)
                             .Where(x => x != null));
+            
+            Task<IEnumerable<Patch[]>> getDynresEnablePatches =
+                Task.Factory.ContinueWhenAll(new Task<Patch[]>[]
+                    {
+                        findDynresEnable(exeData),
+                    },
+                    tasks =>
+                        tasks.Select(task => task.Result)
+                            .Where(x => x != null));
 
 
             Task<IEnumerable<Patch[]>>[] alltasks =
@@ -76,7 +85,7 @@ public static bool TryGetHitmanVersionByScanning(Process process,
                 getProtocolPatches, getDynresForceofflinePatches
             };
             // ReSharper disable once CoVariantArrayConversion
-            Task.WaitAll(alltasks);
+            Task.WaitAll([..alltasks, getDynresEnablePatches]);
 
             bench.Stop();
 #if DEBUG
@@ -96,7 +105,8 @@ public static bool TryGetHitmanVersionByScanning(Process process,
             Note("AuthHeader2", getAuthheadPatches.Result.First()[1]);
             Note("ConfigDomain", getConfigdomainPatches.Result.First()[0]);
             Note("Protocol", getProtocolPatches.Result.First()[0]);
-            Note("DynamicResources", getDynresForceofflinePatches.Result.First()[0]);
+            Note("DynamicResources->ForceOffline", getDynresForceofflinePatches.Result.First()[0]);
+            Note("DynamicResources->Enable", getDynresEnablePatches.Result.FirstOrDefault()?[0]);
 #endif
 
             result = new HitmanVersion()
@@ -106,7 +116,9 @@ public static bool TryGetHitmanVersionByScanning(Process process,
                 configdomain = getConfigdomainPatches.Result.First(),
                 protocol = getProtocolPatches.Result.First(),
                 dynres_noforceoffline =
-                    getDynresForceofflinePatches.Result.First()
+                    getDynresForceofflinePatches.Result.First(),
+                dynres_enable = 
+                    getDynresEnablePatches.Result.FirstOrDefault() ?? []
             };
 
             return true;
@@ -117,6 +129,13 @@ public static bool TryGetHitmanVersionByScanning(Process process,
 #if DEBUG
         private static void Note(string name, Patch patch)
         {
+            if (patch == null)
+            {
+                Compositions.Logger.log($"{name}: n/a");
+                
+                return;
+            }
+            
             Compositions.Logger.log($"{name}: {patch.offset:X} {BitConverter.ToString(patch.original).Replace("-", string.Empty)} {BitConverter.ToString(patch.patch).Replace("-", string.Empty)}");
         }
 #endif
@@ -528,6 +547,31 @@ private static Task<Patch[]> findDynresForceoffline(byte[] data)
 
         #endregion
 
+        #region dynres_enable
+
+        private static Task<Patch[]> findDynresEnable(byte[] data)
+        {
+            return Task.Factory.ContinueWhenAll(new[]
+            {
+                Task.Factory.StartNew(() => findPattern(data, 0x4, "ba502e23f1488d0d")) // 3.210
+					.ContinueWith(task =>
+                        task.Result.Select(addr => addr + 0x22 + BitConverter.ToInt32(data, addr + 0x1A)).ToArray()),
+            }, tasks =>
+            {
+                IEnumerable<int> offsets =
+                    tasks.SelectMany(task => task.Result);
+                if (offsets.Count() != 1)
+                    return null;
+                return new[]
+                {
+                    new Patch(offsets.First(), "01", "00",
+                        MemProtection.PAGE_EXECUTE_READWRITE)
+                };
+            });
+        }
+
+        #endregion
+
         private static int[] findPattern(byte[] data, byte alignment,
             string pattern)
         {

patcher/HitmanPatcher.Core/HitmanVersion.cs

@@ -34,7 +34,7 @@ public Patch(int offset, string original, string patch, MemProtection defaultPro
 
     public class HitmanVersion
     {
-        public Patch[] certpin, authheader, configdomain, protocol, dynres_noforceoffline;
+        public Patch[] certpin, authheader, configdomain, protocol, dynres_noforceoffline, dynres_enable;
 
         private static Dictionary<uint, string> timestampMap = new Dictionary<uint, string>();
 

patcher/HitmanPatcher.Core/MemoryPatcher.cs

@@ -184,6 +184,10 @@ public static bool Patch(Process process, Options patchOptions)
 				{
 					patches.AddRange(v.protocol);
 				}
+				if (patchOptions.EnableDynamicResources)
+				{
+					patches.AddRange(v.dynres_enable);
+				}
 				if (patchOptions.DisableForceOfflineOnFailedDynamicResources)
 				{
 					patches.AddRange(v.dynres_noforceoffline);
@@ -275,6 +279,7 @@ public struct Options
 			public bool SetCustomConfigDomain;
 			public string CustomConfigDomain;
 			public bool UseHttp;
+			public bool EnableDynamicResources;
 			public bool DisableForceOfflineOnFailedDynamicResources;
         }
 

patcher/HitmanPatcher.Core/Settings.cs

@@ -22,6 +22,7 @@ public Settings()
                 DisableCertPinning = true,
                 AlwaysSendAuthHeader = true,
                 SetCustomConfigDomain = true,
+                EnableDynamicResources = true,
                 DisableForceOfflineOnFailedDynamicResources = true,
             };
             darkModeEnabled = false;

patcher/HitmanPatcher/OptionsForm.cs

@@ -59,6 +59,7 @@ public Settings Settings
                     {
                         CustomConfigDomain = customDomain,
                         UseHttp = checkBoxHttp.Checked,
+                        EnableDynamicResources = true,
                         DisableForceOfflineOnFailedDynamicResources = dynResources.Checked,
                         DisableCertPinning = true,
                         SetCustomConfigDomain = true,