koffi 0.9.21 → 0.9.22

package/src/ffi.cc

@@ -566,6 +566,30 @@ InstanceData::InstanceData()
     heap_mem.ptr = (uint8_t *)Allocator::Allocate(&mem_alloc, heap_mem.len);
 }
 
+template <typename Func>
+static void SetExports(Napi::Env env, Func func)
+{
+    func("struct", Napi::Function::New(env, CreateStructType));
+    func("handle", Napi::Function::New(env, CreateHandleType));
+    func("pointer", Napi::Function::New(env, CreatePointerType));
+    func("load", Napi::Function::New(env, LoadSharedLibrary));
+    func("in", Napi::Function::New(env, MarkIn));
+    func("out", Napi::Function::New(env, MarkOut));
+    func("inout", Napi::Function::New(env, MarkInOut));
+
+    func("internal", Napi::Boolean::New(env, true));
+#if defined(_WIN32)
+    func("extension", Napi::String::New(env, ".dll"));
+#elif defined(__APPLE__)
+    func("extension", Napi::String::New(env, ".dylib"));
+#else
+    func("extension", Napi::String::New(env, ".so"));
+#endif
+
+    Napi::Object types = InitBaseTypes(env);
+    func("types", types);
+}
+
 }
 
 #if NODE_WANT_INTERNALS
@@ -604,25 +628,7 @@ static void InitInternal(v8::Local<v8::Object> target, v8::Local<v8::Value>,
     instance->debug = GetDebugFlag("DUMP_CALLS");
     FillRandomSafe(&instance->tag_lower, RG_SIZE(instance->tag_lower));
 
-    SetValue(env, target, "struct", Napi::Function::New(env_napi, CreateStructType));
-    SetValue(env, target, "handle", Napi::Function::New(env_napi, CreateHandleType));
-    SetValue(env, target, "pointer", Napi::Function::New(env_napi, CreatePointerType));
-    SetValue(env, target, "load", Napi::Function::New(env_napi, LoadSharedLibrary));
-    SetValue(env, target, "in", Napi::Function::New(env_napi, MarkIn));
-    SetValue(env, target, "out", Napi::Function::New(env_napi, MarkOut));
-    SetValue(env, target, "inout", Napi::Function::New(env_napi, MarkInOut));
-
-    SetValue(env, target, "internal", Napi::Boolean::New(env_napi, true));
-#if defined(_WIN32)
-    SetValue(env, target, "extension", Napi::String::New(env_napi, ".dll"));
-#elif defined(__APPLE__)
-    SetValue(env, target, "extension", Napi::String::New(env_napi, ".dylib"));
-#else
-    SetValue(env, target, "extension", Napi::String::New(env_napi, ".so"));
-#endif
-
-    Napi::Object types = InitBaseTypes(env_cxx);
-    SetValue(env, target, "types", types);
+    SetExports(env_napi, [&](const char *name, Napi::Value value) { SetValue(env, target, name, value); });
 }
 
 #else
@@ -637,25 +643,7 @@ static Napi::Object InitModule(Napi::Env env, Napi::Object exports)
     instance->debug = GetDebugFlag("DUMP_CALLS");
     FillRandomSafe(&instance->tag_lower, RG_SIZE(instance->tag_lower));
 
-    exports.Set("struct", Napi::Function::New(env, CreateStructType));
-    exports.Set("handle", Napi::Function::New(env, CreateHandleType));
-    exports.Set("pointer", Napi::Function::New(env, CreatePointerType));
-    exports.Set("load", Napi::Function::New(env, LoadSharedLibrary));
-    exports.Set("in", Napi::Function::New(env, MarkIn));
-    exports.Set("out", Napi::Function::New(env, MarkOut));
-    exports.Set("inout", Napi::Function::New(env, MarkInOut));
-
-    exports.Set("internal", Napi::Boolean::New(env, false));
-#if defined(_WIN32)
-    exports.Set("extension", Napi::String::New(env, ".dll"));
-#elif defined(__APPLE__)
-    exports.Set("extension", Napi::String::New(env, ".dylib"));
-#else
-    exports.Set("extension", Napi::String::New(env, ".so"));
-#endif
-
-    Napi::Object types = InitBaseTypes(env);
-    exports.Set("types", types);
+    SetExports(env, [&](const char *name, Napi::Value value) { exports.Set(name, value); });
 
     return exports;
 }

package/src/util.hh

@@ -99,8 +99,8 @@ public:
         return MakeSpan(ptr, len);
     }
 
-    template <typename T>
-    bool AllocStack(Size size, Size align, T **out_ptr);
+    template <typename T = void>
+    bool AllocStack(Size size, Size align, T **out_ptr = nullptr);
     template <typename T>
     bool AllocHeap(Size size, Size align, T **out_ptr);
 
@@ -127,7 +127,9 @@ bool CallData::AllocStack(Size size, Size align, T **out_ptr)
 
     stack_mem->len -= delta;
 
-    *out_ptr = (T *)ptr;
+    if (out_ptr) {
+        *out_ptr = (T *)ptr;
+    }
     return true;
 }
 

package/test/registry/machines.json

@@ -26,7 +26,8 @@
                 "directory": "/home/debian/luigi",
                 "build": {
                     "Install": "npm install --production --ignore-scripts",
-                    "Build": "node ../cnoke/cnoke.js"
+                    "Build Koffi": "node ../cnoke/cnoke.js",
+                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -64,7 +65,8 @@
                 "directory": "/home/debian/luigi",
                 "build": {
                     "Install": "npm install --production --ignore-scripts",
-                    "Build": "node ../cnoke/cnoke.js"
+                    "Build Koffi": "node ../cnoke/cnoke.js",
+                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -102,7 +104,8 @@
                 "directory": "/home/debian/luigi",
                 "build": {
                     "Install": "npm install --production --ignore-scripts",
-                    "Build": "node ../cnoke/cnoke.js"
+                    "Build Koffi": "node ../cnoke/cnoke.js",
+                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -140,7 +143,8 @@
                 "directory": "/home/debian/luigi",
                 "build": {
                     "Install": "npm install --production --ignore-scripts",
-                    "Build": "node ../cnoke/cnoke.js"
+                    "Build Koffi": "node ../cnoke/cnoke.js",
+                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -178,7 +182,8 @@
                 "directory": "C:/Users/windows/Desktop/luigi32",
                 "build": {
                     "Install": "C:\\Node32\\node32.cmd npm install --production --ignore-scripts",
-                    "Build": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js"
+                    "Build Koffi": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js",
+                    "Build dependencies": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "seatsh C:\\Node32\\node32.cmd node test/tests/raylib.js",
@@ -191,7 +196,8 @@
                 "directory": "C:/Users/windows/Desktop/luigi64",
                 "build": {
                     "Install": "C:\\Node64\\node64.cmd npm install --production --ignore-scripts",
-                    "Build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js"
+                    "Build Koffi": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js",
+                    "Build dependencies": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "seatsh C:\\Node64\\node64.cmd node test/tests/raylib.js",
@@ -229,7 +235,8 @@
                 "directory": "/home/freebsd/luigi",
                 "build": {
                     "Install": "npm install --production --ignore-scripts",
-                    "Build": "node ../cnoke/cnoke.js"
+                    "Build Koffi": "node ../cnoke/cnoke.js",
+                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -267,7 +274,8 @@
                 "directory": "/home/freebsd/luigi",
                 "build": {
                     "Install": "npm install --production --ignore-scripts",
-                    "Build": "node ../cnoke/cnoke.js"
+                    "Build Koffi": "node ../cnoke/cnoke.js",
+                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -304,8 +312,9 @@
             "FreeBSD ARM64": {
                 "directory": "/home/freebsd/luigi",
                 "build": {
-                    "Build": "npm install --production --ignore-scripts",
-                    "Install": "node ../cnoke/cnoke.js"
+                    "Install": "npm install --production --ignore-scripts",
+                    "Build Koffi": "node ../cnoke/cnoke.js",
+                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -343,7 +352,8 @@
                 "directory": "/Users/macos/luigi",
                 "build": {
                     "Install": "PATH=/usr/local/bin:/usr/bin:/bin npm install --production --ignore-scripts",
-                    "Build": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js"
+                    "Build Koffi": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js",
+                    "Build dependencies": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Misc": "PATH=/usr/local/bin:/usr/bin:/bin node test/tests/misc.js",

package/test/test.js

@@ -153,7 +153,7 @@ async function main() {
             process.exit(1);
         }
     } else {
-        machines = new Set(...Object.keys(machines_map));
+        machines = new Set(Object.keys(machines_map));
 
         if (!machines.size) {
             console.error('Could not detect any machine');
@@ -618,7 +618,7 @@ function log(machine, action, status) {
     }
 
     let align1 = Math.max(log.align - machine.name.length, 0);
-    let align2 = Math.max(30 - action.length, 0);
+    let align2 = Math.max(34 - action.length, 0);
 
     console.log(`     [${machine.name}]${' '.repeat(align1)}  ${action}${' '.repeat(align2)}  ${status}`);
 }

package/test/tests/misc.c

@@ -12,16 +12,21 @@
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
 #include <stdio.h>
+#include <stdint.h>
 
 #ifdef _WIN32
     #define EXPORT __declspec(dllexport)
 #else
     #define EXPORT __attribute__((visibility("default")))
 #endif
-#ifdef _MSC_VER
-    #define FASTCALL __fastcall
+#if defined(_M_IX86) || defined(__i386__)
+    #ifdef _MSC_VER
+        #define FASTCALL __fastcall
+    #else
+        #define FASTCALL __attribute__((fastcall))
+    #endif
 #else
-    #define FASTCALL __attribute__((fastcall))
+    #define FASTCALL
 #endif
 
 typedef struct Pack3 {
@@ -43,3 +48,33 @@ EXPORT void FASTCALL AddPack3(int a, int b, int c, Pack3 *p)
     p->b += b;
     p->c += c;
 }
+
+EXPORT int64_t ConcatenateToInt1(int8_t a, int8_t b, int8_t c, int8_t d, int8_t e, int8_t f,
+                                 int8_t g, int8_t h, int8_t i, int8_t j, int8_t k, int8_t l)
+{
+    int64_t ret = 100000000000ull * a + 10000000000ull * b + 1000000000ull * c +
+                  100000000ull * d + 10000000ull * e + 1000000ull * f +
+                  100000ull * g + 10000ull * h + 1000ull * i +
+                  100ull * j + 10ull * k + 1ull * l;
+    return ret;
+}
+
+EXPORT int64_t ConcatenateToInt4(int32_t a, int32_t b, int32_t c, int32_t d, int32_t e, int32_t f,
+                                 int32_t g, int32_t h, int32_t i, int32_t j, int32_t k, int32_t l)
+{
+    int64_t ret = 100000000000ull * a + 10000000000ull * b + 1000000000ull * c +
+                  100000000ull * d + 10000000ull * e + 1000000ull * f +
+                  100000ull * g + 10000ull * h + 1000ull * i +
+                  100ull * j + 10ull * k + 1ull * l;
+    return ret;
+}
+
+EXPORT int64_t ConcatenateToInt8(int64_t a, int64_t b, int64_t c, int64_t d, int64_t e, int64_t f,
+                                 int64_t g, int64_t h, int64_t i, int64_t j, int64_t k, int64_t l)
+{
+    int64_t ret = 100000000000ull * a + 10000000000ull * b + 1000000000ull * c +
+                  100000000ull * d + 10000000ull * e + 1000000ull * f +
+                  100000ull * g + 10000ull * h + 1000ull * i +
+                  100ull * j + 10ull * k + 1ull * l;
+    return ret;
+}

package/test/tests/misc.js

@@ -36,11 +36,14 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/misc' + koffi.extension;
+    let lib_filename = path.dirname(__filename) + '/../build/misc' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const FillPack3 = lib.cdecl('FillPack3', 'void', ['int', 'int', 'int', koffi.out(koffi.pointer(Pack3))]);
     const AddPack3 = lib.fastcall('AddPack3', 'void', ['int', 'int', 'int', koffi.inout(koffi.pointer(Pack3))]);
+    const ConcatenateToInt1 = lib.cdecl('ConcatenateToInt1', 'int64_t', Array(12).fill('int8_t'));
+    const ConcatenateToInt4 = lib.cdecl('ConcatenateToInt4', 'int64_t', Array(12).fill('int32_t'));
+    const ConcatenateToInt8 = lib.cdecl('ConcatenateToInt8', 'int64_t', Array(12).fill('int64_t'));
 
     let p = {};
 
@@ -49,4 +52,8 @@ async function test() {
 
     AddPack3(6, 9, -12, p);
     assert.deepEqual(p, { a: 7, b: 11, c: -9 });
+
+    assert.equal(ConcatenateToInt1(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687);
+    assert.equal(ConcatenateToInt4(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687);
+    assert.equal(ConcatenateToInt8(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687);
 }

package/test/tests/raylib.js

@@ -83,7 +83,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/raylib' + koffi.extension;
+    let lib_filename = path.dirname(__filename) + '/../build/raylib' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const InitWindow = lib.cdecl('InitWindow', 'void', ['int', 'int', 'string']);

package/test/tests/sqlite.js

@@ -36,7 +36,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/sqlite3' + koffi.extension;
+    let lib_filename = path.dirname(__filename) + '/../build/sqlite3' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const sqlite3_open_v2 = lib.cdecl('sqlite3_open_v2', 'int', ['string', koffi.out(koffi.pointer(sqlite3_db)), 'int', 'string']);

package/vendor/raylib/src/external/glfw/src/posix_time.c

@@ -27,7 +27,9 @@
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 
-#define _POSIX_C_SOURCE 199309L
+#ifndef _POSIX_C_SOURCE
+    #define _POSIX_C_SOURCE 199309L
+#endif
 
 #include "internal.h"
 

package/vendor/raylib/src/external/glfw/src/wl_init.c

@@ -26,7 +26,9 @@
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 
-#define _POSIX_C_SOURCE 199309L
+#ifndef _POSIX_C_SOURCE
+    #define _POSIX_C_SOURCE 199309L
+#endif
 
 #include "internal.h"