Replace Win32API with Fiddle, update appveyor.yml (brianmario#1053)

bandlab · Oct 2, 2019 · fd32e28 · fd32e28
1 parent 9804551
commit fd32e28
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -25,6 +25,10 @@ on_failure:
   - find tmp -name "*.log" | xargs cat
 environment:
   matrix:
+    - ruby_version: "26-x64"
+      MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
+    - ruby_version: "25-x64"
+      MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
     - ruby_version: "24-x64"
       MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
     - ruby_version: "24"

diff --git a/lib/mysql2.rb b/lib/mysql2.rb
@@ -20,9 +20,12 @@
   end
 
   if dll_path
-    require 'Win32API'
-    LoadLibrary = Win32API.new('Kernel32', 'LoadLibrary', ['P'], 'I')
-    if LoadLibrary.call(dll_path).zero?
+    require 'fiddle'
+    kernel32 = Fiddle.dlopen 'kernel32'
+    load_library = Fiddle::Function.new(
+      kernel32['LoadLibraryW'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT,
+    )
+    if load_library.call(dll_path.encode('utf-16le')).zero?
       abort "Failed to load libmysql.dll from #{dll_path}"
     end
   end