koffi 0.9.26 → 0.9.29

package/src/util.hh

@@ -74,6 +74,7 @@ class CallData {
 
     Span<uint8_t> *stack_mem;
     Span<uint8_t> *heap_mem;
+    BlockAllocator big_alloc;
 
     Span<uint8_t> old_stack_mem;
     Span<uint8_t> old_heap_mem;
@@ -101,8 +102,8 @@ public:
 
     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);
+    template <typename T = void>
+    bool AllocHeap(Size size, Size align, T **out_ptr = nullptr);
 
     const char *PushString(const Napi::Value &value);
     bool PushObject(const Napi::Object &obj, const TypeInfo *type, uint8_t *dest);
@@ -151,7 +152,9 @@ bool CallData::AllocHeap(Size size, Size align, T **out_ptr)
     heap_mem->ptr += delta;
     heap_mem->len -= delta;
 
-    *out_ptr = (T *)ptr;
+    if (out_ptr) {
+        *out_ptr = (T *)ptr;
+    }
     return true;
 }
 

package/test/CMakeLists.txt

@@ -14,6 +14,10 @@
 cmake_minimum_required(VERSION 3.12)
 project(koffi C CXX)
 
+if(NOT TARGET koffi)
+    add_subdirectory(.. koffi)
+endif()
+
 # ---- Raylib ----
 
 add_library(raylib SHARED

package/test/registry/machines.json

@@ -25,9 +25,7 @@
             "Linux ARM32": {
                 "directory": "/home/debian/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -64,9 +62,7 @@
             "Linux ARM64": {
                 "directory": "/home/debian/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -103,9 +99,7 @@
             "Linux i386": {
                 "directory": "/home/debian/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -142,9 +136,7 @@
             "Linux x64": {
                 "directory": "/home/debian/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -181,9 +173,7 @@
             "Windows i386": {
                 "directory": "C:/Users/windows/Desktop/luigi32",
                 "build": {
-                    "Install": "C:\\Node32\\node32.cmd npm install --production --ignore-scripts",
-                    "Build Koffi": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js",
-                    "Build dependencies": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js -C test"
+                    "Build": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "seatsh C:\\Node32\\node32.cmd node test/tests/raylib.js",
@@ -195,9 +185,7 @@
             "Windows x64": {
                 "directory": "C:/Users/windows/Desktop/luigi64",
                 "build": {
-                    "Install": "C:\\Node64\\node64.cmd npm install --production --ignore-scripts",
-                    "Build Koffi": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js",
-                    "Build dependencies": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js -C test"
+                    "Build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "seatsh C:\\Node64\\node64.cmd node test/tests/raylib.js",
@@ -234,9 +222,7 @@
             "FreeBSD x64": {
                 "directory": "/home/freebsd/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -273,9 +259,7 @@
             "FreeBSD i386": {
                 "directory": "/home/freebsd/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -312,9 +296,7 @@
             "FreeBSD ARM64": {
                 "directory": "/home/freebsd/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -351,9 +333,7 @@
             "macOS x64": {
                 "directory": "/Users/macos/luigi",
                 "build": {
-                    "Install": "PATH=/usr/local/bin:/usr/bin:/bin npm install --production --ignore-scripts",
-                    "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"
+                    "Build": "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/tests/misc.c

@@ -53,6 +53,19 @@ typedef struct BFG {
         double g;
     } inner;
 } BFG;
+#pragma pack(push, 1)
+typedef struct PackedBFG {
+    int8_t a;
+    int64_t b;
+    signed char c;
+    const char *d;
+    short e;
+    struct {
+        float f;
+        double g;
+    } inner;
+} PackedBFG;
+#pragma pack(pop)
 
 EXPORT void FillPack3(int a, int b, int c, Pack3 *p)
 {
@@ -135,14 +148,36 @@ EXPORT const char *ConcatenateToStr8(int64_t a, int64_t b, int64_t c, int64_t d,
     return buf;
 }
 
-EXPORT BFG STDCALL MakeBFG(int x, double y, BFG *p)
+EXPORT BFG STDCALL MakeBFG(BFG *p, int x, double y, const char *str)
 {
     BFG bfg;
 
+    char buf[64];
+    snprintf(buf, sizeof(buf), "X/%s/X", str);
+
+    bfg.a = x;
+    bfg.b = x * 2;
+    bfg.c = x - 27;
+    bfg.d = buf;
+    bfg.e = x * 27;
+    bfg.inner.f = (float)y * x;
+    bfg.inner.g = (double)y - x;
+    *p = bfg;
+
+    return bfg;
+}
+
+EXPORT PackedBFG FASTCALL MakePackedBFG(int x, double y, PackedBFG *p, const char *str)
+{
+    PackedBFG bfg;
+
+    char buf[64];
+    snprintf(buf, sizeof(buf), "X/%s/X", str);
+
     bfg.a = x;
     bfg.b = x * 2;
     bfg.c = x - 27;
-    bfg.d = "Hello";
+    bfg.d = buf;
     bfg.e = x * 27;
     bfg.inner.f = (float)y * x;
     bfg.inner.g = (double)y - x;
@@ -150,3 +185,13 @@ EXPORT BFG STDCALL MakeBFG(int x, double y, BFG *p)
 
     return bfg;
 }
+
+EXPORT const char *ReturnBigString(const char *str)
+{
+    static char buf[1 * 1024 * 1024];
+
+    size_t len = strlen(str);
+    memcpy(buf, str, len + 1);
+
+    return buf;
+}

package/test/tests/misc.js

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-const koffi = require('../../build/koffi.node');
+const koffi = require('../build/koffi.node');
 const assert = require('assert');
 const path = require('path');
 
@@ -29,7 +29,18 @@ const BFG = koffi.struct('BFG', {
     c: 'char',
     d: 'string',
     e: 'short',
-    inner: koffi.struct('BFG.inner', {
+    inner: koffi.struct({
+        f: 'float',
+        g: 'double'
+    })
+});
+const PackedBFG = koffi.pack('PackedBFG', {
+    a: 'int8_t',
+    b: 'int64_t',
+    c: 'char',
+    d: 'string',
+    e: 'short',
+    inner: koffi.pack({
         f: 'float',
         g: 'double'
     })
@@ -60,28 +71,53 @@ async function test() {
     const ConcatenateToStr1 = lib.cdecl('ConcatenateToStr1', 'string', [...Array(8).fill('int8_t'), koffi.struct('IJK1', {i: 'int8_t', j: 'int8_t', k: 'int8_t'}), 'int8_t']);
     const ConcatenateToStr4 = lib.cdecl('ConcatenateToStr4', 'string', [...Array(8).fill('int32_t'), koffi.pointer(koffi.struct('IJK4', {i: 'int32_t', j: 'int32_t', k: 'int32_t'})), 'int32_t']);
     const ConcatenateToStr8 = lib.cdecl('ConcatenateToStr8', 'string', [...Array(8).fill('int64_t'), koffi.struct('IJK8', {i: 'int64_t', j: 'int64_t', k: 'int64_t'}), 'int64_t']);
-    const MakeBFG = lib.stdcall('MakeBFG', BFG, ['int', 'double', koffi.out(koffi.pointer(BFG))]);
+    const MakeBFG = lib.stdcall('MakeBFG', BFG, [koffi.out(koffi.pointer(BFG)), 'int', 'double', 'string']);
+    const MakePackedBFG = lib.stdcall('MakePackedBFG', PackedBFG, ['int', 'double', koffi.out(koffi.pointer(PackedBFG)), 'string']);
+    const ReturnBigString = lib.stdcall('ReturnBigString', 'string', ['string']);
+
+    // Simple tests
+    {
+        let p = {};
 
-    let p = {};
+        FillPack3(1, 2, 3, p);
+        assert.deepEqual(p, { a: 1, b: 2, c: 3 });
 
-    FillPack3(1, 2, 3, p);
-    assert.deepEqual(p, { a: 1, b: 2, c: 3 });
+        let q = RetPack3(6, 9, -12);
+        assert.deepEqual(q, { a: 6, b: 9, c: -12 });
+
+        AddPack3(6, 9, -12, p);
+        assert.deepEqual(p, { a: 7, b: 11, c: -9 });
+    }
 
-    let q = RetPack3(6, 9, -12);
-    assert.deepEqual(q, { a: 6, b: 9, c: -12 });
+    // Many parameters
+    {
+        assert.equal(ConcatenateToInt1(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
+        assert.equal(ConcatenateToInt4(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
+        assert.equal(ConcatenateToInt8(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
+        assert.equal(ConcatenateToStr1(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
+        assert.equal(ConcatenateToStr4(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
+        assert.equal(ConcatenateToStr8(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
+    }
 
-    AddPack3(6, 9, -12, p);
-    assert.deepEqual(p, { a: 7, b: 11, c: -9 });
+    // Big struct
+    {
+        let out = {};
+        let bfg = MakeBFG(out, 2, 7, '__Hello123456789++++foobarFOOBAR!__');
+        assert.deepEqual(bfg, { a: 2, b: 4, c: -25, d: 'X/__Hello123456789++++foobarFOOBAR!__/X', e: 54, inner: { f: 14, g: 5 } });
+        assert.deepEqual(out, bfg);
+    }
 
-    assert.equal(ConcatenateToInt1(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
-    assert.equal(ConcatenateToInt4(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
-    assert.equal(ConcatenateToInt8(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
-    assert.equal(ConcatenateToStr1(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
-    assert.equal(ConcatenateToStr4(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
-    assert.equal(ConcatenateToStr8(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
+    // Packed struct
+    {
+        let out = {};
+        let bfg = MakePackedBFG(2, 7, out, '__Hello123456789++++foobarFOOBAR!__');
+        assert.deepEqual(bfg, { a: 2, b: 4, c: -25, d: 'X/__Hello123456789++++foobarFOOBAR!__/X', e: 54, inner: { f: 14, g: 5 } });
+        assert.deepEqual(out, bfg);
+    }
 
-    let out = {};
-    let bfg = MakeBFG(2, 7, out);
-    assert.deepEqual(bfg, { a: 2, b: 4, c: -25, d: 'Hello', e: 54, inner: { f: 14, g: 5 } });
-    assert.deepEqual(out, bfg);
+    // Big string
+    {
+        let str = 'fooBAR!'.repeat(1024 * 1024);
+        assert.equal(ReturnBigString(str), str);
+    }
 }

package/test/tests/raylib.js

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-const koffi = require('../../build/koffi.node');
+const koffi = require('../build/koffi.node');
 const crypto = require('crypto');
 const fs = require('fs');
 const os = require('os');

package/test/tests/sqlite.js

@@ -14,7 +14,7 @@
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
 const crypto = require('crypto');
-const koffi = require('../../build/koffi.node');
+const koffi = require('../build/koffi.node');
 const assert = require('assert');
 const fs = require('fs');
 const os = require('os');

package/vendor/sqlite3/shell.c

@@ -7964,9 +7964,14 @@ static int zipfileFilter(
     zipfileCursorErr(pCsr, "zipfile() function requires an argument");
     return SQLITE_ERROR;
   }else if( sqlite3_value_type(argv[0])==SQLITE_BLOB ){
+    static const u8 aEmptyBlob = 0;
     const u8 *aBlob = (const u8*)sqlite3_value_blob(argv[0]);
     int nBlob = sqlite3_value_bytes(argv[0]);
     assert( pTab->pFirstEntry==0 );
+    if( aBlob==0 ){
+      aBlob = &aEmptyBlob;
+      nBlob = 0;
+    }
     rc = zipfileLoadDirectory(pTab, aBlob, nBlob);
     pCsr->pFreeEntry = pTab->pFirstEntry;
     pTab->pFirstEntry = pTab->pLastEntry = 0;
@@ -19906,7 +19911,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 
   if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
     char *zTable = 0;           /* Insert data into this table */
-    char *zSchema = "main";     /* within this schema */
+    char *zSchema = 0;          /* within this schema (may default to "main") */
     char *zFile = 0;            /* Name of file to extra content from */
     sqlite3_stmt *pStmt = NULL; /* A statement */
     int nCol;                   /* Number of columns in the table */
@@ -19915,11 +19920,13 @@ static int do_meta_command(char *zLine, ShellState *p){
     int needCommit;             /* True to COMMIT or ROLLBACK at end */
     int nSep;                   /* Number of bytes in p->colSeparator[] */
     char *zSql;                 /* An SQL statement */
+    char *zFullTabName;         /* Table name with schema if applicable */
     ImportCtx sCtx;             /* Reader context */
     char *(SQLITE_CDECL *xRead)(ImportCtx*); /* Func to read one value */
     int eVerbose = 0;           /* Larger for more console output */
     int nSkip = 0;              /* Initial lines to skip */
     int useOutputMode = 1;      /* Use output mode to determine separators */
+    char *zCreate = 0;          /* CREATE TABLE statement text */
 
     failIfSafeMode(p, "cannot run .import in safe mode");
     memset(&sCtx, 0, sizeof(sCtx));
@@ -20042,7 +20049,6 @@ static int do_meta_command(char *zLine, ShellState *p){
       import_cleanup(&sCtx);
       goto meta_command_exit;
     }
-    /* Below, resources must be freed before exit. */
     if( eVerbose>=2 || (eVerbose>=1 && useOutputMode) ){
       char zSep[2];
       zSep[1] = 0;
@@ -20054,11 +20060,17 @@ static int do_meta_command(char *zLine, ShellState *p){
       output_c_string(p->out, zSep);
       utf8_printf(p->out, "\n");
     }
+    /* Below, resources must be freed before exit. */
     while( (nSkip--)>0 ){
       while( xRead(&sCtx) && sCtx.cTerm==sCtx.cColSep ){}
     }
-    zSql = sqlite3_mprintf("SELECT * FROM \"%w\".\"%w\"", zSchema, zTable);
-    if( zSql==0 ){
+    if( zSchema!=0 ){
+      zFullTabName = sqlite3_mprintf("\"%w\".\"%w\"", zSchema, zTable);
+    }else{
+      zFullTabName = sqlite3_mprintf("\"%w\"", zTable);
+    }
+    zSql = sqlite3_mprintf("SELECT * FROM %s", zFullTabName);
+    if( zSql==0 || zFullTabName==0 ){
       import_cleanup(&sCtx);
       shell_out_of_memory();
     }
@@ -20066,11 +20078,10 @@ static int do_meta_command(char *zLine, ShellState *p){
     rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
     import_append_char(&sCtx, 0);    /* To ensure sCtx.z is allocated */
     if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(p->db))==0 ){
-      char *zCreate = sqlite3_mprintf("CREATE TABLE \"%w\".\"%w\"",
-                                      zSchema, zTable);
       sqlite3 *dbCols = 0;
       char *zRenames = 0;
       char *zColDefs;
+      zCreate = sqlite3_mprintf("CREATE TABLE %s", zFullTabName);
       while( xRead(&sCtx) ){
         zAutoColumn(sCtx.z, &dbCols, 0);
         if( sCtx.cTerm!=sCtx.cColSep ) break;
@@ -20084,9 +20095,12 @@ static int do_meta_command(char *zLine, ShellState *p){
       }
       assert(dbCols==0);
       if( zColDefs==0 ){
+        utf8_printf(stderr,"%s: empty file\n", sCtx.zFile);
+      import_fail:
         sqlite3_free(zCreate);
+        sqlite3_free(zSql);
+        sqlite3_free(zFullTabName);
         import_cleanup(&sCtx);
-        utf8_printf(stderr,"%s: empty file\n", sCtx.zFile);
         rc = 1;
         goto meta_command_exit;
       }
@@ -20097,22 +20111,18 @@ static int do_meta_command(char *zLine, ShellState *p){
       rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
       if( rc ){
         utf8_printf(stderr, "%s failed:\n%s\n", zCreate, sqlite3_errmsg(p->db));
-        sqlite3_free(zCreate);
-        import_cleanup(&sCtx);
-        rc = 1;
-        goto meta_command_exit;
+        goto import_fail;
       }
       sqlite3_free(zCreate);
+      zCreate = 0;
       rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
     }
-    sqlite3_free(zSql);
     if( rc ){
       if (pStmt) sqlite3_finalize(pStmt);
       utf8_printf(stderr,"Error: %s\n", sqlite3_errmsg(p->db));
-      import_cleanup(&sCtx);
-      rc = 1;
-      goto meta_command_exit;
+      goto import_fail;
     }
+    sqlite3_free(zSql);
     nCol = sqlite3_column_count(pStmt);
     sqlite3_finalize(pStmt);
     pStmt = 0;
@@ -20122,8 +20132,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       import_cleanup(&sCtx);
       shell_out_of_memory();
     }
-    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\".\"%w\" VALUES(?",
-                     zSchema, zTable);
+    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO %s VALUES(?", zFullTabName);
     j = strlen30(zSql);
     for(i=1; i<nCol; i++){
       zSql[j++] = ',';
@@ -20135,14 +20144,13 @@ static int do_meta_command(char *zLine, ShellState *p){
       utf8_printf(p->out, "Insert using: %s\n", zSql);
     }
     rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-    sqlite3_free(zSql);
     if( rc ){
       utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
       if (pStmt) sqlite3_finalize(pStmt);
-      import_cleanup(&sCtx);
-      rc = 1;
-      goto meta_command_exit;
+      goto import_fail;
     }
+    sqlite3_free(zSql);
+    sqlite3_free(zFullTabName);
     needCommit = sqlite3_get_autocommit(p->db);
     if( needCommit ) sqlite3_exec(p->db, "BEGIN", 0, 0, 0);
     do{
@@ -22636,7 +22644,8 @@ static int process_input(ShellState *p){
       qss = QSS_Start;
     }
   }
-  if( nSql && QSS_PLAINDARK(qss) ){
+  if( nSql ){
+    /* This may be incomplete. Let the SQL parser deal with that. */
     errCnt += runOneSqlLine(p, zSql, p->in, startline);
   }
   free(zSql);