From 1cae0d2cde6e775ecb1625aa93a5d65d996efad0 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 25 Apr 2024 09:38:24 +0200 Subject: MHR-16: Load NewLoader correctly. Signed-off-by: Amlal El Mahrouss --- Private/NewBoot/Source/HEL/AMD64/BootMain.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Private/NewBoot/Source') diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx index 7120bcd9..cdbb2f36 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx @@ -170,20 +170,20 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, kernelFile.ReadAll(MIB(1), 4096); if (kernelFile.Blob()) { - PEFContainer* headerKind = + PEFContainer* containerKind = reinterpret_cast(kernelFile.Blob()); - if (headerKind->Magic[0] == kPefMagic[0] && - headerKind->Magic[1] == kPefMagic[1] && - headerKind->Magic[2] == kPefMagic[2] && - headerKind->Magic[3] == kPefMagic[3] && - headerKind->Magic[4] == kPefMagic[4]) { - if (headerKind->Abi != kPefAbi || headerKind->Cpu != kPefArchAMD64) { + if (containerKind->Magic[0] == kPefMagic[0] && + containerKind->Magic[1] == kPefMagic[1] && + containerKind->Magic[2] == kPefMagic[2] && + containerKind->Magic[3] == kPefMagic[3] && + containerKind->Magic[4] == kPefMagic[4]) { + if (containerKind->Abi != kPefAbi || containerKind->Cpu != kPefArchAMD64) { EFI::ThrowError(L"Bad-Architecture", L"New Boot can't run this architecture."); } - NewOS::HEL::BootMainKind main = (NewOS::HEL::BootMainKind) nullptr; + NewOS::HEL::BootMainKind main = reinterpret_cast(containerKind + containerKind->Start); if (!main) { EFI::ThrowError(L"Bad-Exec", -- cgit v1.2.3