koffi 1.0.5 → 1.1.0-beta.2

package/test/misc.c

@@ -60,8 +60,7 @@ typedef struct Float2 {
 } Float2;
 typedef struct Float3 {
     float a;
-    float b;
-    float c;
+    float b[2];
 } Float3;
 
 typedef struct Double2 {
@@ -70,8 +69,10 @@ typedef struct Double2 {
 } Double2;
 typedef struct Double3 {
     double a;
-    double b;
-    double c;
+    struct {
+        double b;
+        double c;
+    } s;
 } Double3;
 
 typedef struct IJK1 { int8_t i; int8_t j; int8_t k; } IJK1;
@@ -185,13 +186,18 @@ EXPORT Float3 PackFloat3(float a, float b, float c, Float3 *out)
     Float3 ret;
 
     ret.a = a;
-    ret.b = b;
-    ret.c = c;
+    ret.b[0] = b;
+    ret.b[1] = c;
     *out = ret;
 
     return ret;
 }
 
+EXPORT Float3 ThroughFloat3(Float3 f3)
+{
+    return f3;
+}
+
 EXPORT Double2 PackDouble2(double a, double b, Double2 *out)
 {
     Double2 ret;
@@ -208,8 +214,8 @@ EXPORT Double3 PackDouble3(double a, double b, double c, Double3 *out)
     Double3 ret;
 
     ret.a = a;
-    ret.b = b;
-    ret.c = c;
+    ret.s.b = b;
+    ret.s.c = c;
     *out = ret;
 
     return ret;
@@ -275,7 +281,7 @@ EXPORT BFG STDCALL MakeBFG(BFG *p, int x, double y, const char *str)
 {
     BFG bfg;
 
-    char buf[64];
+    static char buf[64];
     snprintf(buf, sizeof(buf), "X/%s/X", str);
 
     bfg.a = x;
@@ -294,7 +300,7 @@ EXPORT PackedBFG FASTCALL MakePackedBFG(int x, double y, PackedBFG *p, const cha
 {
     PackedBFG bfg;
 
-    char buf[64];
+    static char buf[64];
     snprintf(buf, sizeof(buf), "X/%s/X", str);
 
     bfg.a = x;

package/test/misc.js

@@ -1,227 +0,0 @@
-#!/usr/bin/env node
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// 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 assert = require('assert');
-const path = require('path');
-
-const Pack1 = koffi.struct('Pack1', {
-    a: 'int'
-});
-const Pack2 = koffi.struct('Pack2', {
-    a: 'int',
-    b: 'int'
-});
-const Pack3 = koffi.struct('Pack3', {
-    a: 'int',
-    b: 'int',
-    c: 'int'
-});
-
-const Float2 = koffi.struct('Float2', {
-    a: 'float',
-    b: 'float'
-});
-const Float3 = koffi.struct('Float3', {
-    a: 'float',
-    b: 'float',
-    c: 'float'
-});
-
-const Double2 = koffi.struct('Double2', {
-    a: 'double',
-    b: 'double'
-});
-const Double3 = koffi.struct('Double3', {
-    a: 'double',
-    b: 'double',
-    c: 'double'
-});
-
-const BFG = koffi.struct('BFG', {
-    a: 'int8_t',
-    b: 'int64_t',
-    c: 'char',
-    d: 'string',
-    e: 'short',
-    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'
-    })
-});
-
-main();
-
-async function main() {
-    try {
-        await test();
-        console.log('Success!');
-    } catch (err) {
-        console.error(err);
-        process.exit(1);
-    }
-}
-
-async function test() {
-    let lib_filename = path.dirname(__filename) + '/build/misc' + koffi.extension;
-    let lib = koffi.load(lib_filename);
-
-    const FillPack1 = lib.func('FillPack1', 'void', ['int', koffi.out(koffi.pointer(Pack1))]);
-    const RetPack1 = lib.func('RetPack1', Pack1, ['int']);
-    const AddPack1 = lib.fastcall('AddPack1', 'void', ['int', koffi.inout(koffi.pointer(Pack1))]);
-    const FillPack2 = lib.func('FillPack2', 'void', ['int', 'int', koffi.out(koffi.pointer(Pack2))]);
-    const RetPack2 = lib.func('RetPack2', Pack2, ['int', 'int']);
-    const AddPack2 = lib.fastcall('AddPack2', 'void', ['int', 'int', koffi.inout(koffi.pointer(Pack2))]);
-    const FillPack3 = lib.func('FillPack3', 'void', ['int', 'int', 'int', koffi.out(koffi.pointer(Pack3))]);
-    const RetPack3 = lib.func('RetPack3', Pack3, ['int', 'int', 'int']);
-    const AddPack3 = lib.fastcall('AddPack3', 'void', ['int', 'int', 'int', koffi.inout(koffi.pointer(Pack3))]);
-    const PackFloat2 = lib.func('Float2 PackFloat2(float a, float b, _Out_ Float2 *out)');
-    const PackFloat3 = lib.func('Float3 PackFloat3(float a, float b, float c, _Out_ Float3 *out)');
-    const PackDouble2 = lib.func('Double2 PackDouble2(double a, double b, _Out_ Double2 *out)');
-    const PackDouble3 = lib.func('Double3 PackDouble3(double a, double b, double c, _Out_ Double3 *out)');
-    const ConcatenateToInt1 = lib.func('ConcatenateToInt1', 'int64_t', Array(12).fill('int8_t'));
-    const ConcatenateToInt4 = lib.func('ConcatenateToInt4', 'int64_t', Array(12).fill('int32_t'));
-    const ConcatenateToInt8 = lib.func('ConcatenateToInt8', 'int64_t', Array(12).fill('int64_t'));
-    const ConcatenateToStr1 = lib.func('ConcatenateToStr1', 'string', [...Array(8).fill('int8_t'), koffi.struct('IJK1', {i: 'int8_t', j: 'int8_t', k: 'int8_t'}), 'int8_t']);
-    const ConcatenateToStr4 = lib.func('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.func('ConcatenateToStr8', 'string', [...Array(8).fill('int64_t'), koffi.struct('IJK8', {i: 'int64_t', j: 'int64_t', k: 'int64_t'}), 'int64_t']);
-    const MakeBFG = lib.func('BFG __stdcall MakeBFG(_Out_ BFG *p, int x, double y, const char *str)');
-    const MakePackedBFG = lib.func('PackedBFG __fastcall MakePackedBFG(int x, double y, _Out_ PackedBFG *p, const char *str)');
-    const ReturnBigString = process.platform == 'win32' ?
-                            lib.stdcall(1, 'string', ['string']) :
-                            lib.func('const char * __stdcall ReturnBigString(const char *str)');
-    const PrintFmt = lib.func('const char *PrintFmt(const char *fmt, ...)');
-    const Concat16 = lib.func('const char16_t *Concat16(const char16_t *str1, const char16_t *str2)')
-
-    // Simple tests with Pack1
-    {
-        let p = {};
-
-        FillPack1(777, p);
-        assert.deepEqual(p, { a: 777 });
-
-        let q = RetPack1(6);
-        assert.deepEqual(q, { a: 6 });
-
-        AddPack1(6, p);
-        assert.deepEqual(p, { a: 783 });
-    }
-
-    // Simple tests with Pack2
-    {
-        let p = {};
-
-        FillPack2(123, 456, p);
-        assert.deepEqual(p, { a: 123, b: 456 });
-
-        let q = RetPack2(6, 9);
-        assert.deepEqual(q, { a: 6, b: 9 });
-
-        AddPack2(6, 9, p);
-        assert.deepEqual(p, { a: 129, b: 465 });
-    }
-
-    // Simple tests with Pack3
-    {
-        let p = {};
-
-        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 });
-    }
-
-    // HFA tests
-    {
-        let f2p = {};
-        let f2 = PackFloat2(1.5, 3.0, f2p);
-        assert.deepEqual(f2, { a: 1.5, b: 3.0 });
-        assert.deepEqual(f2, f2p);
-
-        let f3p = {};
-        let f3 = PackFloat3(20.0, 30.0, 40.0, f3p);
-        assert.deepEqual(f3, { a: 20.0, b: 30.0, c: 40.0 });
-        assert.deepEqual(f3, f3p);
-
-        let d2p = {};
-        let d2 = PackDouble2(1.0, 2.0, d2p);
-        assert.deepEqual(d2, { a: 1.0, b: 2.0 });
-        assert.deepEqual(d2, d2p);
-
-        let d3p = {};
-        let d3 = PackDouble3(0.5, 10.0, 5.0, d3p);
-        assert.deepEqual(d3, { a: 0.5, b: 10.0, c: 5.0 });
-        assert.deepEqual(d3, d3p);
-    }
-
-    // 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');
-    }
-
-    // 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);
-    }
-
-    // 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);
-    }
-
-    // Big string
-    {
-        let str = 'fooBAR!'.repeat(1024 * 1024);
-        assert.equal(ReturnBigString(str), str);
-    }
-
-    // Variadic
-    {
-        let str = PrintFmt('foo %d %g %s', 'int', 200, 'double', 1.5, 'string', 'BAR');
-        assert.equal(str, 'foo 200 1.5 BAR');
-    }
-
-    // UTF-16LE strings
-    {
-        let str = Concat16('Hello ', 'World!');
-        assert.equal(str, 'Hello World!');
-    }
-}