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

feat: add SafeMemory.PtrToStructure/<T>

Browse source
This commit is contained in:
goat 2021-12-07 22:05:01 +01:00
parent 65d0acaf64
commit ca15a9c035
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
2 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Dalamud/Utility/Util.cs
View file

@ -160,8 +160,8 @@ namespace Dalamud.Utility
return sb.ToString().TrimEnd(Environment.NewLine.ToCharArray());
}
private static ulong moduleStartAddr;
private static ulong moduleEndAddr;
private static ulong ModuleStartAddr;
private static ulong ModuleEndAddr;
private static unsafe void PrintOutValue(ulong addr, IEnumerable<string> path, Type type, object value)
{
@ -173,18 +173,18 @@ namespace Dalamud.Utility
{
var unboxedAddr = (ulong)unboxed;
ImGuiHelpers.ClickToCopyText($"{(ulong)unboxed:X}");
if (moduleStartAddr > 0 && unboxedAddr >= moduleStartAddr && unboxedAddr <= moduleEndAddr)
if (ModuleStartAddr > 0 && unboxedAddr >= ModuleStartAddr && unboxedAddr <= ModuleEndAddr)
{
ImGui.SameLine();
ImGui.PushStyleColor(ImGuiCol.Text, 0xffcbc0ff);
ImGuiHelpers.ClickToCopyText($"ffxiv_dx11.exe+{unboxedAddr - moduleStartAddr:X}");
ImGuiHelpers.ClickToCopyText($"ffxiv_dx11.exe+{unboxedAddr - ModuleStartAddr:X}");
ImGui.PopStyleColor();
}
try
{
var eType = type.GetElementType();
var ptrObj = Marshal.PtrToStructure(new IntPtr(unboxed), eType);
var ptrObj = SafeMemory.PtrToStructure(new IntPtr(unboxed), eType);
ImGui.SameLine();
PrintOutObject(ptrObj, (ulong)unboxed, new List<string>(path));
}
@ -215,24 +215,24 @@ namespace Dalamud.Utility
{
path ??= new List<string>();
if (moduleEndAddr == 0 && moduleStartAddr == 0)
if (ModuleEndAddr == 0 && ModuleStartAddr == 0)
{
try
{
var processModule = Process.GetCurrentProcess().MainModule;
if (processModule != null)
{
moduleStartAddr = (ulong)processModule.BaseAddress.ToInt64();
moduleEndAddr = moduleStartAddr + (ulong)processModule.ModuleMemorySize;
ModuleStartAddr = (ulong)processModule.BaseAddress.ToInt64();
ModuleEndAddr = ModuleStartAddr + (ulong)processModule.ModuleMemorySize;
}
else
{
moduleEndAddr = 1;
ModuleEndAddr = 1;
}
}
catch
{
moduleEndAddr = 1;
ModuleEndAddr = 1;
}
}