Browse Source

Non-destructive permanent patcher now works

More tweaking needed before ready for release
piracy-check
Anairkoen Schno 6 years ago
parent
commit
25a666c092
5 changed files with 88 additions and 15 deletions
  1. +1
    -1
      Doorstop
  2. +7
    -2
      IPA.Injector/ConsoleWindow.cs
  3. +77
    -4
      IPA.Injector/Injector.cs
  4. +2
    -7
      IPA/IPA.csproj
  5. +1
    -1
      IPA/Program.cs

+ 1
- 1
Doorstop

@ -1 +1 @@
Subproject commit fb537afc549420a5e857700d29807dba87ed2b60
Subproject commit c5072722ea34f4c45a5f1fcabb3d9a46d1bf5eb4

+ 7
- 2
IPA.Injector/ConsoleWindow.cs View File

@ -22,11 +22,16 @@ namespace IPA.Injector.Windows
if (consoleAttached) if (consoleAttached)
{ {
InitializeOutStream();
InitializeInStream();
InitializeStreams();
} }
} }
public static void InitializeStreams()
{
InitializeOutStream();
InitializeInStream();
}
private static void InitializeOutStream() private static void InitializeOutStream()
{ {
var fs = CreateFileStream("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, FileAccess.Write); var fs = CreateFileStream("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, FileAccess.Write);


+ 77
- 4
IPA.Injector/Injector.cs View File

@ -1,12 +1,17 @@
using Harmony; using Harmony;
using IPA.Loader; using IPA.Loader;
using IPA.Logging; using IPA.Logging;
using Mono.Cecil;
using Mono.Cecil.Cil;
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using UnityEngine; using UnityEngine;
using static IPA.Logging.Logger; using static IPA.Logging.Logger;
using Logger = IPA.Logging.Logger;
using MethodAttributes = Mono.Cecil.MethodAttributes;
namespace IPA.Injector namespace IPA.Injector
{ {
@ -30,7 +35,9 @@ namespace IPA.Injector
// it loads Ionic.Zip. // it loads Ionic.Zip.
SetupLibraryLoading(); SetupLibraryLoading();
// This will load Harmony and UnityEngine.CoreModule
loader.Debug("Prepping bootstrapper");
// // This will load Mono.Cecil
InstallBootstrapPatch(); InstallBootstrapPatch();
} }
catch (Exception e) catch (Exception e)
@ -41,13 +48,79 @@ namespace IPA.Injector
private static void InstallBootstrapPatch() private static void InstallBootstrapPatch()
{ {
var harmony = HarmonyInstance.Create("IPA_NonDestructive_Bootstrapper");
// patch the Application static constructor to create the bootstrapper after being called
harmony.Patch(typeof(Application).TypeInitializer, null, new HarmonyMethod(typeof(Injector).GetMethod(nameof(CreateBootstrapper), BindingFlags.NonPublic | BindingFlags.Static)));
var cAsmName = Assembly.GetExecutingAssembly().GetName();
#region Insert patch into UnityEngine.CoreModule.dll
var unityPath = Path.Combine(Environment.CurrentDirectory, "Beat Saber_Data", "Managed", "UnityEngine.CoreModule.dll");
var unityAsmDef = AssemblyDefinition.ReadAssembly(unityPath);
var unityModDef = unityAsmDef.MainModule;
bool modified = false;
foreach (var asmref in unityModDef.AssemblyReferences)
{
if (asmref.Name == cAsmName.Name)
{
if (asmref.Version != cAsmName.Version)
{
asmref.Version = cAsmName.Version;
modified = true;
}
}
}
var application = unityModDef.GetType("UnityEngine", "Application");
MethodDefinition cctor = null;
foreach (var m in application.Methods)
if (m.IsRuntimeSpecialName && m.Name == ".cctor")
cctor = m;
var cbs = unityModDef.Import(((Action)CreateBootstrapper).Method);
if (cctor == null)
{
cctor = new MethodDefinition(".cctor", MethodAttributes.RTSpecialName | MethodAttributes.Static | MethodAttributes.SpecialName, unityModDef.TypeSystem.Void);
application.Methods.Add(cctor);
modified = true;
var ilp = cctor.Body.GetILProcessor();
ilp.Emit(OpCodes.Call, cbs);
ilp.Emit(OpCodes.Ret);
}
else
{
var ilp = cctor.Body.GetILProcessor();
for (int i = 0; i < Math.Min(2, cctor.Body.Instructions.Count); i++)
{
var ins = cctor.Body.Instructions[i];
if (i == 0 && (ins.OpCode != OpCodes.Call || ins.Operand != cbs))
{
ilp.Replace(ins, ilp.Create(OpCodes.Call, cbs));
modified = true;
}
if (i == 1 && ins.OpCode != OpCodes.Ret)
{
ilp.Replace(ins, ilp.Create(OpCodes.Ret));
modified = true;
}
}
}
if (modified)
unityAsmDef.Write(unityPath);
#endregion
} }
private static bool bootstrapped = false;
private static void CreateBootstrapper() private static void CreateBootstrapper()
{ {
if (bootstrapped) return;
bootstrapped = true;
// need to reinit streams singe Unity seems to redirect stdout
Windows.WinConsole.InitializeStreams();
var bootstrapper = new GameObject("NonDestructiveBootstrapper").AddComponent<Bootstrapper>(); var bootstrapper = new GameObject("NonDestructiveBootstrapper").AddComponent<Bootstrapper>();
bootstrapper.Destroyed += Bootstrapper_Destroyed; bootstrapper.Destroyed += Bootstrapper_Destroyed;
} }


+ 2
- 7
IPA/IPA.csproj View File

@ -28,8 +28,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<OtherConfig></OtherConfig>
<OtherConfig>
</OtherConfig>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -124,11 +124,6 @@
<Install>false</Install> <Install>false</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup>
<!--<ProjectsToBuild Include="$(SolutionDir)Doorstop\Proxy\Proxy.vcxproj">
<DestDir>bin\Proxy\$(Configuration)</DestDir>
</ProjectsToBuild>-->
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.


+ 1
- 1
IPA/Program.cs View File

@ -229,7 +229,7 @@ namespace IPA
} }
else else
{ {
Console.ForegroundColor = ConsoleColor.Blue;
Console.ForegroundColor = ConsoleColor.Cyan;
Console.WriteLine("Restoring old version... "); Console.WriteLine("Restoring old version... ");
if (BackupManager.HasBackup(context)) if (BackupManager.HasBackup(context))
BackupManager.Restore(context); BackupManager.Restore(context);


Loading…
Cancel
Save