@gtkx/ffi 0.1.12 → 0.1.14

package/dist/generated/glib/functions.js

@@ -24,56 +24,56 @@ export const access = (filename, mode) => {
 export const alignedAlloc = (nBlocks, nBlockBytes, alignment) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_aligned_alloc", [
         {
-            type: { type: "gobject" },
-            value: nBlocks?.ptr ?? nBlocks,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlocks,
         },
         {
-            type: { type: "gobject" },
-            value: nBlockBytes?.ptr ?? nBlockBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlockBytes,
         },
         {
-            type: { type: "gobject" },
-            value: alignment?.ptr ?? alignment,
+            type: { type: "int", size: 64, unsigned: true },
+            value: alignment,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const alignedAlloc0 = (nBlocks, nBlockBytes, alignment) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_aligned_alloc0", [
         {
-            type: { type: "gobject" },
-            value: nBlocks?.ptr ?? nBlocks,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlocks,
         },
         {
-            type: { type: "gobject" },
-            value: nBlockBytes?.ptr ?? nBlockBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlockBytes,
         },
         {
-            type: { type: "gobject" },
-            value: alignment?.ptr ?? alignment,
+            type: { type: "int", size: 64, unsigned: true },
+            value: alignment,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const alignedFree = (mem) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_aligned_free", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
     ], { type: "undefined" });
 };
 export const alignedFreeSized = (alignment, size, mem) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_aligned_free_sized", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
         {
-            type: { type: "gobject" },
-            value: alignment?.ptr ?? alignment,
+            type: { type: "int", size: 64, unsigned: true },
+            value: alignment,
         },
         {
-            type: { type: "gobject" },
-            value: size?.ptr ?? size,
+            type: { type: "int", size: 64, unsigned: true },
+            value: size,
         },
     ], { type: "undefined" });
 };
@@ -140,8 +140,8 @@ export const asciiStrdown = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -242,8 +242,8 @@ export const asciiStrncasecmp = (s1, s2, n) => {
             value: s2,
         },
         {
-            type: { type: "gobject" },
-            value: n?.ptr ?? n,
+            type: { type: "int", size: 64, unsigned: true },
+            value: n,
         },
     ], { type: "int", size: 32, unsigned: false });
 };
@@ -298,8 +298,8 @@ export const asciiStrup = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -482,8 +482,8 @@ export const assertionMessageCmpstrv = (domain, file, line, func, expr, arg1, ar
             value: arg2,
         },
         {
-            type: { type: "gobject" },
-            value: firstWrongIdx?.ptr ?? firstWrongIdx,
+            type: { type: "int", size: 64, unsigned: true },
+            value: firstWrongIdx,
         },
     ], { type: "undefined" });
 };
@@ -536,8 +536,8 @@ export const asyncQueueNew = () => {
 export const asyncQueueNewFull = (itemFreeFunc) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_async_queue_new_full", [
         {
-            type: { type: "gobject" },
-            value: itemFreeFunc?.ptr ?? itemFreeFunc,
+            type: { type: "int", size: 64, unsigned: true },
+            value: itemFreeFunc,
         },
     ], { type: "gobject", borrowed: true });
 };
@@ -552,8 +552,8 @@ export const atexit = (func) => {
 export const atomicIntAdd = (val, atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_add", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -564,8 +564,8 @@ export const atomicIntAdd = (val, atomic) => {
 export const atomicIntAnd = (val, atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_and", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
@@ -576,8 +576,8 @@ export const atomicIntAnd = (val, atomic) => {
 export const atomicIntCompareAndExchange = (oldval, newval, atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_compare_and_exchange", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -592,8 +592,8 @@ export const atomicIntCompareAndExchange = (oldval, newval, atomic) => {
 export const atomicIntCompareAndExchangeFull = (oldval, newval, preval, atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_compare_and_exchange_full", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -615,16 +615,16 @@ export const atomicIntCompareAndExchangeFull = (oldval, newval, preval, atomic)
 export const atomicIntDecAndTest = (atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_dec_and_test", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
     ], { type: "boolean" });
 };
 export const atomicIntExchange = (newval, atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_exchange", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -635,8 +635,8 @@ export const atomicIntExchange = (newval, atomic) => {
 export const atomicIntExchangeAndAdd = (val, atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_exchange_and_add", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -647,24 +647,24 @@ export const atomicIntExchangeAndAdd = (val, atomic) => {
 export const atomicIntGet = (atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_get", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
     ], { type: "int", size: 32, unsigned: false });
 };
 export const atomicIntInc = (atomic) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_inc", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
     ], { type: "undefined" });
 };
 export const atomicIntOr = (val, atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_or", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
@@ -675,8 +675,8 @@ export const atomicIntOr = (val, atomic) => {
 export const atomicIntSet = (newval, atomic) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_set", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -687,8 +687,8 @@ export const atomicIntSet = (newval, atomic) => {
 export const atomicIntXor = (val, atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_int_xor", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
@@ -699,59 +699,62 @@ export const atomicIntXor = (val, atomic) => {
 export const atomicPointerAdd = (atomic, val) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_add", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
-            type: { type: "gobject" },
-            value: val?.ptr ?? val,
+            type: { type: "int", size: 64, unsigned: false },
+            value: val,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: false });
 };
 export const atomicPointerAnd = (atomic, val) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_and", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
-            type: { type: "gobject" },
-            value: val?.ptr ?? val,
+            type: { type: "int", size: 64, unsigned: true },
+            value: val,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicPointerCompareAndExchange = (atomic, oldval, newval) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_compare_and_exchange", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
-            type: { type: "gobject" },
-            value: oldval?.ptr ?? oldval,
+            type: { type: "int", size: 64, unsigned: true },
+            value: oldval,
         },
         {
-            type: { type: "gobject" },
-            value: newval?.ptr ?? newval,
+            type: { type: "int", size: 64, unsigned: true },
+            value: newval,
         },
     ], { type: "boolean" });
 };
 export const atomicPointerCompareAndExchangeFull = (atomic, preval, oldval, newval) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_compare_and_exchange_full", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
-            type: { type: "gobject" },
-            value: oldval?.ptr ?? oldval,
+            type: { type: "int", size: 64, unsigned: true },
+            value: oldval,
         },
         {
-            type: { type: "gobject" },
-            value: newval?.ptr ?? newval,
+            type: { type: "int", size: 64, unsigned: true },
+            value: newval,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: preval,
         },
     ], { type: "boolean" });
@@ -759,120 +762,120 @@ export const atomicPointerCompareAndExchangeFull = (atomic, preval, oldval, newv
 export const atomicPointerExchange = (atomic, newval) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_exchange", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
-            type: { type: "gobject" },
-            value: newval?.ptr ?? newval,
+            type: { type: "int", size: 64, unsigned: true },
+            value: newval,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicPointerGet = (atomic) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_get", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicPointerOr = (atomic, val) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_or", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
-            type: { type: "gobject" },
-            value: val?.ptr ?? val,
+            type: { type: "int", size: 64, unsigned: true },
+            value: val,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicPointerSet = (atomic, newval) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_set", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
-            type: { type: "gobject" },
-            value: newval?.ptr ?? newval,
+            type: { type: "int", size: 64, unsigned: true },
+            value: newval,
         },
     ], { type: "undefined" });
 };
 export const atomicPointerXor = (atomic, val) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_pointer_xor", [
         {
-            type: { type: "gobject" },
-            value: atomic?.ptr ?? atomic,
+            type: { type: "int", size: 64, unsigned: true },
+            value: atomic,
         },
         {
-            type: { type: "gobject" },
-            value: val?.ptr ?? val,
+            type: { type: "int", size: 64, unsigned: true },
+            value: val,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicRcBoxAcquire = (memBlock) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_rc_box_acquire", [
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicRcBoxAlloc = (blockSize) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_rc_box_alloc", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicRcBoxAlloc0 = (blockSize) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_rc_box_alloc0", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicRcBoxDup = (blockSize, memBlock) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_rc_box_dup", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicRcBoxGetSize = (memBlock) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_rc_box_get_size", [
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const atomicRcBoxRelease = (memBlock) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_rc_box_release", [
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
     ], { type: "undefined" });
 };
 export const atomicRcBoxReleaseFull = (memBlock, clearFunc) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_atomic_rc_box_release_full", [
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
         {
-            type: { type: "gobject" },
-            value: clearFunc?.ptr ?? clearFunc,
+            type: { type: "int", size: 64, unsigned: true },
+            value: clearFunc,
         },
     ], { type: "undefined" });
 };
@@ -922,7 +925,10 @@ export const base64Decode = (text, outLen) => {
             value: text,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: outLen,
         },
     ], { type: "array", itemType: { type: "int", size: 8, unsigned: true } });
@@ -940,7 +946,10 @@ export const base64DecodeInplace = (text, outLen) => {
             value: text,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: outLen,
         },
     ], { type: "int", size: 8, unsigned: true });
@@ -955,8 +964,8 @@ export const base64Encode = (len, data) => {
             value: data,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: true },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -990,7 +999,7 @@ export const base64EncodeClose = (breakLines, out, state, save) => {
             },
             value: save,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const base64EncodeStep = (_in, len, breakLines, out, state, save) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_base64_encode_step", [
@@ -1002,8 +1011,8 @@ export const base64EncodeStep = (_in, len, breakLines, out, state, save) => {
             value: _in,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: true },
+            value: len,
         },
         {
             type: { type: "boolean" },
@@ -1033,7 +1042,7 @@ export const base64EncodeStep = (_in, len, breakLines, out, state, save) => {
             },
             value: save,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const basename = (fileName) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_basename", [
@@ -1041,13 +1050,13 @@ export const basename = (fileName) => {
             type: { type: "string" },
             value: fileName,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const bitLock = (lockBit, address) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_bit_lock", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -1058,8 +1067,8 @@ export const bitLock = (lockBit, address) => {
 export const bitLockAndGet = (lockBit, address, outVal) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_bit_lock_and_get", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
@@ -1109,8 +1118,8 @@ export const bitStorage = (number) => {
 export const bitTrylock = (lockBit, address) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_bit_trylock", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -1121,8 +1130,8 @@ export const bitTrylock = (lockBit, address) => {
 export const bitUnlock = (lockBit, address) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_bit_unlock", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -1133,8 +1142,8 @@ export const bitUnlock = (lockBit, address) => {
 export const bitUnlockAndSet = (lockBit, newVal, preserveMask, address) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_bit_unlock_and_set", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
@@ -1205,8 +1214,6 @@ export const byteArrayAppend = (array, data, len) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArrayFree = (array, freeSegment) => {
@@ -1241,8 +1248,6 @@ export const byteArrayFreeToBytes = (array) => {
         innerType: "GBytes",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Bytes);
 };
 export const byteArrayNew = () => {
@@ -1252,8 +1257,6 @@ export const byteArrayNew = () => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArrayNewTake = (data, len) => {
@@ -1266,8 +1269,8 @@ export const byteArrayNewTake = (data, len) => {
             value: data,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: true },
+            value: len,
         },
     ], {
         type: "boxed",
@@ -1275,8 +1278,6 @@ export const byteArrayNewTake = (data, len) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArrayPrepend = (array, data, len) => {
@@ -1306,8 +1307,6 @@ export const byteArrayPrepend = (array, data, len) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArrayRef = (array) => {
@@ -1326,8 +1325,6 @@ export const byteArrayRef = (array) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArrayRemoveIndex = (array, index_) => {
@@ -1350,8 +1347,6 @@ export const byteArrayRemoveIndex = (array, index_) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArrayRemoveIndexFast = (array, index_) => {
@@ -1374,8 +1369,6 @@ export const byteArrayRemoveIndexFast = (array, index_) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArrayRemoveRange = (array, index_, length) => {
@@ -1402,8 +1395,6 @@ export const byteArrayRemoveRange = (array, index_, length) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArraySetSize = (array, length) => {
@@ -1426,8 +1417,6 @@ export const byteArraySetSize = (array, length) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArraySizedNew = (reservedSize) => {
@@ -1442,8 +1431,6 @@ export const byteArraySizedNew = (reservedSize) => {
         innerType: "GByteArray",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, ByteArray);
 };
 export const byteArraySort = (array, compareFunc) => {
@@ -1477,8 +1464,8 @@ export const byteArraySortWithData = (array, compareFunc, userData) => {
             value: compareFunc,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "undefined" });
 };
@@ -1493,7 +1480,10 @@ export const byteArraySteal = (array, len) => {
             value: array?.ptr ?? array,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: len,
         },
     ], { type: "array", itemType: { type: "int", size: 8, unsigned: true } });
@@ -1544,7 +1534,7 @@ export const checkVersion = (requiredMajor, requiredMinor, requiredMicro) => {
             type: { type: "int", size: 32, unsigned: true },
             value: requiredMicro,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const checksumTypeGetLength = (checksumType) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_checksum_type_get_length", [
@@ -1552,7 +1542,7 @@ export const checksumTypeGetLength = (checksumType) => {
             type: { type: "int", size: 32, unsigned: false },
             value: checksumType,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: false });
 };
 export const childWatchAddFull = (priority, pid, _function, data, notify) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_child_watch_add_full", [
@@ -1561,28 +1551,28 @@ export const childWatchAddFull = (priority, pid, _function, data, notify) => {
             value: priority,
         },
         {
-            type: { type: "gobject" },
-            value: pid?.ptr ?? pid,
+            type: { type: "int", size: 32, unsigned: false },
+            value: pid,
         },
         {
             type: { type: "callback" },
             value: _function,
         },
         {
-            type: { type: "gobject" },
-            value: data?.ptr ?? data,
+            type: { type: "int", size: 64, unsigned: true },
+            value: data,
         },
         {
-            type: { type: "gobject" },
-            value: notify?.ptr ?? notify,
+            type: { type: "int", size: 64, unsigned: true },
+            value: notify,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
 export const childWatchSourceNew = (pid) => {
     const ptr = call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_child_watch_source_new", [
         {
-            type: { type: "gobject" },
-            value: pid?.ptr ?? pid,
+            type: { type: "int", size: 32, unsigned: false },
+            value: pid,
         },
     ], {
         type: "boxed",
@@ -1590,8 +1580,6 @@ export const childWatchSourceNew = (pid) => {
         innerType: "GSource",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Source);
 };
 export const chmod = (filename, mode) => {
@@ -1687,8 +1675,8 @@ export const computeChecksumForData = (checksumType, data, length) => {
             value: data,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: true },
+            value: length,
         },
     ], { type: "string" });
 };
@@ -1703,8 +1691,8 @@ export const computeChecksumForString = (checksumType, str, length) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: false },
+            value: length,
         },
     ], { type: "string" });
 };
@@ -1746,8 +1734,8 @@ export const computeHmacForData = (digestType, key, keyLen, data, length) => {
             value: key,
         },
         {
-            type: { type: "gobject" },
-            value: keyLen?.ptr ?? keyLen,
+            type: { type: "int", size: 64, unsigned: true },
+            value: keyLen,
         },
         {
             type: {
@@ -1757,8 +1745,8 @@ export const computeHmacForData = (digestType, key, keyLen, data, length) => {
             value: data,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: true },
+            value: length,
         },
     ], { type: "string" });
 };
@@ -1776,16 +1764,16 @@ export const computeHmacForString = (digestType, key, keyLen, str, length) => {
             value: key,
         },
         {
-            type: { type: "gobject" },
-            value: keyLen?.ptr ?? keyLen,
+            type: { type: "int", size: 64, unsigned: true },
+            value: keyLen,
         },
         {
             type: { type: "string" },
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: false },
+            value: length,
         },
     ], { type: "string" });
 };
@@ -1800,8 +1788,8 @@ export const convert = (str, len, toCodeset, fromCodeset, bytesRead, bytesWritte
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
             type: { type: "string" },
@@ -1812,11 +1800,17 @@ export const convert = (str, len, toCodeset, fromCodeset, bytesRead, bytesWritte
             value: fromCodeset,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesRead,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesWritten,
         },
         {
@@ -1850,8 +1844,8 @@ export const convertWithFallback = (str, len, toCodeset, fromCodeset, fallback,
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
             type: { type: "string" },
@@ -1866,11 +1860,17 @@ export const convertWithFallback = (str, len, toCodeset, fromCodeset, fallback,
             value: fallback,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesRead,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesWritten,
         },
         {
@@ -1913,8 +1913,8 @@ export const datalistForeach = (datalist, func, userData) => {
             value: func,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "undefined" });
 };
@@ -1928,7 +1928,7 @@ export const datalistGetData = (datalist, key) => {
             type: { type: "string" },
             value: key,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const datalistGetFlags = (datalist) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_datalist_get_flags", [
@@ -1948,7 +1948,7 @@ export const datalistIdGetData = (datalist, keyId) => {
             type: { type: "int", size: 32, unsigned: true },
             value: keyId,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const datalistIdRemoveMultiple = (datalist, keys, nKeys) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_datalist_id_remove_multiple", [
@@ -1964,8 +1964,8 @@ export const datalistIdRemoveMultiple = (datalist, keys, nKeys) => {
             value: keys,
         },
         {
-            type: { type: "gobject" },
-            value: nKeys?.ptr ?? nKeys,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nKeys,
         },
     ], { type: "undefined" });
 };
@@ -1996,38 +1996,38 @@ export const datalistUnsetFlags = (datalist, flags) => {
 export const datasetDestroy = (datasetLocation) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_dataset_destroy", [
         {
-            type: { type: "gobject" },
-            value: datasetLocation?.ptr ?? datasetLocation,
+            type: { type: "int", size: 64, unsigned: true },
+            value: datasetLocation,
         },
     ], { type: "undefined" });
 };
 export const datasetForeach = (datasetLocation, func, userData) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_dataset_foreach", [
         {
-            type: { type: "gobject" },
-            value: datasetLocation?.ptr ?? datasetLocation,
+            type: { type: "int", size: 64, unsigned: true },
+            value: datasetLocation,
         },
         {
             type: { type: "callback" },
             value: func,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "undefined" });
 };
 export const datasetIdGetData = (datasetLocation, keyId) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_dataset_id_get_data", [
         {
-            type: { type: "gobject" },
-            value: datasetLocation?.ptr ?? datasetLocation,
+            type: { type: "int", size: 64, unsigned: true },
+            value: datasetLocation,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
             value: keyId,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const dateGetDaysInMonth = (month, year) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_date_get_days_in_month", [
@@ -2036,32 +2036,32 @@ export const dateGetDaysInMonth = (month, year) => {
             value: month,
         },
         {
-            type: { type: "gobject" },
-            value: year?.ptr ?? year,
+            type: { type: "int", size: 32, unsigned: true },
+            value: year,
         },
     ], { type: "int", size: 8, unsigned: true });
 };
 export const dateGetMondayWeeksInYear = (year) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_date_get_monday_weeks_in_year", [
         {
-            type: { type: "gobject" },
-            value: year?.ptr ?? year,
+            type: { type: "int", size: 32, unsigned: true },
+            value: year,
         },
     ], { type: "int", size: 8, unsigned: true });
 };
 export const dateGetSundayWeeksInYear = (year) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_date_get_sunday_weeks_in_year", [
         {
-            type: { type: "gobject" },
-            value: year?.ptr ?? year,
+            type: { type: "int", size: 32, unsigned: true },
+            value: year,
         },
     ], { type: "int", size: 8, unsigned: true });
 };
 export const dateGetWeeksInYear = (year, firstDayOfWeek) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_date_get_weeks_in_year", [
         {
-            type: { type: "gobject" },
-            value: year?.ptr ?? year,
+            type: { type: "int", size: 32, unsigned: true },
+            value: year,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -2072,8 +2072,8 @@ export const dateGetWeeksInYear = (year, firstDayOfWeek) => {
 export const dateIsLeapYear = (year) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_date_is_leap_year", [
         {
-            type: { type: "gobject" },
-            value: year?.ptr ?? year,
+            type: { type: "int", size: 32, unsigned: true },
+            value: year,
         },
     ], { type: "boolean" });
 };
@@ -2084,8 +2084,8 @@ export const dateStrftime = (s, slen, format, date) => {
             value: s,
         },
         {
-            type: { type: "gobject" },
-            value: slen?.ptr ?? slen,
+            type: { type: "int", size: 64, unsigned: true },
+            value: slen,
         },
         {
             type: { type: "string" },
@@ -2099,29 +2099,29 @@ export const dateStrftime = (s, slen, format, date) => {
             },
             value: date?.ptr ?? date,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const dateValidDay = (day) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_date_valid_day", [
         {
-            type: { type: "gobject" },
-            value: day?.ptr ?? day,
+            type: { type: "int", size: 8, unsigned: true },
+            value: day,
         },
     ], { type: "boolean" });
 };
 export const dateValidDmy = (day, month, year) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_date_valid_dmy", [
         {
-            type: { type: "gobject" },
-            value: day?.ptr ?? day,
+            type: { type: "int", size: 8, unsigned: true },
+            value: day,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
             value: month,
         },
         {
-            type: { type: "gobject" },
-            value: year?.ptr ?? year,
+            type: { type: "int", size: 32, unsigned: true },
+            value: year,
         },
     ], { type: "boolean" });
 };
@@ -2152,8 +2152,8 @@ export const dateValidWeekday = (weekday) => {
 export const dateValidYear = (year) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_date_valid_year", [
         {
-            type: { type: "gobject" },
-            value: year?.ptr ?? year,
+            type: { type: "int", size: 32, unsigned: true },
+            value: year,
         },
     ], { type: "boolean" });
 };
@@ -2171,7 +2171,7 @@ export const dcgettext = (msgid, category, domain) => {
             type: { type: "int", size: 32, unsigned: false },
             value: category,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const dgettext = (msgid, domain) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_dgettext", [
@@ -2183,7 +2183,7 @@ export const dgettext = (msgid, domain) => {
             type: { type: "string" },
             value: msgid,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const dirMakeTmp = (tmpl) => {
     const error = { value: null };
@@ -2212,20 +2212,20 @@ export const dirMakeTmp = (tmpl) => {
 export const directEqual = (v1, v2) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_direct_equal", [
         {
-            type: { type: "gobject" },
-            value: v1?.ptr ?? v1,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v1,
         },
         {
-            type: { type: "gobject" },
-            value: v2?.ptr ?? v2,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v2,
         },
     ], { type: "boolean" });
 };
 export const directHash = (v) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_direct_hash", [
         {
-            type: { type: "gobject" },
-            value: v?.ptr ?? v,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -2247,25 +2247,25 @@ export const dngettext = (msgid, msgidPlural, n, domain) => {
             type: { type: "int", size: 64, unsigned: true },
             value: n,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const doubleEqual = (v1, v2) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_double_equal", [
         {
-            type: { type: "gobject" },
-            value: v1?.ptr ?? v1,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v1,
         },
         {
-            type: { type: "gobject" },
-            value: v2?.ptr ?? v2,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v2,
         },
     ], { type: "boolean" });
 };
 export const doubleHash = (v) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_double_hash", [
         {
-            type: { type: "gobject" },
-            value: v?.ptr ?? v,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -2280,10 +2280,10 @@ export const dpgettext = (msgctxtid, msgidoffset, domain) => {
             value: msgctxtid,
         },
         {
-            type: { type: "gobject" },
-            value: msgidoffset?.ptr ?? msgidoffset,
+            type: { type: "int", size: 64, unsigned: true },
+            value: msgidoffset,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const dpgettext2 = (context, msgid, domain) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_dpgettext2", [
@@ -2299,7 +2299,7 @@ export const dpgettext2 = (context, msgid, domain) => {
             type: { type: "string" },
             value: msgid,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const environGetenv = (variable, envp) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_environ_getenv", [
@@ -2311,7 +2311,7 @@ export const environGetenv = (variable, envp) => {
             type: { type: "string" },
             value: variable,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const environSetenv = (variable, value, overwrite, envp) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_environ_setenv", [
@@ -2352,8 +2352,8 @@ export const errorDomainRegister = (errorTypeName, errorTypePrivateSize, errorTy
             value: errorTypeName,
         },
         {
-            type: { type: "gobject" },
-            value: errorTypePrivateSize?.ptr ?? errorTypePrivateSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: errorTypePrivateSize,
         },
         {
             type: { type: "callback" },
@@ -2376,8 +2376,8 @@ export const errorDomainRegisterStatic = (errorTypeName, errorTypePrivateSize, e
             value: errorTypeName,
         },
         {
-            type: { type: "gobject" },
-            value: errorTypePrivateSize?.ptr ?? errorTypePrivateSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: errorTypePrivateSize,
         },
         {
             type: { type: "callback" },
@@ -2430,7 +2430,10 @@ export const fileGetContents = (filename, contents, length) => {
             value: contents,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: length,
         },
         {
@@ -2517,8 +2520,8 @@ export const fileSetContents = (filename, contents, length) => {
             value: contents,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: false },
+            value: length,
         },
         {
             type: {
@@ -2552,8 +2555,8 @@ export const fileSetContentsFull = (filename, contents, length, flags, mode) =>
             value: contents,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: false },
+            value: length,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -2644,15 +2647,21 @@ export const filenameFromUtf8 = (utf8string, len, bytesRead, bytesWritten) => {
             value: utf8string,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesRead,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesWritten,
         },
         {
@@ -2708,15 +2717,21 @@ export const filenameToUtf8 = (opsysstring, len, bytesRead, bytesWritten) => {
             value: opsysstring,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesRead,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesWritten,
         },
         {
@@ -2754,7 +2769,7 @@ export const fopen = (filename, mode) => {
             type: { type: "string" },
             value: mode,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const formatSize = (size) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_format_size", [
@@ -2787,20 +2802,20 @@ export const formatSizeFull = (size, flags) => {
 export const free = (mem) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_free", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
     ], { type: "undefined" });
 };
 export const freeSized = (size, mem) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_free_sized", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
         {
-            type: { type: "gobject" },
-            value: size?.ptr ?? size,
+            type: { type: "int", size: 64, unsigned: true },
+            value: size,
         },
     ], { type: "undefined" });
 };
@@ -2815,10 +2830,10 @@ export const freopen = (filename, mode, stream) => {
             value: mode,
         },
         {
-            type: { type: "gobject" },
-            value: stream?.ptr ?? stream,
+            type: { type: "int", size: 64, unsigned: true },
+            value: stream,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const fsync = (fd) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_fsync", [
@@ -2829,7 +2844,7 @@ export const fsync = (fd) => {
     ], { type: "int", size: 32, unsigned: false });
 };
 export const getApplicationName = () => {
-    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_application_name", [], { type: "string" });
+    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_application_name", [], { type: "string", borrowed: true });
 };
 export const getCharset = (charset) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_charset", [
@@ -2885,11 +2900,13 @@ export const getFilenameCharsets = (filenameCharsets) => {
 export const getHomeDir = () => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_home_dir", [], {
         type: "string",
+        borrowed: true,
     });
 };
 export const getHostName = () => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_host_name", [], {
         type: "string",
+        borrowed: true,
     });
 };
 export const getLanguageNames = () => {
@@ -2928,11 +2945,13 @@ export const getOsInfo = (keyName) => {
 export const getPrgname = () => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_prgname", [], {
         type: "string",
+        borrowed: true,
     });
 };
 export const getRealName = () => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_real_name", [], {
         type: "string",
+        borrowed: true,
     });
 };
 export const getRealTime = () => {
@@ -2951,24 +2970,26 @@ export const getSystemDataDirs = () => {
 export const getTmpDir = () => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_tmp_dir", [], {
         type: "string",
+        borrowed: true,
     });
 };
 export const getUserCacheDir = () => {
-    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_cache_dir", [], { type: "string" });
+    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_cache_dir", [], { type: "string", borrowed: true });
 };
 export const getUserConfigDir = () => {
-    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_config_dir", [], { type: "string" });
+    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_config_dir", [], { type: "string", borrowed: true });
 };
 export const getUserDataDir = () => {
-    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_data_dir", [], { type: "string" });
+    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_data_dir", [], { type: "string", borrowed: true });
 };
 export const getUserName = () => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_name", [], {
         type: "string",
+        borrowed: true,
     });
 };
 export const getUserRuntimeDir = () => {
-    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_runtime_dir", [], { type: "string" });
+    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_runtime_dir", [], { type: "string", borrowed: true });
 };
 export const getUserSpecialDir = (directory) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_special_dir", [
@@ -2976,10 +2997,10 @@ export const getUserSpecialDir = (directory) => {
             type: { type: "int", size: 32, unsigned: false },
             value: directory,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const getUserStateDir = () => {
-    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_state_dir", [], { type: "string" });
+    return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_get_user_state_dir", [], { type: "string", borrowed: true });
 };
 export const getenv = (variable) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_getenv", [
@@ -2987,7 +3008,7 @@ export const getenv = (variable) => {
             type: { type: "string" },
             value: variable,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const hashTableAdd = (hashTable, key) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_hash_table_add", [
@@ -3000,8 +3021,8 @@ export const hashTableAdd = (hashTable, key) => {
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: key?.ptr ?? key,
+            type: { type: "int", size: 64, unsigned: true },
+            value: key,
         },
     ], { type: "boolean" });
 };
@@ -3016,8 +3037,8 @@ export const hashTableContains = (hashTable, key) => {
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: key?.ptr ?? key,
+            type: { type: "int", size: 64, unsigned: true },
+            value: key,
         },
     ], { type: "boolean" });
 };
@@ -3048,10 +3069,10 @@ export const hashTableFind = (hashTable, predicate, userData) => {
             value: predicate,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const hashTableForeach = (hashTable, func, userData) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_hash_table_foreach", [
@@ -3068,8 +3089,8 @@ export const hashTableForeach = (hashTable, func, userData) => {
             value: func,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "undefined" });
 };
@@ -3088,8 +3109,8 @@ export const hashTableForeachRemove = (hashTable, func, userData) => {
             value: func,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -3108,8 +3129,8 @@ export const hashTableForeachSteal = (hashTable, func, userData) => {
             value: func,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -3124,12 +3145,12 @@ export const hashTableInsert = (hashTable, key, value) => {
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: key?.ptr ?? key,
+            type: { type: "int", size: 64, unsigned: true },
+            value: key,
         },
         {
-            type: { type: "gobject" },
-            value: value?.ptr ?? value,
+            type: { type: "int", size: 64, unsigned: true },
+            value: value,
         },
     ], { type: "boolean" });
 };
@@ -3144,10 +3165,10 @@ export const hashTableLookup = (hashTable, key) => {
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: key?.ptr ?? key,
+            type: { type: "int", size: 64, unsigned: true },
+            value: key,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const hashTableLookupExtended = (hashTable, lookupKey, origKey, value) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_hash_table_lookup_extended", [
@@ -3160,15 +3181,21 @@ export const hashTableLookupExtended = (hashTable, lookupKey, origKey, value) =>
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: lookupKey?.ptr ?? lookupKey,
+            type: { type: "int", size: 64, unsigned: true },
+            value: lookupKey,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: origKey,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: value,
         },
     ], { type: "boolean" });
@@ -3189,8 +3216,6 @@ export const hashTableNewSimilar = (otherHashTable) => {
         innerType: "GHashTable",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, HashTable);
 };
 export const hashTableRef = (hashTable) => {
@@ -3209,8 +3234,6 @@ export const hashTableRef = (hashTable) => {
         innerType: "GHashTable",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, HashTable);
 };
 export const hashTableRemove = (hashTable, key) => {
@@ -3224,8 +3247,8 @@ export const hashTableRemove = (hashTable, key) => {
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: key?.ptr ?? key,
+            type: { type: "int", size: 64, unsigned: true },
+            value: key,
         },
     ], { type: "boolean" });
 };
@@ -3252,12 +3275,12 @@ export const hashTableReplace = (hashTable, key, value) => {
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: key?.ptr ?? key,
+            type: { type: "int", size: 64, unsigned: true },
+            value: key,
         },
         {
-            type: { type: "gobject" },
-            value: value?.ptr ?? value,
+            type: { type: "int", size: 64, unsigned: true },
+            value: value,
         },
     ], { type: "boolean" });
 };
@@ -3284,8 +3307,8 @@ export const hashTableSteal = (hashTable, key) => {
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: key?.ptr ?? key,
+            type: { type: "int", size: 64, unsigned: true },
+            value: key,
         },
     ], { type: "boolean" });
 };
@@ -3312,15 +3335,21 @@ export const hashTableStealExtended = (hashTable, lookupKey, stolenKey, stolenVa
             value: hashTable?.ptr ?? hashTable,
         },
         {
-            type: { type: "gobject" },
-            value: lookupKey?.ptr ?? lookupKey,
+            type: { type: "int", size: 64, unsigned: true },
+            value: lookupKey,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: stolenKey,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: stolenValue,
         },
     ], { type: "boolean" });
@@ -3480,20 +3509,20 @@ export const idleAddFull = (priority, _function, data, notify) => {
             value: _function,
         },
         {
-            type: { type: "gobject" },
-            value: data?.ptr ?? data,
+            type: { type: "int", size: 64, unsigned: true },
+            value: data,
         },
         {
-            type: { type: "gobject" },
-            value: notify?.ptr ?? notify,
+            type: { type: "int", size: 64, unsigned: true },
+            value: notify,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
 export const idleRemoveByData = (data) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_idle_remove_by_data", [
         {
-            type: { type: "gobject" },
-            value: data?.ptr ?? data,
+            type: { type: "int", size: 64, unsigned: true },
+            value: data,
         },
     ], { type: "boolean" });
 };
@@ -3504,47 +3533,45 @@ export const idleSourceNew = () => {
         innerType: "GSource",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Source);
 };
 export const int64Equal = (v1, v2) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_int64_equal", [
         {
-            type: { type: "gobject" },
-            value: v1?.ptr ?? v1,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v1,
         },
         {
-            type: { type: "gobject" },
-            value: v2?.ptr ?? v2,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v2,
         },
     ], { type: "boolean" });
 };
 export const int64Hash = (v) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_int64_hash", [
         {
-            type: { type: "gobject" },
-            value: v?.ptr ?? v,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
 export const intEqual = (v1, v2) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_int_equal", [
         {
-            type: { type: "gobject" },
-            value: v1?.ptr ?? v1,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v1,
         },
         {
-            type: { type: "gobject" },
-            value: v2?.ptr ?? v2,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v2,
         },
     ], { type: "boolean" });
 };
 export const intHash = (v) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_int_hash", [
         {
-            type: { type: "gobject" },
-            value: v?.ptr ?? v,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -3554,7 +3581,7 @@ export const internStaticString = (string) => {
             type: { type: "string" },
             value: string,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const internString = (string) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_intern_string", [
@@ -3562,7 +3589,7 @@ export const internString = (string) => {
             type: { type: "string" },
             value: string,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const ioAddWatchFull = (channel, priority, condition, func, notify, userData) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_io_add_watch_full", [
@@ -3587,12 +3614,12 @@ export const ioAddWatchFull = (channel, priority, condition, func, notify, userD
             value: func,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
-            type: { type: "gobject" },
-            value: notify?.ptr ?? notify,
+            type: { type: "int", size: 64, unsigned: true },
+            value: notify,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -3627,8 +3654,6 @@ export const ioCreateWatch = (channel, condition) => {
         innerType: "GSource",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Source);
 };
 export const keyFileErrorQuark = () => {
@@ -3661,15 +3686,21 @@ export const localeFromUtf8 = (utf8string, len, bytesRead, bytesWritten) => {
             value: utf8string,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesRead,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesWritten,
         },
         {
@@ -3700,15 +3731,21 @@ export const localeToUtf8 = (opsysstring, len, bytesRead, bytesWritten) => {
             value: opsysstring,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesRead,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: bytesWritten,
         },
         {
@@ -3743,8 +3780,8 @@ export const logDefaultHandler = (logLevel, logDomain, message, unusedData) => {
             value: message,
         },
         {
-            type: { type: "gobject" },
-            value: unusedData?.ptr ?? unusedData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: unusedData,
         },
     ], { type: "undefined" });
 };
@@ -3809,12 +3846,12 @@ export const logSetHandlerFull = (logLevels, logFunc, destroy, logDomain, userDa
             value: logFunc,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
-            type: { type: "gobject" },
-            value: destroy?.ptr ?? destroy,
+            type: { type: "int", size: 64, unsigned: true },
+            value: destroy,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -3825,12 +3862,12 @@ export const logSetWriterFunc = (func, userDataFree, userData) => {
             value: func,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
-            type: { type: "gobject" },
-            value: userDataFree?.ptr ?? userDataFree,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userDataFree,
         },
     ], { type: "undefined" });
 };
@@ -3845,8 +3882,8 @@ export const logStructuredArray = (logLevel, fields, nFields) => {
             value: fields,
         },
         {
-            type: { type: "gobject" },
-            value: nFields?.ptr ?? nFields,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nFields,
         },
     ], { type: "undefined" });
 };
@@ -3881,12 +3918,12 @@ export const logWriterDefault = (logLevel, fields, nFields, userData) => {
             value: fields,
         },
         {
-            type: { type: "gobject" },
-            value: nFields?.ptr ?? nFields,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nFields,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "int", size: 32, unsigned: false });
 };
@@ -3929,8 +3966,8 @@ export const logWriterFormatFields = (logLevel, fields, nFields, useColor) => {
             value: fields,
         },
         {
-            type: { type: "gobject" },
-            value: nFields?.ptr ?? nFields,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nFields,
         },
         {
             type: { type: "boolean" },
@@ -3957,12 +3994,12 @@ export const logWriterJournald = (logLevel, fields, nFields, userData) => {
             value: fields,
         },
         {
-            type: { type: "gobject" },
-            value: nFields?.ptr ?? nFields,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nFields,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "int", size: 32, unsigned: false });
 };
@@ -3977,12 +4014,12 @@ export const logWriterStandardStreams = (logLevel, fields, nFields, userData) =>
             value: fields,
         },
         {
-            type: { type: "gobject" },
-            value: nFields?.ptr ?? nFields,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nFields,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "int", size: 32, unsigned: false });
 };
@@ -4005,12 +4042,12 @@ export const logWriterSyslog = (logLevel, fields, nFields, userData) => {
             value: fields,
         },
         {
-            type: { type: "gobject" },
-            value: nFields?.ptr ?? nFields,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nFields,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "int", size: 32, unsigned: false });
 };
@@ -4033,8 +4070,6 @@ export const mainContextDefault = () => {
         innerType: "GMainContext",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, MainContext);
 };
 export const mainContextGetThreadDefault = () => {
@@ -4055,8 +4090,6 @@ export const mainContextRefThreadDefault = () => {
         innerType: "GMainContext",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, MainContext);
 };
 export const mainCurrentSource = () => {
@@ -4080,42 +4113,42 @@ export const mainDepth = () => {
 export const malloc = (nBytes) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_malloc", [
         {
-            type: { type: "gobject" },
-            value: nBytes?.ptr ?? nBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const malloc0 = (nBytes) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_malloc0", [
         {
-            type: { type: "gobject" },
-            value: nBytes?.ptr ?? nBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const malloc0N = (nBlocks, nBlockBytes) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_malloc0_n", [
         {
-            type: { type: "gobject" },
-            value: nBlocks?.ptr ?? nBlocks,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlocks,
         },
         {
-            type: { type: "gobject" },
-            value: nBlockBytes?.ptr ?? nBlockBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlockBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const mallocN = (nBlocks, nBlockBytes) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_malloc_n", [
         {
-            type: { type: "gobject" },
-            value: nBlocks?.ptr ?? nBlocks,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlocks,
         },
         {
-            type: { type: "gobject" },
-            value: nBlockBytes?.ptr ?? nBlockBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlockBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const markupErrorQuark = () => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_markup_error_quark", [], { type: "int", size: 32, unsigned: true });
@@ -4127,8 +4160,8 @@ export const markupEscapeText = (text, length) => {
             value: text,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: false },
+            value: length,
         },
     ], { type: "string" });
 };
@@ -4156,26 +4189,26 @@ export const memSetVtable = (vtable) => {
 export const memdup = (byteSize, mem) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_memdup", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
             value: byteSize,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const memdup2 = (byteSize, mem) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_memdup2", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
         {
-            type: { type: "gobject" },
-            value: byteSize?.ptr ?? byteSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: byteSize,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const mkdir = (filename, mode) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_mkdir", [
@@ -4217,8 +4250,8 @@ export const nodePushAllocator = (allocator) => {
 export const nullifyPointer = (nullifyLocation) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_nullify_pointer", [
         {
-            type: { type: "gobject" },
-            value: nullifyLocation?.ptr ?? nullifyLocation,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nullifyLocation,
         },
     ], { type: "undefined" });
 };
@@ -4244,7 +4277,10 @@ export const onErrorStackTrace = (prgName) => {
 export const onceInitEnter = (location) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_once_init_enter", [
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: location,
         },
     ], { type: "boolean" });
@@ -4252,40 +4288,43 @@ export const onceInitEnter = (location) => {
 export const onceInitEnterImpl = (location) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_once_init_enter_impl", [
         {
-            type: { type: "gobject" },
-            value: location?.ptr ?? location,
+            type: { type: "int", size: 64, unsigned: true },
+            value: location,
         },
     ], { type: "boolean" });
 };
 export const onceInitEnterPointer = (location) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_once_init_enter_pointer", [
         {
-            type: { type: "gobject" },
-            value: location?.ptr ?? location,
+            type: { type: "int", size: 64, unsigned: true },
+            value: location,
         },
     ], { type: "boolean" });
 };
 export const onceInitLeave = (location, result) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_once_init_leave", [
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: location,
         },
         {
-            type: { type: "gobject" },
-            value: result?.ptr ?? result,
+            type: { type: "int", size: 64, unsigned: true },
+            value: result,
         },
     ], { type: "undefined" });
 };
 export const onceInitLeavePointer = (location, result) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_once_init_leave_pointer", [
         {
-            type: { type: "gobject" },
-            value: location?.ptr ?? location,
+            type: { type: "int", size: 64, unsigned: true },
+            value: location,
         },
         {
-            type: { type: "gobject" },
-            value: result?.ptr ?? result,
+            type: { type: "int", size: 64, unsigned: true },
+            value: result,
         },
     ], { type: "undefined" });
 };
@@ -4327,12 +4366,12 @@ export const parseDebugString = (keys, nkeys, string) => {
 export const pathBufEqual = (v1, v2) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_path_buf_equal", [
         {
-            type: { type: "gobject" },
-            value: v1?.ptr ?? v1,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v1,
         },
         {
-            type: { type: "gobject" },
-            value: v2?.ptr ?? v2,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v2,
         },
     ], { type: "boolean" });
 };
@@ -4366,7 +4405,7 @@ export const pathSkipRoot = (fileName) => {
             type: { type: "string" },
             value: fileName,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const patternMatchSimple = (pattern, string) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_pattern_match_simple", [
@@ -4383,8 +4422,8 @@ export const patternMatchSimple = (pattern, string) => {
 export const pointerBitLock = (address, lockBit) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_pointer_bit_lock", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -4395,15 +4434,18 @@ export const pointerBitLock = (address, lockBit) => {
 export const pointerBitLockAndGet = (address, lockBit, outPtr) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_pointer_bit_lock_and_get", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
             value: lockBit,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 64, unsigned: true },
+            },
             value: outPtr,
         },
     ], { type: "undefined" });
@@ -4411,8 +4453,8 @@ export const pointerBitLockAndGet = (address, lockBit, outPtr) => {
 export const pointerBitLockMaskPtr = (lockBit, set, preserveMask, ptr, preservePtr) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_pointer_bit_lock_mask_ptr", [
         {
-            type: { type: "gobject" },
-            value: ptr?.ptr ?? ptr,
+            type: { type: "int", size: 64, unsigned: true },
+            value: ptr,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
@@ -4423,20 +4465,20 @@ export const pointerBitLockMaskPtr = (lockBit, set, preserveMask, ptr, preserveP
             value: set,
         },
         {
-            type: { type: "gobject" },
-            value: preserveMask?.ptr ?? preserveMask,
+            type: { type: "int", size: 64, unsigned: true },
+            value: preserveMask,
         },
         {
-            type: { type: "gobject" },
-            value: preservePtr?.ptr ?? preservePtr,
+            type: { type: "int", size: 64, unsigned: true },
+            value: preservePtr,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const pointerBitTrylock = (address, lockBit) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_pointer_bit_trylock", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -4447,8 +4489,8 @@ export const pointerBitTrylock = (address, lockBit) => {
 export const pointerBitUnlock = (address, lockBit) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_pointer_bit_unlock", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -4459,20 +4501,20 @@ export const pointerBitUnlock = (address, lockBit) => {
 export const pointerBitUnlockAndSet = (address, lockBit, preserveMask, ptr) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_pointer_bit_unlock_and_set", [
         {
-            type: { type: "gobject" },
-            value: address?.ptr ?? address,
+            type: { type: "int", size: 64, unsigned: true },
+            value: address,
         },
         {
             type: { type: "int", size: 32, unsigned: true },
             value: lockBit,
         },
         {
-            type: { type: "gobject" },
-            value: ptr?.ptr ?? ptr,
+            type: { type: "int", size: 64, unsigned: true },
+            value: ptr,
         },
         {
-            type: { type: "gobject" },
-            value: preserveMask?.ptr ?? preserveMask,
+            type: { type: "int", size: 64, unsigned: true },
+            value: preserveMask,
         },
     ], { type: "undefined" });
 };
@@ -4541,24 +4583,24 @@ export const propagateError = (src, dest) => {
 export const qsortWithData = (pbase, totalElems, size, compareFunc, userData) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_qsort_with_data", [
         {
-            type: { type: "gobject" },
-            value: pbase?.ptr ?? pbase,
+            type: { type: "int", size: 64, unsigned: true },
+            value: pbase,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
             value: totalElems,
         },
         {
-            type: { type: "gobject" },
-            value: size?.ptr ?? size,
+            type: { type: "int", size: 64, unsigned: true },
+            value: size,
         },
         {
             type: { type: "callback" },
             value: compareFunc,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "undefined" });
 };
@@ -4584,7 +4626,7 @@ export const quarkToString = (quark) => {
             type: { type: "int", size: 32, unsigned: true },
             value: quark,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const quarkTryString = (string) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_quark_try_string", [
@@ -4642,94 +4684,94 @@ export const randomSetSeed = (seed) => {
 export const rcBoxAcquire = (memBlock) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_rc_box_acquire", [
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const rcBoxAlloc = (blockSize) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_rc_box_alloc", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const rcBoxAlloc0 = (blockSize) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_rc_box_alloc0", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const rcBoxDup = (blockSize, memBlock) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_rc_box_dup", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const rcBoxGetSize = (memBlock) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_rc_box_get_size", [
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const rcBoxRelease = (memBlock) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_rc_box_release", [
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
     ], { type: "undefined" });
 };
 export const rcBoxReleaseFull = (memBlock, clearFunc) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_rc_box_release_full", [
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
         {
-            type: { type: "gobject" },
-            value: clearFunc?.ptr ?? clearFunc,
+            type: { type: "int", size: 64, unsigned: true },
+            value: clearFunc,
         },
     ], { type: "undefined" });
 };
 export const realloc = (nBytes, mem) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_realloc", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
         {
-            type: { type: "gobject" },
-            value: nBytes?.ptr ?? nBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const reallocN = (nBlocks, nBlockBytes, mem) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_realloc_n", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
         {
-            type: { type: "gobject" },
-            value: nBlocks?.ptr ?? nBlocks,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlocks,
         },
         {
-            type: { type: "gobject" },
-            value: nBlockBytes?.ptr ?? nBlockBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlockBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const refCountCompare = (rc, val) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_ref_count_compare", [
@@ -4802,7 +4844,7 @@ export const refStringLength = (str) => {
             type: { type: "string" },
             value: str,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const refStringNew = (str) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_ref_string_new", [
@@ -4827,8 +4869,8 @@ export const refStringNewLen = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -4981,8 +5023,8 @@ export const sequenceForeachRange = (begin, end, func, userData) => {
             value: func,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "undefined" });
 };
@@ -4992,7 +5034,7 @@ export const sequenceGet = (iter) => {
             type: { type: "gobject" },
             value: iter?.ptr ?? iter,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const sequenceInsertBefore = (iter, data) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_sequence_insert_before", [
@@ -5001,8 +5043,8 @@ export const sequenceInsertBefore = (iter, data) => {
             value: iter?.ptr ?? iter,
         },
         {
-            type: { type: "gobject" },
-            value: data?.ptr ?? data,
+            type: { type: "int", size: 64, unsigned: true },
+            value: data,
         },
     ], { type: "gobject", borrowed: true });
 };
@@ -5073,8 +5115,8 @@ export const sequenceSet = (iter, data) => {
             value: iter?.ptr ?? iter,
         },
         {
-            type: { type: "gobject" },
-            value: data?.ptr ?? data,
+            type: { type: "int", size: 64, unsigned: true },
+            value: data,
         },
     ], { type: "undefined" });
 };
@@ -5089,8 +5131,8 @@ export const sequenceSortChanged = (iter, cmpFunc, cmpData) => {
             value: cmpFunc,
         },
         {
-            type: { type: "gobject" },
-            value: cmpData?.ptr ?? cmpData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: cmpData,
         },
     ], { type: "undefined" });
 };
@@ -5105,8 +5147,8 @@ export const sequenceSortChangedIter = (iter, iterCmp, cmpData) => {
             value: iterCmp,
         },
         {
-            type: { type: "gobject" },
-            value: cmpData?.ptr ?? cmpData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: cmpData,
         },
     ], { type: "undefined" });
 };
@@ -5265,56 +5307,56 @@ export const shellUnquote = (quotedString) => {
 export const sliceAlloc = (blockSize) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_slice_alloc", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const sliceAlloc0 = (blockSize) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_slice_alloc0", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const sliceCopy = (blockSize, memBlock) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_slice_copy", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const sliceFree1 = (blockSize, memBlock) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_slice_free1", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
         {
-            type: { type: "gobject" },
-            value: memBlock?.ptr ?? memBlock,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memBlock,
         },
     ], { type: "undefined" });
 };
 export const sliceFreeChainWithOffset = (blockSize, nextOffset, memChain) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_slice_free_chain_with_offset", [
         {
-            type: { type: "gobject" },
-            value: blockSize?.ptr ?? blockSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: blockSize,
         },
         {
-            type: { type: "gobject" },
-            value: memChain?.ptr ?? memChain,
+            type: { type: "int", size: 64, unsigned: true },
+            value: memChain,
         },
         {
-            type: { type: "gobject" },
-            value: nextOffset?.ptr ?? nextOffset,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nextOffset,
         },
     ], { type: "undefined" });
 };
@@ -5382,16 +5424,16 @@ export const sourceRemoveByFuncsUserData = (funcs, userData) => {
             value: funcs?.ptr ?? funcs,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "boolean" });
 };
 export const sourceRemoveByUserData = (userData) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_source_remove_by_user_data", [
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
     ], { type: "boolean" });
 };
@@ -5439,11 +5481,14 @@ export const spawnAsync = (argv, flags, workingDirectory, envp, childSetup, user
             value: childSetup,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 32, unsigned: false },
+            },
             value: childPid,
         },
         {
@@ -5487,11 +5532,14 @@ export const spawnAsyncWithFds = (argv, flags, stdinFd, stdoutFd, stderrFd, work
             value: childSetup,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 32, unsigned: false },
+            },
             value: childPid,
         },
         {
@@ -5547,11 +5595,14 @@ export const spawnAsyncWithPipes = (argv, flags, workingDirectory, envp, childSe
             value: childSetup,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 32, unsigned: false },
+            },
             value: childPid,
         },
         {
@@ -5616,8 +5667,8 @@ export const spawnAsyncWithPipesAndFds = (argv, flags, stdinFd, stdoutFd, stderr
             value: childSetup,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -5646,11 +5697,14 @@ export const spawnAsyncWithPipesAndFds = (argv, flags, stdinFd, stdoutFd, stderr
             value: targetFds,
         },
         {
-            type: { type: "gobject" },
-            value: nFds?.ptr ?? nFds,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nFds,
         },
         {
-            type: { type: "ref", innerType: { type: "gobject" } },
+            type: {
+                type: "ref",
+                innerType: { type: "int", size: 32, unsigned: false },
+            },
             value: childPidOut,
         },
         {
@@ -5742,8 +5796,8 @@ export const spawnCheckWaitStatus = (waitStatus) => {
 export const spawnClosePid = (pid) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_spawn_close_pid", [
         {
-            type: { type: "gobject" },
-            value: pid?.ptr ?? pid,
+            type: { type: "int", size: 32, unsigned: false },
+            value: pid,
         },
     ], { type: "undefined" });
 };
@@ -5852,8 +5906,8 @@ export const spawnSync = (argv, flags, workingDirectory, envp, childSetup, userD
             value: childSetup,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
             type: {
@@ -5926,12 +5980,12 @@ export const stpcpy = (dest, src) => {
 export const strEqual = (v1, v2) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_str_equal", [
         {
-            type: { type: "gobject" },
-            value: v1?.ptr ?? v1,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v1,
         },
         {
-            type: { type: "gobject" },
-            value: v2?.ptr ?? v2,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v2,
         },
     ], { type: "boolean" });
 };
@@ -5962,8 +6016,8 @@ export const strHasSuffix = (str, suffix) => {
 export const strHash = (v) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_str_hash", [
         {
-            type: { type: "gobject" },
-            value: v?.ptr ?? v,
+            type: { type: "int", size: 64, unsigned: true },
+            value: v,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -6132,7 +6186,7 @@ export const strerror = (errnum) => {
             type: { type: "int", size: 32, unsigned: false },
             value: errnum,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const strescape = (source, exceptions) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strescape", [
@@ -6164,7 +6218,7 @@ export const stripContext = (msgid, msgval) => {
             type: { type: "string" },
             value: msgval,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const strjoinv = (strArray, separator) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strjoinv", [
@@ -6189,10 +6243,10 @@ export const strlcat = (dest, src, destSize) => {
             value: src,
         },
         {
-            type: { type: "gobject" },
-            value: destSize?.ptr ?? destSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: destSize,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const strlcpy = (dest, src, destSize) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strlcpy", [
@@ -6205,10 +6259,10 @@ export const strlcpy = (dest, src, destSize) => {
             value: src,
         },
         {
-            type: { type: "gobject" },
-            value: destSize?.ptr ?? destSize,
+            type: { type: "int", size: 64, unsigned: true },
+            value: destSize,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const strncasecmp = (s1, s2, n) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strncasecmp", [
@@ -6233,16 +6287,16 @@ export const strndup = (n, str) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: n?.ptr ?? n,
+            type: { type: "int", size: 64, unsigned: true },
+            value: n,
         },
     ], { type: "string" });
 };
 export const strnfill = (length, fillChar) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strnfill", [
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: true },
+            value: length,
         },
         {
             type: { type: "int", size: 8, unsigned: false },
@@ -6268,7 +6322,7 @@ export const strrstr = (haystack, needle) => {
             type: { type: "string" },
             value: needle,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const strrstrLen = (haystack, haystackLen, needle) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strrstr_len", [
@@ -6277,14 +6331,14 @@ export const strrstrLen = (haystack, haystackLen, needle) => {
             value: haystack,
         },
         {
-            type: { type: "gobject" },
-            value: haystackLen?.ptr ?? haystackLen,
+            type: { type: "int", size: 64, unsigned: false },
+            value: haystackLen,
         },
         {
             type: { type: "string" },
             value: needle,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const strsignal = (signum) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strsignal", [
@@ -6292,7 +6346,7 @@ export const strsignal = (signum) => {
             type: { type: "int", size: 32, unsigned: false },
             value: signum,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const strsplit = (string, delimiter, maxTokens) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strsplit", [
@@ -6333,14 +6387,14 @@ export const strstrLen = (haystack, haystackLen, needle) => {
             value: haystack,
         },
         {
-            type: { type: "gobject" },
-            value: haystackLen?.ptr ?? haystackLen,
+            type: { type: "int", size: 64, unsigned: false },
+            value: haystackLen,
         },
         {
             type: { type: "string" },
             value: needle,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const strtod = (nptr, endptr) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_strtod", [
@@ -6408,8 +6462,8 @@ export const testAddDataFunc = (testpath, testFunc, testData) => {
             value: testpath,
         },
         {
-            type: { type: "gobject" },
-            value: testData?.ptr ?? testData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: testData,
         },
         {
             type: { type: "callback" },
@@ -6424,16 +6478,16 @@ export const testAddDataFuncFull = (testpath, testFunc, dataFreeFunc, testData)
             value: testpath,
         },
         {
-            type: { type: "gobject" },
-            value: testData?.ptr ?? testData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: testData,
         },
         {
             type: { type: "callback" },
             value: testFunc,
         },
         {
-            type: { type: "gobject" },
-            value: dataFreeFunc?.ptr ?? dataFreeFunc,
+            type: { type: "int", size: 64, unsigned: true },
+            value: dataFreeFunc,
         },
     ], { type: "undefined" });
 };
@@ -6520,11 +6574,12 @@ export const testGetDir = (fileType) => {
             type: { type: "int", size: 32, unsigned: false },
             value: fileType,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const testGetPath = () => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_test_get_path", [], {
         type: "string",
+        borrowed: true,
     });
 };
 export const testIncomplete = (msg) => {
@@ -6541,25 +6596,25 @@ export const testLogTypeName = (logType) => {
             type: { type: "int", size: 32, unsigned: false },
             value: logType,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const testQueueDestroy = (destroyFunc, destroyData) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_test_queue_destroy", [
         {
-            type: { type: "gobject" },
-            value: destroyFunc?.ptr ?? destroyFunc,
+            type: { type: "int", size: 64, unsigned: true },
+            value: destroyFunc,
         },
         {
-            type: { type: "gobject" },
-            value: destroyData?.ptr ?? destroyData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: destroyData,
         },
     ], { type: "undefined" });
 };
 export const testQueueFree = (gfreePointer) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_test_queue_free", [
         {
-            type: { type: "gobject" },
-            value: gfreePointer?.ptr ?? gfreePointer,
+            type: { type: "int", size: 64, unsigned: true },
+            value: gfreePointer,
         },
     ], { type: "undefined" });
 };
@@ -6738,8 +6793,8 @@ export const threadErrorQuark = () => {
 export const threadExit = (retval) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_thread_exit", [
         {
-            type: { type: "gobject" },
-            value: retval?.ptr ?? retval,
+            type: { type: "int", size: 64, unsigned: true },
+            value: retval,
         },
     ], { type: "undefined" });
 };
@@ -6778,8 +6833,6 @@ export const threadSelf = () => {
         innerType: "GThread",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Thread);
 };
 export const threadYield = () => {
@@ -6814,12 +6867,12 @@ export const timeoutAddFull = (priority, interval, _function, data, notify) => {
             value: _function,
         },
         {
-            type: { type: "gobject" },
-            value: data?.ptr ?? data,
+            type: { type: "int", size: 64, unsigned: true },
+            value: data,
         },
         {
-            type: { type: "gobject" },
-            value: notify?.ptr ?? notify,
+            type: { type: "int", size: 64, unsigned: true },
+            value: notify,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -6838,12 +6891,12 @@ export const timeoutAddSecondsFull = (priority, interval, _function, data, notif
             value: _function,
         },
         {
-            type: { type: "gobject" },
-            value: data?.ptr ?? data,
+            type: { type: "int", size: 64, unsigned: true },
+            value: data,
         },
         {
-            type: { type: "gobject" },
-            value: notify?.ptr ?? notify,
+            type: { type: "int", size: 64, unsigned: true },
+            value: notify,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -6859,8 +6912,6 @@ export const timeoutSourceNew = (interval) => {
         innerType: "GSource",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Source);
 };
 export const timeoutSourceNewSeconds = (interval) => {
@@ -6875,8 +6926,6 @@ export const timeoutSourceNewSeconds = (interval) => {
         innerType: "GSource",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Source);
 };
 export const trashStackHeight = (stackP) => {
@@ -6893,7 +6942,7 @@ export const trashStackPeek = (stackP) => {
             type: { type: "gobject" },
             value: stackP?.ptr ?? stackP,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const trashStackPop = (stackP) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_trash_stack_pop", [
@@ -6901,7 +6950,7 @@ export const trashStackPop = (stackP) => {
             type: { type: "gobject" },
             value: stackP?.ptr ?? stackP,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const trashStackPush = (stackP, dataP) => {
     call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_trash_stack_push", [
@@ -6910,78 +6959,78 @@ export const trashStackPush = (stackP, dataP) => {
             value: stackP?.ptr ?? stackP,
         },
         {
-            type: { type: "gobject" },
-            value: dataP?.ptr ?? dataP,
+            type: { type: "int", size: 64, unsigned: true },
+            value: dataP,
         },
     ], { type: "undefined" });
 };
 export const tryMalloc = (nBytes) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_try_malloc", [
         {
-            type: { type: "gobject" },
-            value: nBytes?.ptr ?? nBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const tryMalloc0 = (nBytes) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_try_malloc0", [
         {
-            type: { type: "gobject" },
-            value: nBytes?.ptr ?? nBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const tryMalloc0N = (nBlocks, nBlockBytes) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_try_malloc0_n", [
         {
-            type: { type: "gobject" },
-            value: nBlocks?.ptr ?? nBlocks,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlocks,
         },
         {
-            type: { type: "gobject" },
-            value: nBlockBytes?.ptr ?? nBlockBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlockBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const tryMallocN = (nBlocks, nBlockBytes) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_try_malloc_n", [
         {
-            type: { type: "gobject" },
-            value: nBlocks?.ptr ?? nBlocks,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlocks,
         },
         {
-            type: { type: "gobject" },
-            value: nBlockBytes?.ptr ?? nBlockBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlockBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const tryRealloc = (nBytes, mem) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_try_realloc", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
         {
-            type: { type: "gobject" },
-            value: nBytes?.ptr ?? nBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const tryReallocN = (nBlocks, nBlockBytes, mem) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_try_realloc_n", [
         {
-            type: { type: "gobject" },
-            value: mem?.ptr ?? mem,
+            type: { type: "int", size: 64, unsigned: true },
+            value: mem,
         },
         {
-            type: { type: "gobject" },
-            value: nBlocks?.ptr ?? nBlocks,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlocks,
         },
         {
-            type: { type: "gobject" },
-            value: nBlockBytes?.ptr ?? nBlockBytes,
+            type: { type: "int", size: 64, unsigned: true },
+            value: nBlockBytes,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const ucs4ToUtf16 = (str, len, itemsRead, itemsWritten) => {
     const error = { value: null };
@@ -7138,10 +7187,10 @@ export const unicharFullyDecompose = (ch, compat, resultLen, result) => {
             value: result,
         },
         {
-            type: { type: "gobject" },
-            value: resultLen?.ptr ?? resultLen,
+            type: { type: "int", size: 64, unsigned: true },
+            value: resultLen,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const unicharGetMirrorChar = (ch, mirroredCh) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_unichar_get_mirror_char", [
@@ -7366,8 +7415,8 @@ export const unicodeCanonicalDecomposition = (ch, resultLen) => {
             value: ch?.ptr ?? ch,
         },
         {
-            type: { type: "gobject" },
-            value: resultLen?.ptr ?? resultLen,
+            type: { type: "int", size: 64, unsigned: true },
+            value: resultLen,
         },
     ], { type: "gobject", borrowed: true });
 };
@@ -7378,8 +7427,8 @@ export const unicodeCanonicalOrdering = (string, len) => {
             value: string,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: true },
+            value: len,
         },
     ], { type: "undefined" });
 };
@@ -7421,12 +7470,12 @@ export const unixFdAddFull = (priority, fd, condition, _function, notify, userDa
             value: _function,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
-            type: { type: "gobject" },
-            value: notify?.ptr ?? notify,
+            type: { type: "int", size: 64, unsigned: true },
+            value: notify,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -7446,8 +7495,6 @@ export const unixFdSourceNew = (fd, condition) => {
         innerType: "GSource",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Source);
 };
 export const unixGetPasswdEntry = (userName) => {
@@ -7468,7 +7515,7 @@ export const unixGetPasswdEntry = (userName) => {
             },
             value: error,
         },
-    ], { type: "gobject" });
+    ], { type: "int", size: 64, unsigned: true });
     if (error.value !== null) {
         throw new NativeError(error.value);
     }
@@ -7548,12 +7595,12 @@ export const unixSignalAddFull = (priority, signum, handler, notify, userData) =
             value: handler,
         },
         {
-            type: { type: "gobject" },
-            value: userData?.ptr ?? userData,
+            type: { type: "int", size: 64, unsigned: true },
+            value: userData,
         },
         {
-            type: { type: "gobject" },
-            value: notify?.ptr ?? notify,
+            type: { type: "int", size: 64, unsigned: true },
+            value: notify,
         },
     ], { type: "int", size: 32, unsigned: true });
 };
@@ -7569,8 +7616,6 @@ export const unixSignalSourceNew = (signum) => {
         innerType: "GSource",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Source);
 };
 export const unlink = (filename) => {
@@ -7629,8 +7674,6 @@ export const uriBuild = (flags, scheme, port, path, userinfo, host, query, fragm
         innerType: "GUri",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Uri);
 };
 export const uriBuildWithUser = (flags, scheme, port, path, user, password, authParams, host, query, fragment) => {
@@ -7681,8 +7724,6 @@ export const uriBuildWithUser = (flags, scheme, port, path, user, password, auth
         innerType: "GUri",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Uri);
 };
 export const uriErrorQuark = () => {
@@ -7702,8 +7743,8 @@ export const uriEscapeBytes = (unescaped, length, reservedCharsAllowed) => {
             value: unescaped,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: true },
+            value: length,
         },
         {
             type: { type: "string" },
@@ -7874,8 +7915,6 @@ export const uriParse = (uriString, flags) => {
     if (error.value !== null) {
         throw new NativeError(error.value);
     }
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Uri);
 };
 export const uriParseParams = (params, length, separators, flags) => {
@@ -7886,8 +7925,8 @@ export const uriParseParams = (params, length, separators, flags) => {
             value: params,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: false },
+            value: length,
         },
         {
             type: { type: "string" },
@@ -7917,8 +7956,6 @@ export const uriParseParams = (params, length, separators, flags) => {
     if (error.value !== null) {
         throw new NativeError(error.value);
     }
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, HashTable);
 };
 export const uriParseScheme = (uri) => {
@@ -7935,7 +7972,7 @@ export const uriPeekScheme = (uri) => {
             type: { type: "string" },
             value: uri,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const uriResolveRelative = (uriRef, flags, baseUriString) => {
     const error = { value: null };
@@ -8146,8 +8183,8 @@ export const uriUnescapeBytes = (escapedString, length, illegalCharacters) => {
             value: escapedString,
         },
         {
-            type: { type: "gobject" },
-            value: length?.ptr ?? length,
+            type: { type: "int", size: 64, unsigned: false },
+            value: length,
         },
         {
             type: { type: "string" },
@@ -8173,8 +8210,6 @@ export const uriUnescapeBytes = (escapedString, length, illegalCharacters) => {
     if (error.value !== null) {
         throw new NativeError(error.value);
     }
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Bytes);
 };
 export const uriUnescapeSegment = (escapedString, escapedStringEnd, illegalCharacters) => {
@@ -8310,8 +8345,8 @@ export const utf8Casefold = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -8334,8 +8369,8 @@ export const utf8CollateKey = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -8346,8 +8381,8 @@ export const utf8CollateKeyForFilename = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -8361,7 +8396,7 @@ export const utf8FindNextChar = (p, end) => {
             type: { type: "string" },
             value: end,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const utf8FindPrevChar = (str, p) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_utf8_find_prev_char", [
@@ -8373,7 +8408,7 @@ export const utf8FindPrevChar = (str, p) => {
             type: { type: "string" },
             value: p,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const utf8GetChar = (p) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_utf8_get_char", [
@@ -8390,8 +8425,8 @@ export const utf8GetCharValidated = (p, maxLen) => {
             value: p,
         },
         {
-            type: { type: "gobject" },
-            value: maxLen?.ptr ?? maxLen,
+            type: { type: "int", size: 64, unsigned: false },
+            value: maxLen,
         },
     ], { type: "gobject", borrowed: true });
 };
@@ -8402,8 +8437,8 @@ export const utf8MakeValid = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -8414,8 +8449,8 @@ export const utf8Normalize = (str, len, mode) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -8433,7 +8468,7 @@ export const utf8OffsetToPointer = (str, offset) => {
             type: { type: "int", size: 64, unsigned: false },
             value: offset,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const utf8PointerToOffset = (str, pos) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_utf8_pointer_to_offset", [
@@ -8453,7 +8488,7 @@ export const utf8PrevChar = (p) => {
             type: { type: "string" },
             value: p,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const utf8Strchr = (p, len, c) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_utf8_strchr", [
@@ -8462,14 +8497,14 @@ export const utf8Strchr = (p, len, c) => {
             value: p,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
             type: { type: "gobject" },
             value: c?.ptr ?? c,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const utf8Strdown = (str, len) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_utf8_strdown", [
@@ -8478,8 +8513,8 @@ export const utf8Strdown = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -8490,8 +8525,8 @@ export const utf8Strlen = (p, max) => {
             value: p,
         },
         {
-            type: { type: "gobject" },
-            value: max?.ptr ?? max,
+            type: { type: "int", size: 64, unsigned: false },
+            value: max,
         },
     ], { type: "int", size: 64, unsigned: false });
 };
@@ -8506,10 +8541,10 @@ export const utf8Strncpy = (dest, src, n) => {
             value: src,
         },
         {
-            type: { type: "gobject" },
-            value: n?.ptr ?? n,
+            type: { type: "int", size: 64, unsigned: true },
+            value: n,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const utf8Strrchr = (p, len, c) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_utf8_strrchr", [
@@ -8518,14 +8553,14 @@ export const utf8Strrchr = (p, len, c) => {
             value: p,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
         {
             type: { type: "gobject" },
             value: c?.ptr ?? c,
         },
-    ], { type: "string" });
+    ], { type: "string", borrowed: true });
 };
 export const utf8Strreverse = (str, len) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_utf8_strreverse", [
@@ -8534,8 +8569,8 @@ export const utf8Strreverse = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -8546,8 +8581,8 @@ export const utf8Strup = (str, len) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: len?.ptr ?? len,
+            type: { type: "int", size: 64, unsigned: false },
+            value: len,
         },
     ], { type: "string" });
 };
@@ -8677,8 +8712,8 @@ export const utf8TruncateMiddle = (string, truncateLength) => {
             value: string,
         },
         {
-            type: { type: "gobject" },
-            value: truncateLength?.ptr ?? truncateLength,
+            type: { type: "int", size: 64, unsigned: true },
+            value: truncateLength,
         },
     ], { type: "string" });
 };
@@ -8692,8 +8727,8 @@ export const utf8Validate = (str, maxLen, end) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: maxLen?.ptr ?? maxLen,
+            type: { type: "int", size: 64, unsigned: false },
+            value: maxLen,
         },
         {
             type: {
@@ -8717,8 +8752,8 @@ export const utf8ValidateLen = (str, maxLen, end) => {
             value: str,
         },
         {
-            type: { type: "gobject" },
-            value: maxLen?.ptr ?? maxLen,
+            type: { type: "int", size: 64, unsigned: true },
+            value: maxLen,
         },
         {
             type: {
@@ -8739,8 +8774,8 @@ export const utime = (filename, utb) => {
             value: filename,
         },
         {
-            type: { type: "gobject" },
-            value: utb?.ptr ?? utb,
+            type: { type: "int", size: 64, unsigned: true },
+            value: utb,
         },
     ], { type: "int", size: 32, unsigned: false });
 };
@@ -8817,8 +8852,6 @@ export const variantParse = (text, type, limit, endptr) => {
     if (error.value !== null) {
         throw new NativeError(error.value);
     }
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, Variant);
 };
 export const variantParseErrorPrintContext = (error, sourceStr) => {
@@ -8855,8 +8888,6 @@ export const variantTypeChecked_ = (typeString) => {
         innerType: "GVariantType",
         lib: "libgobject-2.0.so.0,libglib-2.0.so.0",
     });
-    if (ptr === null)
-        return null;
     return wrapPtr(ptr, VariantType);
 };
 export const variantTypeStringGetDepth_ = (typeString) => {
@@ -8865,7 +8896,7 @@ export const variantTypeStringGetDepth_ = (typeString) => {
             type: { type: "string" },
             value: typeString,
         },
-    ], { type: "gobject", borrowed: true });
+    ], { type: "int", size: 64, unsigned: true });
 };
 export const variantTypeStringIsValid = (typeString) => {
     return call("libgobject-2.0.so.0,libglib-2.0.so.0", "g_variant_type_string_is_valid", [