koffi 2.5.18-beta.1 → 2.5.18-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.5.18-beta.1",
+    "version": "2.5.18-beta.3",
     "stable": "2.5.16",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [

package/src/cnoke/assets/win_delay_hook.c

@@ -29,18 +29,21 @@
 #include <windows.h>
 #include <delayimp.h>
 
+static HMODULE node_dll;
+
 static FARPROC WINAPI self_exe_hook(unsigned int event, DelayLoadInfo *info)
 {
-    if (event == dliNotePreLoadLibrary && !stricmp(info->szDll, "node.exe")) {
-        if (GetModuleHandleW(L"nw.dll")) {
-            HMODULE h = GetModuleHandleW(L"node.dll");
-            return (FARPROC)h;
-        } else {
-            HMODULE h = GetModuleHandleW(NULL);
-            return (FARPROC)h;
+    if (event == dliStartProcessing) {
+        node_dll = GetModuleHandleA("node.dll");
+        if (!node_dll) {
+            node_dll = GetModuleHandle(NULL);
         }
+        return NULL;
     }
 
+    if (event == dliNotePreLoadLibrary && !stricmp(info->szDll, "node.exe"))
+        return (FARPROC)node_dll;
+
     return NULL;
 }
 

package/src/index.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
-// build/dist/src/cnoke/src/tools.js
+// src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "build/dist/src/cnoke/src/tools.js"(exports2, module2) {
+  "src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -373,12 +373,12 @@ var require_tools = __commonJS({
   }
 });
 
-// build/dist/src/koffi/package.json
+// src/koffi/package.json
 var require_package = __commonJS({
-  "build/dist/src/koffi/package.json"(exports2, module2) {
+  "src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.5.18-beta.1",
+      version: "2.5.18-beta.3",
       stable: "2.5.16",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
@@ -429,7 +429,7 @@ var require_package = __commonJS({
   }
 });
 
-// build/dist/src/koffi/src/index.js
+// src/koffi/src/index.js
 var util = require("util");
 var fs = require("fs");
 var { get_napi_version, determine_arch } = require_tools();