diff options
| author | Amlal El Mahrouss <amlalelmahrouss@icloud.com> | 2024-03-05 16:10:50 +0000 |
|---|---|---|
| committer | Amlal El Mahrouss <amlalelmahrouss@icloud.com> | 2024-03-05 16:10:50 +0000 |
| commit | 3f898e74b7666acf51da16b03c2866ce379d8eb2 (patch) | |
| tree | 2a412d8e82a30f8d1f0b5dce5e59137c7410570c /Private/KernelKit | |
| parent | b05e715e1f02df785e05182604b7be2ddf6d0b32 (diff) | |
| parent | 2fde8a80d9ee3f89a7c3cb591166884b159b77a2 (diff) | |
Merge branch 'unstable' into 'trunk'
Update TODO.
See merge request mahrouss-logic/micro-kernel!10
Diffstat (limited to 'Private/KernelKit')
| -rw-r--r-- | Private/KernelKit/MSDOS.hpp | 3 | ||||
| -rw-r--r-- | Private/KernelKit/PE.hpp | 4 | ||||
| -rw-r--r-- | Private/KernelKit/PEFCodeManager.hxx | 4 | ||||
| -rw-r--r-- | Private/KernelKit/Rsrc/Util.hxx | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/Private/KernelKit/MSDOS.hpp b/Private/KernelKit/MSDOS.hpp index 565d77af..aa7f9b8c 100644 --- a/Private/KernelKit/MSDOS.hpp +++ b/Private/KernelKit/MSDOS.hpp @@ -20,6 +20,9 @@ // Last Rev // Sat Feb 24 CET 2024 +#define kMagMz0 'M' +#define kMagMz1 'Z' + typedef HCore::UInt32 DosWord; typedef HCore::Long DosLong; diff --git a/Private/KernelKit/PE.hpp b/Private/KernelKit/PE.hpp index 43de19e0..c9e4e19c 100644 --- a/Private/KernelKit/PE.hpp +++ b/Private/KernelKit/PE.hpp @@ -15,6 +15,7 @@ #define __PE__ #include <NewKit/Defines.hpp> +#include <KernelKit/PE.hpp> typedef HCore::UIntPtr U64; typedef HCore::UInt32 U32; @@ -22,9 +23,6 @@ typedef HCore::UInt16 U16; typedef HCore::UInt8 U8; typedef U8 BYTE; -#define kMagMz0 'M' -#define kMagMz1 'Z' - #define kPeMagic 0x00004550 typedef struct ExecHeader final { diff --git a/Private/KernelKit/PEFCodeManager.hxx b/Private/KernelKit/PEFCodeManager.hxx index 8577acb3..a4bc08eb 100644 --- a/Private/KernelKit/PEFCodeManager.hxx +++ b/Private/KernelKit/PEFCodeManager.hxx @@ -11,6 +11,8 @@ #include <NewKit/ErrorOr.hpp> #include <NewKit/String.hpp> +#define kPefApplicationMime "application/x-hcore-exec" + namespace HCore { /// /// \name PEFLoader @@ -58,7 +60,7 @@ typedef struct UniversalProcedureTable final { const Char NAME[kPefNameLen]; const VoidPtr TRAP; const SizeT ARCH; -} __attribute__((packed)) UniversalProcedureTableType; +} PACKED UniversalProcedureTableType; bool execute_from_image(PEFLoader &exec) noexcept; } // namespace Utils diff --git a/Private/KernelKit/Rsrc/Util.hxx b/Private/KernelKit/Rsrc/Util.hxx index a2f9355d..03013888 100644 --- a/Private/KernelKit/Rsrc/Util.hxx +++ b/Private/KernelKit/Rsrc/Util.hxx @@ -34,5 +34,3 @@ } #endif - -#define $rsrc import
\ No newline at end of file |