ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-09 17:44:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

WIP ex

Browse source
This commit is contained in:
Mino 2020-03-11 22:28:06 +09:00
parent 350d2961c1
commit a01bc259a8
7 changed files with 55 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Dalamud.Bootstrap/Windows/Process.cs
View file

@ -42,17 +42,19 @@ namespace Dalamud.Bootstrap
if (handle.IsInvalid)
{
throw new Win32Exception();
ProcessException.ThrowLastOsError(pid);
}
return new Process(handle);
}
private uint GetPid() => Win32.GetProcessId(m_handle);
public void Terminate(uint exitCode = 0)
{
if (!Win32.TerminateProcess(m_handle, exitCode))
{
throw new Win32Exception();
ProcessException.ThrowLastOsError(GetPid());
}
}
@ -72,7 +74,7 @@ namespace Dalamud.Bootstrap
if (!Win32.ReadProcessMemory(m_handle, (void*)address, pDest, (IntPtr)destination.Length, &bytesRead))
{
throw new Win32Exception();
ProcessException.ThrowLastOsError(GetPid());
}
// this is okay as the length of the span can't be longer than int.Max
@ -91,7 +93,7 @@ namespace Dalamud.Bootstrap
if (bytesRead == 0)
{
// prolly page fault; there's not much we can do here
throw new Win32Exception();
ProcessException.ThrowLastOsError(GetPid());
}
totalBytesRead += bytesRead;
@ -128,7 +130,10 @@ namespace Dalamud.Bootstrap
if (!status.Success)
{
throw new NtException(status);
var message = $"A call to NtQueryInformationProcess failed. (Status: {status})";
var pid = GetPid();
throw new ProcessException(message, pid);
}
return info.PebBaseAddress;
@ -150,7 +155,7 @@ namespace Dalamud.Bootstrap
}
}
private static string[] ParseCommandLine(ReadOnlySpan<byte> commandLine)
private string[] ParseCommandLine(ReadOnlySpan<byte> commandLine)
{
unsafe
{
@ -166,7 +171,7 @@ namespace Dalamud.Bootstrap
if (argv == null)
{
throw new Win32Exception();
ProcessException.ThrowLastOsError(GetPid());
}
try