From be3ec5e358fcf47ab1136b38f03c7348bb5390e9 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Thu, 1 Feb 2024 08:08:44 +0100
Subject: See below.

- Remove useless imports (by Zed)
- Minor commit, refactors, that's it.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/NewBoot/BootKit/compile_flags.txt       | 1 +
 Private/NewBoot/Source/HEL/AMD64/BootKit.cxx    | 2 --
 Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx | 3 ++-
 Private/Source/RuntimeMain.cxx                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Private/NewBoot/BootKit/compile_flags.txt b/Private/NewBoot/BootKit/compile_flags.txt
index 45e268ea..e58d7ab9 100644
--- a/Private/NewBoot/BootKit/compile_flags.txt
+++ b/Private/NewBoot/BootKit/compile_flags.txt
@@ -1,2 +1,3 @@
 -std=c++20
 -I../
+-I../../
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootKit.cxx b/Private/NewBoot/Source/HEL/AMD64/BootKit.cxx
index d5b4ee9e..43a79b41 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootKit.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootKit.cxx
@@ -10,8 +10,6 @@
 #include <BootKit/BootKit.hxx>
 #include <EFIKit/EFILib.hxx>
 
-#include "NewKit/Defines.hpp"
-
 /// bugs 0
 
 HCore::SizeT BStrLen(const CharacterType *ptr) {
diff --git a/Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx b/Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx
index 17d308df..d1d230b6 100644
--- a/Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/Entrypoint.cxx
@@ -28,7 +28,8 @@ EFI_EXTERN_C int EfiMain(EfiHandlePtr ImageHandle,
   auto blob = reader.ReadAll();
 
   if (!blob)
-    KeRuntimeStop(L"HCoreLdr", L"Couldn't find HCoreKrnl.exe! Aborting...");
+    KeRuntimeStop(L"HCoreLdr_NoSuchKernel",
+                  L"Couldn't find HCoreKrnl.exe! Aborting...");
 
   EFI::ExitBootServices(SystemTable, mapKey, ImageHandle);
   EFI::Stop();
diff --git a/Private/Source/RuntimeMain.cxx b/Private/Source/RuntimeMain.cxx
index bc13f6e7..94f8ba67 100644
--- a/Private/Source/RuntimeMain.cxx
+++ b/Private/Source/RuntimeMain.cxx
@@ -14,7 +14,7 @@
 #include <NewKit/KernelHeap.hpp>
 #include <NewKit/UserHeap.hpp>
 
-/// PRIVATE SYMBOLS EXPORTED BY GCC.
+/// PRIVATE SYMBOLS EXPORTED BY C++ COMPILER.
 extern "C" void (*__SYSTEM_FINI)();
 extern "C" void (**__SYSTEM_INIT)();
 
-- 
cgit v1.2.3