diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-10-07 09:24:56 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-10-07 09:24:56 +0200 |
| commit | 3b6a7e8c87f94391f92b55f20b9ba3e560ef280e (patch) | |
| tree | 15fc04bff2ab6b07683dc1ea570aaf65dbce9fbb /dev/kernel/CFKit | |
| parent | abff64f38c988a5350cbeb243896c0ee30401058 (diff) | |
feat: kernel & libSystem: improvements and tweaks.
feat: docs: wip design of Launch.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel/CFKit')
| -rw-r--r-- | dev/kernel/CFKit/GUIDWizard.h | 10 | ||||
| -rw-r--r-- | dev/kernel/CFKit/GUIDWrapper.h | 6 | ||||
| -rw-r--r-- | dev/kernel/CFKit/Property.h | 8 | ||||
| -rw-r--r-- | dev/kernel/CFKit/Utils.h | 6 |
4 files changed, 11 insertions, 19 deletions
diff --git a/dev/kernel/CFKit/GUIDWizard.h b/dev/kernel/CFKit/GUIDWizard.h index c7cb18ac..e2d9bcb1 100644 --- a/dev/kernel/CFKit/GUIDWizard.h +++ b/dev/kernel/CFKit/GUIDWizard.h @@ -15,9 +15,7 @@ #include <NeKit/Ref.h> #include <NeKit/Stream.h> -namespace CF::XRN::Version1 { -using namespace Kernel; - -Ref<GUIDSequence*> cf_make_sequence(const ArrayList<UInt32>& seq); -ErrorOr<Ref<Kernel::KString>> cf_try_guid_to_string(Ref<GUIDSequence*>& guid); -} // namespace CF::XRN::Version1 +namespace Kernel::CF::XRN::Version1 { +Ref<GUIDSequence*> cf_make_sequence(const ArrayList<UInt32>& seq); +ErrorOr<Ref<KString>> cf_try_guid_to_string(Ref<GUIDSequence*>& guid); +} // namespace Kernel::CF::XRN::Version1 diff --git a/dev/kernel/CFKit/GUIDWrapper.h b/dev/kernel/CFKit/GUIDWrapper.h index a3920357..05cb4754 100644 --- a/dev/kernel/CFKit/GUIDWrapper.h +++ b/dev/kernel/CFKit/GUIDWrapper.h @@ -15,9 +15,7 @@ #define kXRNNil "@{........-....-M...-N...-............}" /// @brief eXtended Resource Namespace -namespace CF::XRN { -using namespace Kernel; - +namespace Kernel::CF::XRN { union GUIDSequence { alignas(8) UShort fU8[16]; alignas(8) UShort fU16[8]; @@ -48,4 +46,4 @@ class GUID final { private: GUIDSequence fUUID; }; -} // namespace CF::XRN +} // namespace Kernel::CF::XRN diff --git a/dev/kernel/CFKit/Property.h b/dev/kernel/CFKit/Property.h index 7fc9bf07..17246a63 100644 --- a/dev/kernel/CFKit/Property.h +++ b/dev/kernel/CFKit/Property.h @@ -15,9 +15,7 @@ #define kMaxPropLen (256U) -namespace CF { -using namespace Kernel; - +namespace Kernel::CF { /// @brief handle to anything (number, ptr, string...) using PropertyId = UIntPtr; @@ -44,10 +42,10 @@ class Property { template <SizeT N> using PropertyArray = Array<Property, N>; -} // namespace CF +} // namespace Kernel::CF namespace Kernel { -using namespace CF; +using namespace Kernel::CF; } #endif // !CFKIT_PROPS_H diff --git a/dev/kernel/CFKit/Utils.h b/dev/kernel/CFKit/Utils.h index 97b0ee53..247ad5fb 100644 --- a/dev/kernel/CFKit/Utils.h +++ b/dev/kernel/CFKit/Utils.h @@ -5,9 +5,7 @@ #include <KernelKit/PE.h> /// @brief CFKit -namespace CF { -using namespace Kernel; - +namespace Kernel::CF { /// @brief Finds the PE header inside the blob. inline auto ldr_find_exec_header(DosHeaderPtr ptrDos) -> LDR_EXEC_HEADER_PTR { if (!ptrDos) return nullptr; @@ -45,6 +43,6 @@ inline auto ldr_find_exec_header(const Char* ptrDos) -> LDR_EXEC_HEADER_PTR { inline auto ldr_find_opt_exec_header(const Char* ptrDos) -> LDR_OPTIONAL_HEADER_PTR { return ldr_find_opt_exec_header((DosHeaderPtr) ptrDos); } -} // namespace CF +} // namespace Kernel::CF #endif // ifndef CFKIT_UTILS_H |
