koffi 2.5.13 → 2.5.14

package/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Koffi 2.5
 
-#### Koffi 2.5.13 (2023-08-23)
+#### Koffi 2.5.14 (2023-08-23)
 
 - Fix DLL error when using Koffi from NW.js on Windows
 - Simplify NW.js Koffi example

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koffi",
-    "version": "2.5.13",
-    "stable": "2.5.13",
+    "version": "2.5.14",
+    "stable": "2.5.14",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/cnoke/assets/win_delay_hook.c

@@ -29,24 +29,41 @@
 #include <windows.h>
 #include <delayimp.h>
 
+static HMODULE node_dll;
+static HMODULE nw_dll;
+
 static FARPROC WINAPI self_exe_hook(unsigned int event, DelayLoadInfo *info)
 {
-    static const wchar_t *const NodeLibraries[] = {
-        L"node.dll",
-        NULL
-    };
-
-    if (event == dliNotePreLoadLibrary && !stricmp(info->szDll, "node.exe")) {
-        for (int i = 0; i < sizeof(NodeLibraries) / sizeof(*NodeLibraries); i++) {
-            const wchar_t *name = NodeLibraries[i];
-            HMODULE h = GetModuleHandleW(name);
-
-            if (h)
-                return (FARPROC)h;
+    if (event == dliStartProcessing) {
+        node_dll = GetModuleHandleA("node.dll");
+        nw_dll = GetModuleHandleA("nw.dll");
+
+        return NULL;
+    }
+
+    if (event == dliNotePreGetProcAddress) {
+        if (node_dll) {
+            FARPROC ret = GetProcAddress(node_dll, info->dlp.szProcName);
+            if (ret)
+                return ret;
+        }
+
+        if (nw_dll) {
+            FARPROC ret = GetProcAddress(nw_dll, info->dlp.szProcName);
+            if (ret)
+                return ret;
+        }
+    }
+
+    if (event == dliNotePreLoadLibrary && _stricmp(info->szDll, "node.exe") != 0) {
+        if (!node_dll) {
+            node_dll = GetModuleHandleA(NULL);
         }
+        return (FARPROC)node_dll;
     }
 
     return NULL;
 }
 
 const PfnDliHook __pfnDliNotifyHook2 = self_exe_hook;
+const PfnDliHook __pfnDliFailureHook2 = self_exe_hook;

package/src/cnoke/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnoke",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Build native Node addons based on CMake, without extra dependency",
   "keywords": [
     "native",

package/src/koffi/examples/nwjs/src/package.json

@@ -5,6 +5,6 @@
   "author": "Niels Martignène <niels.martignene@protonmail.com>",
   "license": "MIT",
   "dependencies": {
-    "koffi": "^2.5.9"
+    "koffi": "^2.5.14"
   }
 }