Merge branch 'HCR-18' into 'trunk'

HCR-18: First commit, bringing HCoreKrnl.exe into memory.

See merge request mahrouss-logic/micro-kernel!6

2 files changed, 11 insertions, 3 deletions

diff --git a/Private/KernelKit/MSDOS.hpp b/Private/KernelKit/MSDOS.hpp
index 2276f3cb..1adf6082 100644
--- a/Private/KernelKit/MSDOS.hpp
+++ b/Private/KernelKit/MSDOS.hpp
@@ -48,7 +48,7 @@ namespace HCore {
 inline auto rt_find_exec_header(DosHeaderPtr ptrDos) -> VoidPtr {
   if (!ptrDos) return nullptr;
   if (ptrDos->eMagic[0] != kMagMz0) return nullptr;
-  if (ptrDos->eMagic[0] != kMagMz1) return nullptr;
+  if (ptrDos->eMagic[1] != kMagMz1) return nullptr;
 
   return (VoidPtr)(&ptrDos->eLfanew + 1);
 }
diff --git a/Private/KernelKit/ProcessManager.hpp b/Private/KernelKit/ProcessManager.hpp
index e6d86959..543b3007 100644
--- a/Private/KernelKit/ProcessManager.hpp
+++ b/Private/KernelKit/ProcessManager.hpp
@@ -130,17 +130,25 @@ class Process final {
   ProcessStatus Status;
 
   // Memory, images.
-  HeapPtr PoolCursor{nullptr};
+  HeapPtr HeapCursor{nullptr};
   ImagePtr Image{nullptr};
-  HeapPtr Pool{nullptr};
+  HeapPtr HeapPtr{nullptr};
 
   // memory usage
   SizeT UsedMemory{0};
   SizeT FreeMemory{0};
 
+  enum {
+    ExecutableType,
+    DLLType,
+    DriverType,
+    TypeCount,
+  };
+
   ProcessTime PTime;
   PID ProcessId{-1};
   Int32 Ring{3};
+  Int32 Kind{0};
 
  public:
   //! @brief boolean operator, check status.