Fix memory disassembly always 64-bits bug.

lozn00 · Oct 27, 2020 · 4fc29ff · 4fc29ff
1 parent ed65673
commit 4fc29ff
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/OpenArk/kernel/memory/memory.cpp b/src/OpenArk/kernel/memory/memory.cpp
@@ -182,7 +182,14 @@ void KernelMemoryRW::ViewMemory(ULONG pid, ULONG64 addr, ULONG size)
 		auto hexdump2 = HexDumpMemory(addr+size, nullptr, size-memsize);
 		hexdump.append(hexdump2);
 	}
-	auto disasm = DisasmMemory(addr, mem, minsize);
+	bool isx64 = true;
+	if (ArkDrvApi::Memory::IsKernelAddress(addr)) {
+		isx64 = UNONE::OsIs64();
+	} else {
+		EN_VID_PROCESS();
+		isx64 = UNONE::PsIsX64(pid);
+	}
+	auto disasm = DisasmMemory(addr, mem, minsize, isx64 ? 64 : 32);
 
 	DEFINE_WIDGET(QTextEdit*, hexEdit);
 	DEFINE_WIDGET(QTextEdit*, disasmEdit);