koffi 2.12.1 → 2.12.3

package/src/koffi/src/ffi.cc

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -19,21 +19,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "parser.hh"
 #include "util.hh"
-#ifdef _WIN32
+#if defined(_WIN32)
     #include "win32.hh"
 #endif
 #include "errno.inc"
 
-#ifdef _WIN32
-    #ifndef NOMINMAX
+#if defined(_WIN32)
+    #if !defined(NOMINMAX)
         #define NOMINMAX
     #endif
-    #ifndef WIN32_LEAN_AND_MEAN
+    #if !defined(WIN32_LEAN_AND_MEAN)
         #define WIN32_LEAN_AND_MEAN
     #endif
     #include <windows.h>
@@ -42,7 +42,7 @@
     #include <dlfcn.h>
     #include <unistd.h>
     #include <sys/mman.h>
-    #ifndef MAP_STACK
+    #if !defined(MAP_STACK)
         #define MAP_STACK 0
     #endif
 #endif
@@ -54,7 +54,7 @@ namespace RG {
 
 SharedData shared;
 
-static RG_THREAD_LOCAL CallData *exec_call;
+static thread_local CallData *exec_call;
 
 static bool ChangeSize(const char *name, Napi::Value value, Size min_size, Size max_size, Size *out_size)
 {
@@ -201,14 +201,13 @@ static inline bool CheckAlignment(int64_t align)
     return valid;
 }
 
-// Prevent simple mistakes but don't be too strict, the world is bigger than the US!
 static bool IsNameValid(const char *name)
 {
-    if (!name[0] || IsAsciiWhite(name[0]) || IsAsciiDigit(name[0])) [[unlikely]]
+    if (!IsXidStart(name[0]))
         return false;
 
     for (Size i = 1; name[i]; i++) {
-        if (IsAsciiWhite(name[i])) [[unlikely]]
+        if (!IsXidContinue(name[i])) [[unlikely]]
             return false;
     }
 
@@ -259,10 +258,10 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
     Napi::Object obj = info[named].As<Napi::Object>();
     Napi::Array keys = GetOwnPropertyNames(obj);
 
-    RG_DEFER_NC(err_guard, len = instance->types.len) {
-        Size start = len + !named;
+    RG_DEFER_NC(err_guard, count = instance->types.count) {
+        Size start = count + !named;
 
-        for (Size i = start; i < instance->types.len; i++) {
+        for (Size i = start; i < instance->types.count; i++) {
             const TypeInfo *it = &instance->types[i];
             const TypeInfo **ptr = instance->types_map.Find(it->name);
 
@@ -271,7 +270,7 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
             }
         }
 
-        instance->types.RemoveFrom(len);
+        instance->types.RemoveFrom(count);
     };
 
     TypeInfo *type = instance->types.AppendDefault();
@@ -294,7 +293,7 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
         if (!MapType(env, instance, type, type->name))
             return env.Null();
     } else {
-        type->name = Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.len).ptr;
+        type->name = Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.count).ptr;
     }
 
     type->primitive = PrimitiveKind::Record;
@@ -353,6 +352,9 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
             return env.Null();
         }
 
+        if (TestStr(member.name, "_"))
+            continue;
+
         if (!IsNameValid(member.name)) {
             ThrowError<Napi::Error>(env, "Invalid member name '%1'", member.name);
             return env.Null();
@@ -423,10 +425,10 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
     Napi::Object obj = info[named].As<Napi::Object>();
     Napi::Array keys = GetOwnPropertyNames(obj);
 
-    RG_DEFER_NC(err_guard, len = instance->types.len) {
-        Size start = len + !named;
+    RG_DEFER_NC(err_guard, count = instance->types.count) {
+        Size start = count + !named;
 
-        for (Size i = start; i < instance->types.len; i++) {
+        for (Size i = start; i < instance->types.count; i++) {
             const TypeInfo *it = &instance->types[i];
             const TypeInfo **ptr = instance->types_map.Find(it->name);
 
@@ -435,7 +437,7 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
             }
         }
 
-        instance->types.RemoveFrom(len);
+        instance->types.RemoveFrom(count);
     };
 
     TypeInfo *type = instance->types.AppendDefault();
@@ -458,7 +460,7 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
         if (!MapType(env, instance, type, type->name))
             return env.Null();
     } else {
-        type->name = Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.len).ptr;
+        type->name = Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.count).ptr;
     }
 
     type->primitive = PrimitiveKind::Union;
@@ -508,6 +510,9 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
         size = std::max(size, member.type->size);
         type->align = std::max(type->align, align);
 
+        if (TestStr(member.name, "_"))
+            continue;
+
         if (!IsNameValid(member.name)) {
             ThrowError<Napi::Error>(env, "Invalid member name '%1'", member.name);
             return env.Null();
@@ -592,7 +597,7 @@ static Napi::Value CreateOpaqueType(const Napi::CallbackInfo &info)
     RG_DEFER_N(err_guard) { instance->types.RemoveLast(1); };
 
     type->name = named ? DuplicateString(name.Utf8Value().c_str(), &instance->str_alloc).ptr
-                       : Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.len).ptr;
+                       : Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.count).ptr;
 
     type->primitive = PrimitiveKind::Void;
     type->size = 0;
@@ -788,7 +793,7 @@ static Napi::Value CreateDisposableType(const Napi::CallbackInfo &info)
     type->members.allocator = GetNullAllocator();
 
     type->name = named ? DuplicateString(name.Utf8Value().c_str(), &instance->str_alloc).ptr
-                       : Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.len).ptr;
+                       : Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.count).ptr;
 
     type->dispose = dispose;
     type->dispose_ref = Napi::Persistent(dispose_func);
@@ -1005,7 +1010,7 @@ static bool ParseClassicFunction(const Napi::CallbackInfo &info, FunctionInfo *o
         parameters = info[3u].As<Napi::Array>();
     }
 
-#ifdef _WIN32
+#if defined(_WIN32)
     if (name.IsNumber()) {
         out_func->ordinal_name = name.As<Napi::Number>().Int32Value();
         name = name.ToString();
@@ -1356,7 +1361,7 @@ static InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, S
     RG_CRITICAL(mem->stack.ptr, "Failed to allocate %1 of memory", mem->stack.len);
 #endif
 
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__)
     // Make sure the SP points inside the MAP_STACK area, or (void) functions may crash on OpenBSD i386
     mem->stack.len -= 16;
 #endif
@@ -1365,7 +1370,7 @@ static InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, S
     mem->stack0 = mem->stack;
 
     mem->heap.len = heap_size;
-#ifdef _WIN32
+#if defined(_WIN32)
     mem->heap.ptr = (uint8_t *)VirtualAlloc(nullptr, mem->heap.len, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #else
     mem->heap.ptr = (uint8_t *)mmap(nullptr, mem->heap.len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
@@ -1673,7 +1678,7 @@ static Napi::Value FindLibraryFunction(const Napi::CallbackInfo &info)
         func->parameters.Grow(32);
     }
 
-#ifdef _WIN32
+#if defined(_WIN32)
     if (func->ordinal_name < 0) {
         if (func->decorated_name) {
             func->native = (void *)GetProcAddress((HMODULE)lib->module, func->decorated_name);
@@ -1725,7 +1730,7 @@ static Napi::Value FindSymbol(const Napi::CallbackInfo &info)
     if (!type)
         return env.Null();
 
-#ifdef _WIN32
+#if defined(_WIN32)
     void *ptr = (void *)GetProcAddress((HMODULE)lib->module, name.c_str());
 #else
     void *ptr = (void *)dlsym(lib->module, name.c_str());
@@ -1769,7 +1774,7 @@ static Napi::Value LoadSharedLibrary(const Napi::CallbackInfo &info)
         return env.Null();
     }
 
-#ifndef _WIN32
+#if !defined(_WIN32)
     int flags = 0;
 
     if (info.Length() >= 2) {
@@ -1777,7 +1782,7 @@ static Napi::Value LoadSharedLibrary(const Napi::CallbackInfo &info)
 
         flags |= options.Get("lazy").ToBoolean() ? RTLD_LAZY : RTLD_NOW;
         flags |= options.Get("global").ToBoolean() ? RTLD_GLOBAL : RTLD_LOCAL;
-#ifdef RTLD_DEEPBIND
+#if defined(RTLD_DEEPBIND)
         flags |= options.Get("deep").ToBoolean() ? RTLD_DEEPBIND : 0;
 #endif
     } else {
@@ -1792,7 +1797,7 @@ static Napi::Value LoadSharedLibrary(const Napi::CallbackInfo &info)
 
     // Load shared library
     void *module = nullptr;
-#ifdef _WIN32
+#if defined(_WIN32)
     if (info[0].IsString()) {
         std::string filename = info[0].As<Napi::String>();
         module = LoadWindowsLibrary(env, filename.c_str());
@@ -2155,7 +2160,7 @@ static Napi::Value ResetKoffi(const Napi::CallbackInfo &info)
         instance->broker = nullptr;
     }
 
-    instance->types.RemoveFrom(instance->base_types_len);
+    instance->types.RemoveFrom(instance->base_types_count);
 
     {
         HashSet<const void *> base_types;
@@ -2181,7 +2186,7 @@ static Napi::Value ResetKoffi(const Napi::CallbackInfo &info)
 
 void LibraryHolder::Unload()
 {
-#ifdef _WIN32
+#if defined(_WIN32)
     if (module && module != GetModuleHandle(nullptr)) {
         FreeLibrary((HMODULE)module);
     }
@@ -2229,7 +2234,7 @@ void FunctionInfo::Unref() const
 
 InstanceMemory::~InstanceMemory()
 {
-#ifdef _WIN32
+#if defined(_WIN32)
     if (stack.ptr) {
         VirtualFree(stack.ptr, 0, MEM_RELEASE);
     }
@@ -2322,7 +2327,7 @@ static inline PrimitiveKind GetSignPrimitive(Size len, bool sign)
 
 static inline PrimitiveKind GetLittleEndianPrimitive(PrimitiveKind kind)
 {
-#ifdef RG_BIG_ENDIAN
+#if defined(RG_BIG_ENDIAN)
     return (PrimitiveKind)((int)kind + 1);
 #else
     return kind;
@@ -2331,7 +2336,7 @@ static inline PrimitiveKind GetLittleEndianPrimitive(PrimitiveKind kind)
 
 static inline PrimitiveKind GetBigEndianPrimitive(PrimitiveKind kind)
 {
-#ifdef RG_BIG_ENDIAN
+#if defined(RG_BIG_ENDIAN)
     return kind;
 #else
     return (PrimitiveKind)((int)kind + 1);
@@ -2347,7 +2352,7 @@ static InstanceData *CreateInstance()
 
     instance->debug = GetDebugFlag("DUMP_CALLS");
 
-#ifdef _WIN32
+#if defined(_WIN32)
     TEB *teb = GetTEB();
 
     instance->main_stack_max = teb->StackBase;
@@ -2498,7 +2503,7 @@ static Napi::Object InitModule(Napi::Env env, Napi::Object exports)
 
         instance->active_symbol = Napi::Symbol::New(env, "active");
 
-        instance->base_types_len = instance->types.len;
+        instance->base_types_count = instance->types.count;
     }
 
     // Expose internal Node stuff

package/src/koffi/src/ffi.hh

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 
 #include <napi.h>
 
@@ -229,7 +229,7 @@ struct FunctionInfo {
 
     const char *name;
     const char *decorated_name; // Only set for some platforms/calling conventions
-#ifdef _WIN32
+#if defined(_WIN32)
     int ordinal_name = -1;
 #endif
     const LibraryHolder *lib = nullptr;
@@ -278,7 +278,7 @@ struct InstanceData {
     BucketArray<TypeInfo> types;
     HashMap<const char *, const TypeInfo *> types_map;
     BucketArray<FunctionInfo> callbacks;
-    Size base_types_len;
+    Size base_types_count;
 
     bool debug;
 
@@ -299,7 +299,7 @@ struct InstanceData {
     std::thread::id main_thread_id;
     napi_threadsafe_function broker = nullptr;
 
-#ifdef _WIN32
+#if defined(_WIN32)
     void *main_stack_max;
     void *main_stack_min;
 

package/src/koffi/src/init.js

@@ -1,4 +1,4 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the “Software”), to deal in

package/src/koffi/src/parser.cc

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 #include "parser.hh"
 
@@ -98,9 +98,9 @@ void PrototypeParser::Tokenize(const char *str)
 
         if (IsAsciiWhite(c)) {
             continue;
-        } else if (IsAsciiAlpha(c) || c == '_') {
+        } else if (IsXidStart(c)) {
             Size j = i;
-            while (str[++j] && (IsAsciiAlphaOrDigit(str[j]) || str[j] == '_'));
+            while (str[++j] && IsXidContinue(str[j]));
 
             Span<const char> tok = MakeSpan(str + i, j - i);
             tokens.Append(tok);

package/src/koffi/src/parser.hh

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "util.hh"
 
 #include <napi.h>

package/src/koffi/src/trampolines/armasm.inc

@@ -1,7 +1,7 @@
-; Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+; Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 ;
 ; Permission is hereby granted, free of charge, to any person obtaining a copy of
-; this software and associated documentation files (the “Software”), to deal in 
+; this software and associated documentation files (the “Software”), to deal in
 ; the Software without restriction, including without limitation the rights to use,
 ; copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 ; Software, and to permit persons to whom the Software is furnished to do so,

package/src/koffi/src/trampolines/gnu.inc

@@ -1,7 +1,7 @@
-# Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+# Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the “Software”), to deal in 
+# this software and associated documentation files (the “Software”), to deal in
 # the Software without restriction, including without limitation the rights to use,
 # copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 # Software, and to permit persons to whom the Software is furnished to do so,

package/src/koffi/src/trampolines/masm32.inc

@@ -1,7 +1,7 @@
-; Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+; Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 ;
 ; Permission is hereby granted, free of charge, to any person obtaining a copy of
-; this software and associated documentation files (the “Software”), to deal in 
+; this software and associated documentation files (the “Software”), to deal in
 ; the Software without restriction, including without limitation the rights to use,
 ; copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 ; Software, and to permit persons to whom the Software is furnished to do so,

package/src/koffi/src/trampolines/masm64.inc

@@ -1,7 +1,7 @@
-; Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+; Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 ;
 ; Permission is hereby granted, free of charge, to any person obtaining a copy of
-; this software and associated documentation files (the “Software”), to deal in 
+; this software and associated documentation files (the “Software”), to deal in
 ; the Software without restriction, including without limitation the rights to use,
 ; copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 ; Software, and to permit persons to whom the Software is furnished to do so,

package/src/koffi/src/trampolines/prototypes.inc

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,

package/src/koffi/src/util.cc

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "call.hh"
 #include "ffi.hh"
 #include "util.hh"
@@ -337,7 +337,7 @@ const TypeInfo *ResolveType(Napi::Env env, Span<const char> str, int *out_direct
             TypeInfo *copy = instance->types.AppendDefault();
 
             memcpy((void *)copy, (const void *)type, RG_SIZE(*type));
-            copy->name = Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.len).ptr;
+            copy->name = Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.count).ptr;
             copy->members.allocator = GetNullAllocator();
 
             copy->dispose = [](Napi::Env env, const TypeInfo *, const void *ptr) {
@@ -1170,7 +1170,7 @@ void DecodeNormalArray(Napi::Array array, const uint8_t *origin, const TypeInfo
 void DecodeBuffer(Span<uint8_t> buffer, const uint8_t *origin, const TypeInfo *ref)
 {
     // Go fast brrrrr!
-    memcpy_safe(buffer.ptr, origin, (size_t)buffer.len);
+    MemCpy(buffer.ptr, origin, (size_t)buffer.len);
 
 #define SWAP(CType) \
         do { \
@@ -1694,16 +1694,16 @@ int AnalyseFlat(const TypeInfo *type, FunctionRef<void(const TypeInfo *type, int
 void DumpMemory(const char *type, Span<const uint8_t> bytes)
 {
     if (bytes.len) {
-        PrintLn(stderr, "%1 at 0x%2 (%3):", type, bytes.ptr, FmtMemSize(bytes.len));
+        PrintLn(StdErr, "%1 at 0x%2 (%3):", type, bytes.ptr, FmtMemSize(bytes.len));
 
         for (const uint8_t *ptr = bytes.begin(); ptr < bytes.end();) {
-            Print(stderr, "  [0x%1 %2 %3]  ", FmtArg(ptr).Pad0(-16),
+            Print(StdErr, "  [0x%1 %2 %3]  ", FmtArg(ptr).Pad0(-16),
                                               FmtArg((ptr - bytes.begin()) / sizeof(void *)).Pad(-4),
                                               FmtArg(ptr - bytes.begin()).Pad(-4));
             for (int i = 0; ptr < bytes.end() && i < (int)sizeof(void *); i++, ptr++) {
-                Print(stderr, " %1", FmtHex(*ptr).Pad0(-2));
+                Print(StdErr, " %1", FmtHex(*ptr).Pad0(-2));
             }
-            PrintLn(stderr);
+            PrintLn(StdErr);
         }
     }
 }

package/src/koffi/src/util.hh

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 
 #include <napi.h>

package/src/koffi/src/win32.cc

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -19,15 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#ifdef _WIN32
+#if defined(_WIN32)
 
 #include "util.hh"
 #include "win32.hh"
 
-#ifndef NOMINMAX
+#if !defined(NOMINMAX)
     #define NOMINMAX
 #endif
-#ifndef WIN32_LEAN_AND_MEAN
+#if !defined(WIN32_LEAN_AND_MEAN)
     #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>

package/src/koffi/src/win32.hh

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 
 #include <intrin.h>
 #include <napi.h>
@@ -82,9 +82,9 @@ struct TEB {
     char _pad4[162];
     uint16_t SameTebFlags;
 };
-static_assert(RG_OFFSET_OF(TEB, DeallocationStack) == 0x1478);
-static_assert(RG_OFFSET_OF(TEB, GuaranteedStackBytes) == 0x1748);
-static_assert(RG_OFFSET_OF(TEB, SameTebFlags) == 0x17EE);
+static_assert(offsetof(TEB, DeallocationStack) == 0x1478);
+static_assert(offsetof(TEB, GuaranteedStackBytes) == 0x1748);
+static_assert(offsetof(TEB, SameTebFlags) == 0x17EE);
 
 #else
 
@@ -101,9 +101,9 @@ struct TEB {
     char _pad4[78];
     uint16_t SameTebFlags;
 };
-static_assert(RG_OFFSET_OF(TEB, DeallocationStack) == 0xE0C);
-static_assert(RG_OFFSET_OF(TEB, GuaranteedStackBytes) == 0x0F78);
-static_assert(RG_OFFSET_OF(TEB, SameTebFlags) == 0xFCA);
+static_assert(offsetof(TEB, DeallocationStack) == 0xE0C);
+static_assert(offsetof(TEB, GuaranteedStackBytes) == 0x0F78);
+static_assert(offsetof(TEB, SameTebFlags) == 0xFCA);
 
 #endif