Support Enable ARM translation layer

Author: chsbuffer

HPEInstallation.cs

@@ -14,10 +14,12 @@ class BackupFile(string installPath, string relativePath, string? name = null) :
 	private readonly string Name = name ?? relativePath;
 	public readonly string SourcePath = Path.Combine(installPath, relativePath);
 	public readonly string BackupPath = Path.Combine(installPath, relativePath + ".bak");
+
 	public bool Exists()
 	{
 		return File.Exists(SourcePath);
 	}
+
 	public bool BackupExists()
 	{
 		return File.Exists(BackupPath);
@@ -43,14 +45,13 @@ public void Backup()
 	public void Restore()
 	{
 		Console.WriteLine($"\n\n############# Restore {Name}");
-		if (BackupExists())
-		{
-			File.Copy(BackupPath, SourcePath, true);
-		}
-		else
+		if (!BackupExists())
 		{
 			Console.WriteLine($"Warning: {Name} not found, skipped.");
+			return;
 		}
+
+		File.Copy(BackupPath, SourcePath, true);
 	}
 }
 
@@ -154,24 +155,21 @@ public void Unlock()
 		Console.WriteLine("\n\n############# Patch bios.rom");
 		UnlockCommand.PatchBios(bios.SourcePath);
 
-		serviceExe.Backup();
+		serviceConfig.Backup();
 		Console.WriteLine("\n\n############# Patch Service.exe.config");
 		UnlockCommand.PatchKernelCmdline(serviceConfig.SourcePath);
 
-		serviceLib.Backup();
-
-		if (!Dev)
+		if (serviceLib.Exists())
+		{
+			serviceLib.Backup();
+			Console.WriteLine("\n\n############# Patch ServiceLib.dll");
+			UnlockCommand.PatchServiceExe(serviceLib.BackupPath, serviceLib.SourcePath, Dev);
+		}
+		else
 		{
-			if (serviceLib.Exists())
-			{
-				Console.WriteLine("\n\n############# Patch ServiceLib.dll");
-				UnlockCommand.PatchServiceExe(serviceLib.BackupPath, serviceLib.SourcePath);
-			}
-			else
-			{
-				Console.WriteLine("\n\n############# Patch Service.exe");
-				UnlockCommand.PatchServiceExe(serviceExe.BackupPath, serviceExe.SourcePath);
-			}
+			serviceExe.Backup();
+			Console.WriteLine("\n\n############# Patch Service.exe");
+			UnlockCommand.PatchServiceExe(serviceExe.BackupPath, serviceExe.SourcePath, Dev);
 		}
 	}
 

README.md

@@ -1,11 +1,29 @@
-# Google Play Games Super Power
+# Magisk on Google Play Games Emulator
 
-Install Magisk on Google Play Games Emulator.
+## Features
 
-# Credits
+- Remove foreground app whitelist
+- Remove install apk restriction
+- Enable ARM translation layer (libhoudini)
 
-https://github.com/chsbuffer/hpesuperpower  
-https://github.com/chsbuffer/superpower  
+Note:  
+
+- The Developer Emulator has a Launcher and you can still play most of the games from Play Store.
+- To install apk on non-dev one, open Android Settings following the [guide](https://support.google.com/googleplaygamesonpc/answer/11507425?hl=en).
+
+## Guide
+
+1. Install Google Play Games Emulator Developer Emulator as I recommend it.
+2. Open the emulator once then close it.
+3. Get [this tool](https://github.com/chsbuffer/hpesuperpower/releases/latest) and [Magisk](https://github.com/topjohnwu/Magisk?tab=readme-ov-file#downloads)
+4. Run the command with Administrator Command Prompt  
+```
+hpesuperpower.exe magisk Magisk.apk --dev
+```
+
+## Credits
+
+https://github.com/topjohnwu/Magisk  
 https://github.com/f1x3d/DiskPartitionInfo  
 https://github.com/WearCode/magiskboot_build  
 https://github.com/jbevain/cecil  

UnlockCommand.cs

@@ -27,6 +27,7 @@ public static void PatchBios(string path)
 			Console.WriteLine("hex not found, the bios might already been patched, nothing to do.");
 			return;
 		}
+
 		Console.WriteLine($"bios patched at {off:X8}");
 		to.CopyTo(bios.AsSpan(off));
 
@@ -40,50 +41,93 @@ public static void PatchKernelCmdline(string serviceConfigPath)
 		const string to = "androidboot.verifiedbootstate=orange ";
 		var xml = new XmlDocument();
 		xml.Load(serviceConfigPath);
-		var value = xml.SelectNodes("/configuration/applicationSettings/Google.Hpe.Service.Properties.EmulatorSettings/setting[@name='EmulatorGuestParameters']/value")!.Item(0)!;
+		var value = xml.SelectNodes(
+				"/configuration/applicationSettings/Google.Hpe.Service.Properties.EmulatorSettings/setting[@name='EmulatorGuestParameters']/value")
+			!.Item(0)!;
 
 		var oldParam = value.InnerText;
 		if (oldParam.Contains(to))
 		{
 			Console.WriteLine("Service.exe.config already modified, nothing to do.");
 			return;
 		}
+
 		value.InnerText = to + value.InnerText;
 		xml.Save(serviceConfigPath);
 		Console.WriteLine("Service.exe.config modified.");
 	}
 
-	public static void PatchServiceExe(string exePath, string outPath)
+	public static void PatchServiceExe(string exePath, string outPath, bool isDev)
 	{
 		// remove foreground white-list
 
 		using var popCwd = new Pushd(Path.GetDirectoryName(exePath)!);
 
-		var assembly = AssemblyDefinition.ReadAssembly(exePath, new ReaderParameters { AssemblyResolver = new DefaultAssemblyResolver() });
+		var assembly = AssemblyDefinition.ReadAssembly(exePath);
 		var module = assembly.MainModule;
 
-		// System.Void Google.Hpe.Service.AppSession.AppSessionScope::HandleEmulatorSurfaceStateUpdate(Google.Hpe.Service.Emulator.Surface.EmulatorSurfaceState,Google.Hpe.Service.Emulator.Surface.EmulatorSurfaceState)
-		var AppSessionScope = module.GetType("Google.Hpe.Service.AppSession.AppSessionScope");
-		var method = AppSessionScope.Methods.Single(x => x.Name == "HandleEmulatorSurfaceStateUpdate");
-		var instructions = method.Body.Instructions;
+		Console.WriteLine($"Version: {assembly.Name.FullName}");
 
-		var begin = instructions.FirstOrDefault(p => p.Operand is FieldDefinition f && f.Name == "_transientForegroundPackages");
+		#region Foreground app limit
 
-		if (begin == null)
+		if (!isDev)
 		{
-			Console.WriteLine("nothing to patch.");
-			return;
+			Console.WriteLine("* Remove Foreground app limit. *");
+			RemoveForegroundLimit();
 		}
-		Console.WriteLine($"Version: {assembly.Name.FullName}");
 
-		var idx = instructions.IndexOf(begin);
-		Console.WriteLine($"Patch Instruction at idx {idx}, offset IL_{begin.Offset:X4}");
+		void RemoveForegroundLimit()
+		{
+			// System.Void Google.Hpe.Service.AppSession.AppSessionScope::HandleEmulatorSurfaceStateUpdate(Google.Hpe.Service.Emulator.Surface.EmulatorSurfaceState,Google.Hpe.Service.Emulator.Surface.EmulatorSurfaceState)
+			var AppSessionScope = module.GetType("Google.Hpe.Service.AppSession.AppSessionScope");
+			var method = AppSessionScope.Methods.Single(x => x.Name == "HandleEmulatorSurfaceStateUpdate");
+			var instructions = method.Body.Instructions;
+			var begin = instructions.FirstOrDefault(p =>
+				p.Operand is FieldDefinition { Name: "_transientForegroundPackages" });
+
+			if (begin == null)
+			{
+				Console.WriteLine("nothing to patch.");
+				return;
+			}
+
+			var idx = instructions.IndexOf(begin);
+			Console.WriteLine($"Patch Instruction at idx {idx}, offset IL_{begin.Offset:X4}");
+
+			while (instructions[idx].OpCode != OpCodes.Leave_S)
+			{
+				instructions.RemoveAt(idx);
+			}
+		}
+
+		#endregion Foreground app limit
+
+		#region Houdini
 
-		while (instructions[idx].OpCode != OpCodes.Leave_S)
+		Console.WriteLine("* Enable ARM translation layer (libhoudini). *");
+		EnableHoudini(isDev);
+
+		void EnableHoudini(bool dev)
 		{
-			instructions.RemoveAt(idx);
+			string className = dev
+				? "Google.Hpe.Service.KiwiEmulator.EmulatorFeaturePolicyDev"
+				: "Google.Hpe.Service.KiwiEmulator.EmulatorFeaturePolicyProd";
+
+			var clazz = module.GetType(className);
+			var field = clazz.Fields.Single(it => it.Name.Contains("IsHoudiniEnabled"));
+			foreach (var ctor in clazz.Methods.Where(it => it.IsConstructor && !it.IsStatic))
+			{
+				var proc = ctor.Body.GetILProcessor();
+				var ret = ctor.Body.Instructions.Last();
+				proc.InsertBefore(ret, proc.Create(OpCodes.Ldarg_0));
+				proc.InsertBefore(ret, proc.Create(OpCodes.Ldc_I4_1));
+				proc.InsertBefore(ret, proc.Create(OpCodes.Stfld, field));
+			}
 		}
 
+
+		#endregion Houdini
+
 		assembly.Write(outPath);
 	}
-}
+}

hpesuperpower.csproj

@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <AnalysisLevel>latest-recommended</AnalysisLevel>
 	<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    <Version>1.1.1</Version>
+    <Version>1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>