ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: injector race condition

Browse source
This commit is contained in:
goat 2020-06-08 02:57:04 +02:00
parent a4c3e60105
commit 458d9a5185
2 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Dalamud.Injector/Program.cs
View file

@ -73,6 +73,8 @@ namespace Dalamud.Injector {
// Inject to process
Inject(process, startInfo);
Thread.Sleep(1000);
// Inject exception handler
NativeInject(process);
}
@ -92,9 +94,15 @@ namespace Dalamud.Injector {
Console.WriteLine("Injected");
}
private static void NativeInject(Process process) {
private static void NativeInject(Process process)
{
var libPath = Path.GetFullPath("DalamudDebugStub.dll");
var pathBytes = Encoding.Unicode.GetBytes(libPath);
var len = pathBytes.Length + 1;
Console.WriteLine($"Injecting {libPath}...");
var handle = NativeFunctions.OpenProcess(
NativeFunctions.ProcessAccessFlags.All,
false,
@ -106,25 +114,28 @@ namespace Dalamud.Injector {
var dllMem = NativeFunctions.VirtualAllocEx(
handle,
IntPtr.Zero,
libPath.Length,
NativeFunctions.AllocationType.Reserve | NativeFunctions.AllocationType.Commit,
NativeFunctions.MemoryProtection.ExecuteReadWrite);
len,
NativeFunctions.AllocationType.Commit,
NativeFunctions.MemoryProtection.ReadWrite);
if (dllMem == IntPtr.Zero)
throw new Win32Exception(Marshal.GetLastWin32Error(), "Could not alloc memory");
throw new Win32Exception(Marshal.GetLastWin32Error(), $"Could not alloc memory {Marshal.GetLastWin32Error():X}");
Console.WriteLine($"dll path at {dllMem.ToInt64():X}");
var pathBytes = Encoding.ASCII.GetBytes(libPath);
if (!NativeFunctions.WriteProcessMemory(
handle,
dllMem,
pathBytes,
pathBytes.Length,
out var bytesread
len,
out var bytesWritten
))
throw new Win32Exception(Marshal.GetLastWin32Error(), "Could not write DLL");
Console.WriteLine($"Wrote {bytesWritten}");
var kernel32 = NativeFunctions.GetModuleHandle("Kernel32.dll");
var loadLibA = NativeFunctions.GetProcAddress(kernel32, "LoadLibraryA");
var loadLibA = NativeFunctions.GetProcAddress(kernel32, "LoadLibraryW");
var remoteThread = NativeFunctions.CreateRemoteThread(
handle,
@ -137,13 +148,16 @@ namespace Dalamud.Injector {
);
if (remoteThread == IntPtr.Zero)
throw new Win32Exception(Marshal.GetLastWin32Error(), "Could not alloc memory");
throw new Win32Exception(Marshal.GetLastWin32Error(), $"Could not CreateRemoteThread");
NativeFunctions.VirtualFreeEx(
/*
TODO kill myself
VirtualFreeEx(
handle,
dllMem,
0,
NativeFunctions.AllocationType.Release);
AllocationType.Release);
*/
NativeFunctions.CloseHandle(remoteThread);
NativeFunctions.CloseHandle(handle);