koffi 2.6.8 → 2.6.9

package/CHANGELOG.md

@@ -4,13 +4,17 @@
 
 ### Koffi 2.6
 
-#### Koffi 2.6.8 (2023-11-24)
+#### Koffi 2.6.9 (2023-11-25)
 
 - Search in DLL directory for additional dependencies on Windows
 - Ignore prototype properties when making structs or unions
 - Show detected version of Node when not adequate
 - Minor documentation fixes
 
+```{warning}
+Loading Win32 system libraries can fail in Koffi 2.6.8, skip this version.
+```
+
 #### Koffi 2.6.6 (2023-10-28)
 
 - Better handle errors while making struct or union types
@@ -280,7 +284,7 @@ Pre-built binaries don't work correctly in Koffi 2.5.13 to 2.5.15, skip those ve
 - Avoid CNoke dependency
 - Clear out development dependencies from package.json
 
-#### Koffi 2.3.1 (2023-01-3O)
+#### Koffi 2.3.1 (2023-01-30)
 
 - Error out when trying to use ambiguous `void *` arguments (input and/or output)
 - Adjust TypeScript definitions ([@insraq](https://github.com/insraq))

package/index.js

@@ -378,8 +378,8 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.6.8",
-      stable: "2.6.8",
+      version: "2.6.9",
+      stable: "2.6.9",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",

package/indirect.js

@@ -378,8 +378,8 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.6.8",
-      stable: "2.6.8",
+      version: "2.6.9",
+      stable: "2.6.9",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",

package/package.json

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

package/src/koffi/src/ffi.cc

@@ -1640,19 +1640,28 @@ static Napi::Value UnloadLibrary(const Napi::CallbackInfo &info)
 }
 
 #ifdef _WIN32
-static HANDLE LoadWindowsLibrary(Napi::Env env, const char *path)
+static HANDLE LoadWindowsLibrary(Napi::Env env, Span<const char> path)
 {
     BlockAllocator temp_alloc;
 
-    DWORD flags = LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR;
+    Span<wchar_t> filename_w = AllocateSpan<wchar_t>(&temp_alloc, path.len + 1);
 
-    Span<const char> filename = NormalizePath(path, GetWorkingDirectory(), &temp_alloc);
-    Span<wchar_t> filename_w = AllocateSpan<wchar_t>(&temp_alloc, filename.len + 1);
-
-    if (ConvertUtf8ToWin32Wide(filename, filename_w) < 0)
+    if (ConvertUtf8ToWin32Wide(path, filename_w) < 0)
         return nullptr;
 
-    HMODULE module = LoadLibraryExW(filename_w.ptr, nullptr, flags);
+    HMODULE module = LoadLibraryW(filename_w.ptr);
+
+    if (!module) {
+        DWORD flags = LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR;
+
+        Span<const char> filename = NormalizePath(path, GetWorkingDirectory(), &temp_alloc);
+        Span<wchar_t> filename_w = AllocateSpan<wchar_t>(&temp_alloc, filename.len + 1);
+
+        if (ConvertUtf8ToWin32Wide(filename, filename_w) < 0)
+            return nullptr;
+
+        module = LoadLibraryExW(filename_w.ptr, nullptr, flags);
+    }
 
     if (!module) {
         if (GetLastError() == ERROR_BAD_EXE_FORMAT) {