koffi 2.5.12 → 2.5.13

package/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ### Koffi 2.5
 
+#### Koffi 2.5.13 (2023-08-23)
+
+- Fix DLL error when using Koffi from NW.js on Windows
+- Simplify NW.js Koffi example
+
 #### Koffi 2.5.12 (2023-08-21)
 
 - Fix native module bundling for FreeBSD ARM64 and Linux RISC-V 64

package/package.json

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

package/src/cnoke/assets/win_delay_hook.c

@@ -31,9 +31,19 @@
 
 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")) {
-        HMODULE h = GetModuleHandle(NULL);
-        return (FARPROC)h;
+        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;
+        }
     }
 
     return NULL;