node-gtk 0.14.0 → 2.0.0

package/scripts/build-test-fixtures.js

@@ -0,0 +1,237 @@
+/*
+ * build-test-fixtures.js
+ *
+ * Makes the gobject-introspection test libraries (Utility, GIMarshallingTests,
+ * Regress) available for node-gtk's test suite. These libraries systematically
+ * exercise marshalling of every GObject type in every direction
+ * (in/out/inout/return), so they let us test node-gtk's type conversions
+ * exhaustively instead of ad-hoc.
+ *
+ * Strategy: always build from a single pinned upstream source revision, on
+ * every platform. Distro-shipped copies (the gobject-introspection package's
+ * bundled tests, or prebuilt gjs `installed-tests` typelibs) vary wildly by
+ * version — functions and types present on one machine are absent on another —
+ * which makes the test suite non-portable. Pinning one revision of the
+ * canonical `gobject-introspection-tests` repo and compiling it ourselves gives
+ * every machine (dev, Linux CI, macOS CI) the exact same API surface.
+ *
+ * The pinned sources are downloaded once (as a tarball) and cached under
+ * tests/gi-fixtures/.src/; the compiled output goes to tests/gi-fixtures/
+ * ({NAME}-1.0.typelib + lib{name}.so). Both are git-ignored.
+ *
+ * Run directly (`node scripts/build-test-fixtures.js`) or via `npm test`
+ * (it runs as a pretest step). Idempotent: existing fixtures are reused unless
+ * --force is passed. To bump the upstream revision, change SOURCE_REF.
+ */
+
+const fs = require('fs')
+const path = require('path')
+const { execFileSync, execSync } = require('child_process')
+
+const FIXTURES_DIR = path.join(__dirname, '..', 'tests', 'gi-fixtures')
+const SRC_CACHE_DIR = path.join(FIXTURES_DIR, '.src')
+const FORCE = process.argv.includes('--force')
+const VERBOSE = process.argv.includes('--verbose') || process.env.VERBOSE
+
+// Canonical upstream test sources, pinned to a specific revision so every
+// machine builds the identical API. Bump SOURCE_REF to update.
+const SOURCE_REPO = 'https://gitlab.gnome.org/GNOME/gobject-introspection-tests'
+const SOURCE_REF = '5987255086f59ca271a3a0aa53fbbb15b189be65'
+
+// Each fixture mirrors the upstream meson.build recipe: the GI namespace, its
+// shared-library basename, the source/header files that make it up, the
+// pkg-config packages it links, and the GI namespaces its typelib includes.
+// Order matters: Regress's typelib includes Utility, so Utility is built first.
+const FIXTURES = [
+  {
+    namespace: 'Utility',
+    library: 'utility',
+    identifierPrefix: 'Utility',
+    symbolPrefix: 'utility_',
+    sources: ['utility.c'],
+    headers: ['utility.h'],
+    packages: ['gobject-2.0'],
+    includes: ['GObject-2.0'],
+  },
+  {
+    namespace: 'GIMarshallingTests',
+    library: 'gimarshallingtests',
+    identifierPrefix: 'GIMarshallingTests',
+    symbolPrefix: 'gi_marshalling_tests_',
+    sources: ['gimarshallingtests.c', 'gimarshallingtestsextra.c'],
+    headers: ['gimarshallingtests.h', 'gimarshallingtestsextra.h'],
+    packages: ['gobject-2.0', 'gio-2.0'],
+    includes: ['Gio-2.0'],
+  },
+  {
+    namespace: 'Regress',
+    library: 'regress',
+    identifierPrefix: 'Regress',
+    symbolPrefix: 'regress_',
+    sources: ['annotation.c', 'drawable.c', 'foo.c', 'regress.c', 'regressextra.c'],
+    headers: ['annotation.h', 'drawable.h', 'foo.h', 'regress.h', 'regressextra.h'],
+    packages: ['gobject-2.0', 'gio-2.0', 'cairo', 'cairo-gobject'],
+    includes: ['Gio-2.0', 'cairo-1.0', 'Utility-1.0'],
+  },
+]
+
+function log(...args) {
+  console.log('[fixtures]', ...args)
+}
+function vlog(...args) {
+  if (VERBOSE) console.log('[fixtures]', ...args)
+}
+
+function pkgConfig(args) {
+  return execSync(`pkg-config ${args}`, { encoding: 'utf8' }).trim()
+}
+
+function which(bin) {
+  try {
+    return execFileSync('sh', ['-c', `command -v ${bin}`], { encoding: 'utf8' }).trim()
+  } catch (e) {
+    return null
+  }
+}
+
+function fixtureIsPresent(fixture) {
+  const typelib = path.join(FIXTURES_DIR, `${fixture.namespace}-1.0.typelib`)
+  const lib = path.join(FIXTURES_DIR, `lib${fixture.library}.so`)
+  return fs.existsSync(typelib) && fs.existsSync(lib)
+}
+
+// Download + extract the pinned upstream sources once; return the dir holding
+// the .c/.h files. Cached under SRC_CACHE_DIR/<ref>, keyed by revision.
+function ensureSources() {
+  const destDir = path.join(SRC_CACHE_DIR, SOURCE_REF)
+  // The repo's files live at the tarball root; a marker file confirms a
+  // complete previous extraction.
+  if (fs.existsSync(path.join(destDir, 'gimarshallingtests.c'))) {
+    vlog(`sources present at ${destDir}`)
+    return destDir
+  }
+
+  fs.mkdirSync(SRC_CACHE_DIR, { recursive: true })
+  const tarball = path.join(SRC_CACHE_DIR, `${SOURCE_REF}.tar.gz`)
+  const url = `${SOURCE_REPO}/-/archive/${SOURCE_REF}/src-${SOURCE_REF}.tar.gz`
+
+  log(`downloading test sources @ ${SOURCE_REF.slice(0, 12)}`)
+  execFileSync('curl', ['-fsSL', url, '-o', tarball], { stdio: VERBOSE ? 'inherit' : 'pipe' })
+
+  // The tarball extracts to a single top-level dir; strip it into destDir.
+  fs.mkdirSync(destDir, { recursive: true })
+  execFileSync('tar', ['xzf', tarball, '-C', destDir, '--strip-components=1'],
+    { stdio: VERBOSE ? 'inherit' : 'pipe' })
+  fs.unlinkSync(tarball)
+  return destDir
+}
+
+function buildFixture(fixture, srcDir, tools) {
+  const sources = fixture.sources.map(s => path.join(srcDir, s))
+  const headers = fixture.headers.map(h => path.join(srcDir, h))
+  if (![...sources, ...headers].every(fs.existsSync)) {
+    throw new Error(`sources for ${fixture.namespace} missing in ${srcDir}`)
+  }
+
+  const cflags = pkgConfig(`--cflags ${fixture.packages.join(' ')}`)
+  const libs = pkgConfig(`--libs ${fixture.packages.join(' ')}`)
+  const libPath = path.join(FIXTURES_DIR, `lib${fixture.library}.so`)
+  const girPath = path.join(FIXTURES_DIR, `${fixture.namespace}-1.0.gir`)
+  const typelibPath = path.join(FIXTURES_DIR, `${fixture.namespace}-1.0.typelib`)
+
+  // 1. shared library
+  const cc = process.env.CC || 'cc'
+  const compileCmd =
+    `${cc} -shared -fPIC -I"${srcDir}" ${cflags} ` +
+    `${sources.map(s => `"${s}"`).join(' ')} ${libs} -o "${libPath}"`
+  vlog(compileCmd)
+  execSync(compileCmd, { stdio: VERBOSE ? 'inherit' : 'pipe' })
+
+  // 2. introspection data (.gir)
+  const scanArgs = [
+    ...sources, ...headers,
+    '--warn-all',
+    '--namespace', fixture.namespace,
+    '--nsversion', '1.0',
+    '--identifier-prefix', fixture.identifierPrefix,
+    '--symbol-prefix', fixture.symbolPrefix,
+    '--library', fixture.library,
+    '--library-path', FIXTURES_DIR,
+    // So that --include of an already-built local fixture (e.g. Utility-1.0,
+    // which Regress depends on) resolves its .gir from our output dir.
+    '--add-include-path', FIXTURES_DIR,
+    ...fixture.includes.flatMap(i => ['--include', i]),
+    ...fixture.packages.flatMap(p => ['--pkg', p]),
+    '--cflags-begin', ...cflags.split(/\s+/).filter(Boolean), `-I${srcDir}`, '--cflags-end',
+    '--output', girPath,
+  ]
+  vlog(tools.scanner, scanArgs.join(' '))
+  execFileSync(tools.scanner, scanArgs, {
+    stdio: VERBOSE ? 'inherit' : 'pipe',
+    env: { ...process.env, LD_LIBRARY_PATH: `${FIXTURES_DIR}:${process.env.LD_LIBRARY_PATH || ''}` },
+  })
+
+  // 3. compiled typelib (--includedir resolves locally-built included girs)
+  execFileSync(tools.compiler, [girPath, '--includedir', FIXTURES_DIR, '--output', typelibPath], {
+    stdio: VERBOSE ? 'inherit' : 'pipe',
+  })
+
+  log(`built ${fixture.namespace}`)
+  return true
+}
+
+function main() {
+  fs.mkdirSync(FIXTURES_DIR, { recursive: true })
+
+  const allPresent = FIXTURES.every(fixtureIsPresent)
+  if (!FORCE && allPresent) {
+    vlog('all fixtures already present, skipping (use --force to rebuild)')
+    log(`available fixtures: ${FIXTURES.map(f => f.namespace).join(', ')}`)
+    return
+  }
+
+  const tools = {
+    scanner: which('g-ir-scanner'),
+    compiler: which('g-ir-compiler'),
+  }
+  if (!tools.scanner || !tools.compiler || !which('curl') || !which('tar')) {
+    log('WARNING: g-ir-scanner/g-ir-compiler/curl/tar not all available; ' +
+      'cannot build fixtures. Dependent tests will skip.')
+    return
+  }
+
+  let srcDir
+  try {
+    srcDir = ensureSources()
+  } catch (e) {
+    log(`WARNING: could not fetch test sources: ${e.message.split('\n')[0]}`)
+    log('dependent tests will skip')
+    return
+  }
+
+  const results = []
+  for (const fixture of FIXTURES) {
+    if (!FORCE && fixtureIsPresent(fixture)) {
+      vlog(`${fixture.namespace} already present, skipping`)
+      results.push({ fixture, ok: true })
+      continue
+    }
+    let ok = false
+    try {
+      ok = buildFixture(fixture, srcDir, tools)
+    } catch (e) {
+      log(`failed to build ${fixture.namespace}: ${e.message.split('\n')[0]}`)
+    }
+    if (!ok)
+      log(`WARNING: could not provide ${fixture.namespace}; dependent tests will skip`)
+    results.push({ fixture, ok })
+  }
+
+  const provided = results.filter(r => r.ok).map(r => r.fixture.namespace)
+  log(`available fixtures: ${provided.length ? provided.join(', ') : '(none)'}`)
+}
+
+if (require.main === module)
+  main()
+
+module.exports = { FIXTURES_DIR, FIXTURES }

package/scripts/ci.sh

@@ -41,13 +41,17 @@ function npm_test() {
     echo "### Running tests ###";
 
     if [[ $(uname -s) == 'Darwin' ]]; then
-        export GST_PLUGIN_SYSTEM_PATH=/usr/local/lib/gstreamer-1.0;
+        export GST_PLUGIN_SYSTEM_PATH=$(brew --prefix gstreamer)/lib/gstreamer-1.0;
+        # This branch calls mocha directly (not `npm test`), so the pretest
+        # fixture build does not run automatically; do it here. Best-effort:
+        # marshalling tests skip if fixtures cannot be produced on macOS.
+        npm run build:test-fixtures || true;
         npx mocha                                 \
                   --skip=callback                 \
-                  --skip=error                    \
                   tests/__run__.js
     else
-        xvfb-run -a npm test -- --skip=callback;
+        xvfb-run -a npm test --                   \
+                  --skip=callback;
     fi;
 }
 

package/src/boxed.cc

@@ -43,6 +43,17 @@ size_t Boxed::GetSize (GIBaseInfo *boxed_info) {
     }
 }
 
+gpointer AllocateBoxed (GType gtype, size_t size) {
+    // Registered boxed types are freed via g_boxed_free, which by GLib
+    // convention uses g_slice_free; match that with g_slice so freeing doesn't
+    // corrupt the slice allocator (#290, #213). Non-registered structs are
+    // freed with g_free, so allocate them with g_malloc0.
+    if (G_TYPE_IS_BOXED(gtype))
+        return g_slice_alloc0(size);
+    else
+        return g_malloc0(size);
+}
+
 static bool IsNoArgsConstructor (GIFunctionInfo *info) {
     auto flags = g_function_info_get_flags (info);
     return ((flags & GI_FUNCTION_IS_CONSTRUCTOR) != 0
@@ -162,7 +173,7 @@ static void BoxedConstructor(const Nan::FunctionCallbackInfo<Value> &info) {
         return;
     }
 
-    GIFunctionInfo* constructorInfo = NULL;
+    int n_constructor_args = -1;
 
     void *boxed = NULL;
     unsigned long size = 0;
@@ -174,11 +185,11 @@ static void BoxedConstructor(const Nan::FunctionCallbackInfo<Value> &info) {
 
     if (info[0]->IsExternal ()) {
         /* The External case. This is how WrapperFromBoxed is called. */
-        bool mustCopy = Nan::To<bool> (info[1]).ToChecked();
+        auto ownership = (ResourceOwnership) Nan::To<int32_t> (info[1]).ToChecked();
 
         boxed = External::Cast(*info[0])->Value();
 
-        if (mustCopy) {
+        if (ownership == kCopy) {
             if (gtype != G_TYPE_NONE) {
                 boxed = g_boxed_copy (gtype, boxed);
             }
@@ -192,7 +203,7 @@ static void BoxedConstructor(const Nan::FunctionCallbackInfo<Value> &info) {
             }
         }
         else {
-            owns_memory = false;
+            owns_memory = ownership == kTransfer;
         }
     } else {
         /* User code calling `new Pango.AttrList()` */
@@ -201,6 +212,8 @@ static void BoxedConstructor(const Nan::FunctionCallbackInfo<Value> &info) {
 
         if (constructorInfo != NULL) {
 
+            n_constructor_args = g_callable_info_get_n_args(constructorInfo);
+
             FunctionInfo func(constructorInfo);
             GIArgument return_value;
             GError *error = NULL;
@@ -223,7 +236,7 @@ static void BoxedConstructor(const Nan::FunctionCallbackInfo<Value> &info) {
             boxed = return_value.v_pointer;
 
         } else if ((size = Boxed::GetSize(gi_info)) != 0) {
-            boxed = g_malloc0(size);
+            boxed = AllocateBoxed(gtype, size);
 
         } else {
             Nan::ThrowError("Boxed allocation failed: no constructor found");
@@ -250,7 +263,7 @@ static void BoxedConstructor(const Nan::FunctionCallbackInfo<Value> &info) {
 
     SET_OBJECT_GTYPE (self, gtype);
 
-    if (constructorInfo == NULL || g_callable_info_get_n_args(constructorInfo) == 0)
+    if (n_constructor_args <= 0)
         InitBoxedFromObject(self, info[0]);
 }
 
@@ -286,12 +299,12 @@ static void BoxedDestroyed(const Nan::WeakCallbackInfo<Boxed> &info) {
     delete box;
 }
 
-static void BoxedClassDestroyed(const v8::WeakCallbackInfo<GIBaseInfo> &info) {
+static void BoxedClassDestroyed(const Nan::WeakCallbackInfo<GIBaseInfo> &info) {
     GIBaseInfo *gi_info = info.GetParameter ();
     GType gtype = g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *) gi_info);
 
-    auto *persistent_template = (Persistent<FunctionTemplate> *) g_type_get_qdata (gtype, GNodeJS::template_quark());
-    auto *persistent_function = (Persistent<FunctionTemplate> *) g_type_get_qdata (gtype, GNodeJS::function_quark());
+    auto *persistent_template = (Nan::Persistent<FunctionTemplate> *) g_type_get_qdata (gtype, GNodeJS::template_quark());
+    auto *persistent_function = (Nan::Persistent<FunctionTemplate> *) g_type_get_qdata (gtype, GNodeJS::function_quark());
     delete persistent_template;
     delete persistent_function;
 
@@ -324,7 +337,7 @@ Local<FunctionTemplate> GetBoxedTemplate(GIBaseInfo *info, GType gtype) {
      */
 
     if (data) {
-        auto *persistent = (Persistent<FunctionTemplate> *) data;
+        auto *persistent = (Nan::Persistent<FunctionTemplate> *) data;
         auto tpl = Nan::New<FunctionTemplate> (*persistent);
         return tpl;
     }
@@ -353,7 +366,7 @@ Local<FunctionTemplate> GetBoxedTemplate(GIBaseInfo *info, GType gtype) {
     if (gtype == G_TYPE_NONE)
         return tpl;
 
-    auto *persistent = new Persistent<FunctionTemplate>(Isolate::GetCurrent(), tpl);
+    auto *persistent = new Nan::Persistent<FunctionTemplate>(tpl);
     persistent->SetWeak(
             g_base_info_ref(info),
             BoxedClassDestroyed,
@@ -380,7 +393,7 @@ Local<Function> GetBoxedFunction(GIBaseInfo *info, GType gtype) {
     }
 
     if (data) {
-        auto *persistent = (Persistent<Function> *) data;
+        auto *persistent = (Nan::Persistent<Function> *) data;
         auto fn = Nan::New<Function> (*persistent);
         return fn;
     }
@@ -391,7 +404,7 @@ Local<Function> GetBoxedFunction(GIBaseInfo *info, GType gtype) {
     if (gtype == G_TYPE_NONE)
         return fn;
 
-    auto *persistent = new Persistent<Function>(Isolate::GetCurrent(), fn);
+    auto *persistent = new Nan::Persistent<Function>(fn);
 
     g_type_set_qdata(gtype, GNodeJS::function_quark(), persistent);
 
@@ -419,15 +432,15 @@ Local<Function> MakeBoxedClass(GIBaseInfo *info) {
     return GetBoxedFunction (info, gtype);
 }
 
-Local<Value> WrapperFromBoxed(GIBaseInfo *info, void *data, bool mustCopy) {
+Local<Value> WrapperFromBoxed(GIBaseInfo *info, void *data, ResourceOwnership ownership) {
     if (data == NULL)
         return Nan::Null();
 
     Local<Function> constructor = MakeBoxedClass (info);
 
-    Local<Value> boxed_external = Nan::New<External> (data);
-    Local<Value> must_copy_value = Nan::New<v8::Boolean> (mustCopy);
-    Local<Value> args[] = { boxed_external, must_copy_value };
+    Local<Value> jsBoxed = Nan::New<External> (data);
+    Local<Value> jsOwnership = Nan::New<v8::Int32> ((int32_t) ownership);
+    Local<Value> args[] = { jsBoxed, jsOwnership };
 
     MaybeLocal<Object> instance = Nan::NewInstance(constructor, 2, args);
 
@@ -445,4 +458,21 @@ void* PointerFromWrapper(Local<Value> value) {
     return boxed;
 }
 
+void DisownBoxed(Local<Value> value) {
+    if (!value->IsObject())
+        return;
+
+    Local<Object> object = TO_OBJECT (value);
+    // Boxed wrappers store the data pointer in field 0 and the Boxed* in field 1.
+    if (object->InternalFieldCount() < 2)
+        return;
+
+    Boxed *box = static_cast<Boxed *>(object->GetAlignedPointerFromInternalField(1));
+    if (box != NULL) {
+        box->owns_memory = false;
+        box->data = NULL;
+    }
+    object->SetAlignedPointerInInternalField(0, NULL);
+}
+
 };

package/src/boxed.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "value.h"
 #include <nan.h>
 #include <node.h>
 #include <girepository.h>
@@ -28,9 +29,22 @@ public:
     static size_t GetSize (GIBaseInfo *boxed_info) ;
 };
 
+// Allocate zero-filled backing memory for a boxed/struct instance. Registered
+// boxed types are freed with g_boxed_free (which, by GLib convention, uses
+// g_slice_free), so they must be allocated with g_slice — allocating them with
+// g_malloc0 and freeing with g_slice_free corrupts the slice allocator on
+// GLib builds where GSlice is a real slab allocator (#290, #213).
+gpointer                AllocateBoxed    (GType gtype, size_t size);
+
 Local<Function>         MakeBoxedClass   (GIBaseInfo *info);
 Local<FunctionTemplate> GetBoxedTemplate (GIBaseInfo *info, GType gtype);
-Local<Value>            WrapperFromBoxed (GIBaseInfo *info, void *data, bool mustCopy = false);
+Local<Value>            WrapperFromBoxed (GIBaseInfo *info, void *data, ResourceOwnership ownership = kNone);
 void *                  PointerFromWrapper (Local<Value>);
 
+// Relinquish ownership of a boxed wrapper's memory: clears owns_memory so the
+// GC finalizer won't free it, and nulls the data pointer so later use fails
+// cleanly instead of touching freed memory. Used after an introspected method
+// that frees the instance itself (e.g. *_free / *_unref) — see #429.
+void                    DisownBoxed (Local<Value>);
+
 };

package/src/callback.cc

@@ -34,8 +34,18 @@ Callback::Callback(Local<Function> fn, GICallableInfo* callback_info, GIScopeTyp
     info = g_base_info_ref (callback_info);
     #ifdef GI_AVAILABLE_IN_1_72
     closure = g_callable_info_create_closure(info, &cif, Callback::Call, this);
+    /* On libffi 3.4+ the executable trampoline is a separate mapping from the
+     * writable ffi_closure, so the closure pointer is not itself callable and
+     * invoking it segfaults (#390, seen on Ubuntu 26 / libffi 3.5). Use the
+     * closure's native (executable) address instead. Fall back to the closure
+     * pointer if introspection can't supply one — passing NULL as the callback
+     * would break startup, since the bindings register callbacks at bootstrap. */
+    native_address = g_callable_info_get_closure_native_address(info, closure);
+    if (native_address == NULL)
+        native_address = (gpointer) closure;
     #else
     closure = g_callable_info_prepare_closure(info, &cif, Callback::Call, this);
+    native_address = (gpointer) closure;
     #endif
     scope_type = scope_type_;
 }
@@ -117,14 +127,14 @@ void Callback::Execute (GIArgument *result, GIArgument **args, Callback *callbac
 
         bool isOutArgument = g_arg_info_get_direction(&arg_info) == GI_DIRECTION_OUT;
         bool isPrimitive = Type::IsPrimitive(&arg_type);
-        bool mustCopy = isOutArgument ? false : true;
+        ResourceOwnership ownership = isOutArgument ? kNone : kCopy;
 
         if (isPrimitive && isOutArgument) {
             n_return_values += 1;
             primitive_out_arguments_mask |= 1 << i;
             js_args[i] = Nan::Null();
         } else {
-            js_args[i] = GIArgumentToV8 (&arg_type, args[i + args_offset], -1, mustCopy);
+            js_args[i] = GIArgumentToV8 (&arg_type, args[i + args_offset], -1, ownership);
         }
     }
 
@@ -171,6 +181,7 @@ void Callback::Execute (GIArgument *result, GIArgument **args, Callback *callbac
             if (jsReturnArray->Length() != n_js_return_values) {
                 Throw::Error("Virtual function must return %u arguments but returned %u",
                         n_js_return_values, jsReturnArray->Length());
+                goto out;
             }
 
             if (hasVoidReturn)
@@ -194,6 +205,7 @@ void Callback::Execute (GIArgument *result, GIArgument **args, Callback *callbac
 
                 if (!success) {
                     Throw::InvalidReturnValue (&return_type_info, jsReturnValue);
+                    goto out;
                 }
             }
         }

package/src/callback.h

@@ -16,6 +16,7 @@ namespace GNodeJS {
 struct Callback {
     ffi_cif cif;
     ffi_closure *closure;
+    gpointer native_address; /* callable trampoline; may differ from closure on libffi 3.4+ */
     Nan::Persistent<Function> persistent;
     GICallableInfo *info;
     GIScopeType scope_type;

package/src/closure.cc

@@ -19,6 +19,41 @@ using Nan::Persistent;
 
 namespace GNodeJS {
 
+/*
+ * An (out)/(inout) signal parameter arrives as a GValue holding a *pointer* to
+ * the value (e.g. a gint* for an `(inout) (type int)` parameter), not the value
+ * itself. Dereference it in place so the argument holds the pointed-to value.
+ */
+static void LoadGIArgumentFromPointer (GITypeInfo *type_info, GIArgument *arg) {
+    gpointer ptr = arg->v_pointer;
+
+    if (ptr == NULL) {
+        memset(arg, 0, sizeof(*arg));
+        return;
+    }
+
+    switch (g_type_info_get_tag(type_info)) {
+        case GI_TYPE_TAG_BOOLEAN: arg->v_boolean = *(gboolean*) ptr; break;
+        case GI_TYPE_TAG_INT8:    arg->v_int8    = *(gint8*)    ptr; break;
+        case GI_TYPE_TAG_UINT8:   arg->v_uint8   = *(guint8*)   ptr; break;
+        case GI_TYPE_TAG_INT16:   arg->v_int16   = *(gint16*)   ptr; break;
+        case GI_TYPE_TAG_UINT16:  arg->v_uint16  = *(guint16*)  ptr; break;
+        case GI_TYPE_TAG_INT32:   arg->v_int32   = *(gint32*)   ptr; break;
+        case GI_TYPE_TAG_UNICHAR:
+        case GI_TYPE_TAG_UINT32:  arg->v_uint32  = *(guint32*)  ptr; break;
+        case GI_TYPE_TAG_INT64:   arg->v_int64   = *(gint64*)   ptr; break;
+        case GI_TYPE_TAG_UINT64:  arg->v_uint64  = *(guint64*)  ptr; break;
+        case GI_TYPE_TAG_FLOAT:   arg->v_float   = *(gfloat*)   ptr; break;
+        case GI_TYPE_TAG_DOUBLE:  arg->v_double  = *(gdouble*)  ptr; break;
+        case GI_TYPE_TAG_GTYPE:   arg->v_size    = *(gsize*)    ptr; break;
+        default:
+            // Pointer-like types (utf8, interface, array, list, ...): the value
+            // is itself a pointer stored at *ptr.
+            arg->v_pointer = *(gpointer*) ptr;
+            break;
+    }
+}
+
 GClosure *Closure::New (Local<Function> function, GICallableInfo* info, guint signalId) {
     Closure *closure = (Closure *) g_closure_new_simple (sizeof (*closure), GUINT_TO_POINTER(signalId));
     closure->persistent.Reset(function);
@@ -63,26 +98,39 @@ void Closure::Execute(GICallableInfo *info, guint signal_id,
             g_callable_info_load_arg(info, i - 1, &arg_info);
             g_arg_info_load_type(&arg_info, &type_info);
 
-            bool mustCopy = true;
+            ResourceOwnership ownership = kCopy;
 
             if (signal_query.signal_id) {
-                mustCopy = (signal_query.param_types[i - 1] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0;
+                if ((signal_query.param_types[i - 1] & G_SIGNAL_TYPE_STATIC_SCOPE) != 0) {
+                    ownership = kNone;
+                }
             }
-            if (g_arg_info_get_direction(&arg_info) == GI_DIRECTION_OUT) {
-                mustCopy = false;
+
+            GIDirection direction = g_arg_info_get_direction(&arg_info);
+            if (direction == GI_DIRECTION_INOUT) {
+                // The GValue holds a pointer to the in/out value; dereference it
+                // so the handler receives the actual value (#405).
+                LoadGIArgumentFromPointer(&type_info, &argument);
+                ownership = kNone;
+            } else if (direction == GI_DIRECTION_OUT) {
+                // Pure out: there is no meaningful incoming value.
+                memset(&argument, 0, sizeof(argument));
+                ownership = kNone;
             }
 
-            js_args[i - 1] = GIArgumentToV8(&type_info, &argument, -1, mustCopy);
+            js_args[i - 1] = GIArgumentToV8(&type_info, &argument, -1, ownership);
         }
     } else {
         /* CallableInfo is not available: use GValueToV8 */
         for (guint i = 1; i < n_param_values; i++) {
-            bool mustCopy = true;
+            ResourceOwnership ownership = kCopy;
 
             if (signal_query.signal_id) {
-                mustCopy = (signal_query.param_types[i - 1] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0;
+                if ((signal_query.param_types[i - 1] & G_SIGNAL_TYPE_STATIC_SCOPE) != 0) {
+                    ownership = kNone;
+                }
             }
-            js_args[i - 1] = GValueToV8(&param_values[i], mustCopy);
+            js_args[i - 1] = GValueToV8(&param_values[i], ownership);
         }
     }
 
@@ -100,8 +148,55 @@ void Closure::Execute(GICallableInfo *info, guint signal_id,
     if (!try_catch.HasCaught()
             && result.ToLocal(&return_value)) {
 
-        if (g_return_value) {
-            if (!V8ToGValue (g_return_value, return_value, true))
+        if (info) {
+            // Distribute the handler's return value across the signal's return
+            // value and its (out)/(inout) parameters, writing each back (#405).
+            // When there is more than one output the handler returns an array,
+            // mirroring how out-arguments are returned from a function call.
+            GIArgInfo  out_arg_info;
+            GITypeInfo out_type_info;
+
+            int n_outputs = (g_return_value != NULL) ? 1 : 0;
+            for (guint i = 1; i < n_param_values; i++) {
+                g_callable_info_load_arg(info, i - 1, &out_arg_info);
+                GIDirection d = g_arg_info_get_direction(&out_arg_info);
+                if (d == GI_DIRECTION_OUT || d == GI_DIRECTION_INOUT)
+                    n_outputs++;
+            }
+
+            bool from_array = n_outputs > 1 && return_value->IsArray();
+            int output_index = 0;
+
+            #define NEXT_OUTPUT() ( \
+                n_outputs <= 1 \
+                    ? return_value \
+                    : (from_array \
+                        ? Nan::Get(return_value.As<v8::Array>(), output_index++).ToLocalChecked() \
+                        : (output_index++, Nan::Undefined().As<Value>())))
+
+            if (g_return_value) {
+                if (!V8ToGValue (g_return_value, NEXT_OUTPUT(), kCopy))
+                    goto throw_exception;
+            }
+
+            for (guint i = 1; i < n_param_values; i++) {
+                g_callable_info_load_arg(info, i - 1, &out_arg_info);
+                GIDirection d = g_arg_info_get_direction(&out_arg_info);
+                if (d != GI_DIRECTION_OUT && d != GI_DIRECTION_INOUT)
+                    continue;
+
+                g_arg_info_load_type(&out_arg_info, &out_type_info);
+
+                GIArgument out_arg;
+                memcpy(&out_arg, &param_values[i].data[0], sizeof(GIArgument));
+                if (out_arg.v_pointer != NULL)
+                    V8ToOutGIArgument(&out_type_info, &out_arg, NEXT_OUTPUT(), true);
+            }
+
+            #undef NEXT_OUTPUT
+        }
+        else if (g_return_value) {
+            if (!V8ToGValue (g_return_value, return_value, kCopy))
                 goto throw_exception;
         }