Backups/UnityExplorer
1
0
Fork 0
mirror of https://github.com/sinai-dev/UnityExplorer.git synced 2025-06-16 14:17:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ByRef parameters breaking generated patch code

Browse Source
This commit is contained in:
Sinai 2021-09-07 03:40:09 +10:00
parent 297034e38b
commit a0d5ab8792
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Hooks/HookInstance.cs
View File

@ -32,8 +32,8 @@ namespace UnityExplorer.Hooks
{ {
this.TargetMethod = targetMethod; this.TargetMethod = targetMethod;
this.shortSignature = $"{targetMethod.DeclaringType.Name}.{targetMethod.Name}"; this.shortSignature = $"{targetMethod.DeclaringType.Name}.{targetMethod.Name}";
GenerateProcessorAndDelegate(); if (GenerateProcessorAndDelegate())
Patch(); Patch();
} }
// Evaluator.source_file // Evaluator.source_file
@ -41,7 +41,7 @@ namespace UnityExplorer.Hooks
// TypeDefinition.Definition // TypeDefinition.Definition
private static readonly PropertyInfo pi_Definition = ReflectionUtility.GetPropertyInfo(typeof(TypeDefinition), "Definition"); private static readonly PropertyInfo pi_Definition = ReflectionUtility.GetPropertyInfo(typeof(TypeDefinition), "Definition");
private void GenerateProcessorAndDelegate() private bool GenerateProcessorAndDelegate()
{ {
try try
{ {
@ -52,7 +52,7 @@ namespace UnityExplorer.Hooks
scriptEvaluator.Run(GeneratePatchSourceCode(TargetMethod)); scriptEvaluator.Run(GeneratePatchSourceCode(TargetMethod));
if (ScriptEvaluator._reportPrinter.ErrorsCount > 0) if (ScriptEvaluator._reportPrinter.ErrorsCount > 0)
throw new FormatException($"Unable to compile the generated patch:\r\n{scriptEvaluator._textWriter}"); throw new FormatException($"Unable to compile the generated patch!");
// TODO: Publicize MCS to avoid this reflection // TODO: Publicize MCS to avoid this reflection
// Get the last defined type in the source file // Get the last defined type in the source file
@ -65,10 +65,13 @@ namespace UnityExplorer.Hooks
// Actually create the harmony patch // Actually create the harmony patch
this.patchDelegate = new HarmonyMethod(patchDelegateMethodInfo); this.patchDelegate = new HarmonyMethod(patchDelegateMethodInfo);
patchProcessor.AddPostfix(patchDelegate); patchProcessor.AddPostfix(patchDelegate);
return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
ExplorerCore.LogWarning($"Exception creating patch processor for target method {TargetMethod.FullDescription()}!\r\n{ex}"); ExplorerCore.LogWarning($"Exception creating patch processor for target method {TargetMethod.FullDescription()}!\r\n{ex}");
return false;
} }
} }
@ -93,7 +96,9 @@ namespace UnityExplorer.Hooks
var parameters = targetMethod.GetParameters(); var parameters = targetMethod.GetParameters();
foreach (var param in parameters) foreach (var param in parameters)
{ {
codeBuilder.Append($", {param.ParameterType.FullName} __{paramIdx}"); Type pType = param.ParameterType;
if (pType.IsByRef) pType = pType.GetElementType();
codeBuilder.Append($", {pType.FullName} __{paramIdx}");
paramIdx++; paramIdx++;
} }
@ -116,7 +121,9 @@ namespace UnityExplorer.Hooks
paramIdx = 0; paramIdx = 0;
foreach (var param in parameters) foreach (var param in parameters)
{ {
if (param.ParameterType.IsValueType) Type pType = param.ParameterType;
if (pType.IsByRef) pType = pType.GetElementType();
if (pType.IsValueType)
logMessage.AppendLine($"Parameter {paramIdx} {param.Name}: {{__{paramIdx}.ToString()}}"); logMessage.AppendLine($"Parameter {paramIdx} {param.Name}: {{__{paramIdx}.ToString()}}");
else else
logMessage.AppendLine($"Parameter {paramIdx} {param.Name}: {{__{paramIdx}?.ToString() ?? \"null\"}}"); logMessage.AppendLine($"Parameter {paramIdx} {param.Name}: {{__{paramIdx}?.ToString() ?? \"null\"}}");