win32-api 1.6.1.2-universal-mingw32 → 1.9.1-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6f98adc93ce159542eff34d770f82cafd104b7a
-  data.tar.gz: c3356912152cc4a1a855e5f7fed6990c6cab8b73
+SHA256:
+  metadata.gz: 50f2020c700c00a8f72649d59a580d017a3418c42db26dc79cd6d379ba589239
+  data.tar.gz: d591539fa8826a781bb96131f7a79cc018e2bf4f8bb38b132bdc3d93d1236c86
 SHA512:
-  metadata.gz: dedad26960b16f70ed1d6274ab25c025fb69233d0831615503304d17830c3c93f70230095b9914c9529e8bcdf1188dd97d78af4a7123958cd9cebbf614edbf2e
-  data.tar.gz: 5ed7cfdc147c90bc154fc11ccc4637dbf92c9826eaeb2e0efd07132a379b47282b061da3f637caebc3c03aedaaa42e38a98fa06b7fa32e971c2329d85e144f2d
+  metadata.gz: 9f2db91230d8b7a4c360fb698d75a2e30106aa7786b63d9d0536b87d938f1c9771a5d6d8516002ac3ddc0b03086c72b15780ab8ffbc2ca3d28bee8be3dad5fbb
+  data.tar.gz: 879067f098f0f684925eaa592009c77e638447ad738935106775f857a81aefe4afc9b2500e5108645fc7e3dbb73866473d8112df00af9628f149f6559b165f56

data/CHANGES

@@ -1,3 +1,28 @@
+== 1.9.1 - 14-Jul-2020
+* Handle whether tainted support or not.
+
+== 1.9.0 - 6-Jan-2020
+* Add Ruby 2.8 snapshot support.
+* Now includes binaries for Ruby 2.8 both 32 and 64 bit versions.
+* Use RubyInstaller 2.7.0-1 for Ruby 2.7 binaries.
+
+== 1.8.0 - 6-Jan-2019
+* Add Ruby 2.7 snapshot support.
+* Now includes binaries for Ruby 2.7 both 32 and 64 bit versions.
+* Use RubyInstaller 2.6.0-1 for Ruby 2.6 binaries.
+
+== 1.7.1 - 4-Jan-2018
+* Add Ruby 2.6 snapshot support.
+* Now includes binaries for Ruby 2.6 both 32 and 64 bit versions.
+* Use RubyInstaller 2.5.0-1 for Ruby 2.5 binaries.
+
+== 1.7.0 - 28-Nov-2017
+* Add gcc option to fix crash on RubyInstaller2 x86
+
+== 1.7.0.pre1 - 16-July-2017
+* Add Ruby 2.5 snapshot support.
+* Now includes binaries for Ruby 2.5 for both 32 and 64 bit versions.
+
 == 1.6.1.2 - 2-Feb-2017
 * Fix wrong gem packaging.
 

data/Dockerfile

@@ -0,0 +1,99 @@
+FROM mcr.microsoft.com/windows/servercore:1903
+LABEL maintainer "Hiroshi Hatake <cosmo0920.wp@gmail.com>"
+LABEL Description="win32-api building docker image"
+
+# Do not split this into multiple RUN!
+# Docker creates a layer for every RUN-Statement
+RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
+
+# Ruby 2.0.0
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.0.0-p648.exe https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p648.exe
+RUN cmd /c "C:\rubyinstaller-2.0.0-p648.exe" /silent /dir=c:\ruby200
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.0.0-p648-x64.exe https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p648-x64.exe
+RUN cmd /c "C:\rubyinstaller-2.0.0-p648-x64.exe" /silent /dir=c:\ruby200-x64
+# Ruby 2.1
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.1.9.exe https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.1.9.exe
+RUN cmd /c "C:\rubyinstaller-2.1.9.exe" /silent /dir=c:\ruby21
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.1.9-x64.exe https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.1.9-x64.exe
+RUN cmd /c "C:\rubyinstaller-2.1.9-x64.exe" /silent /dir=c:\ruby21-x64
+# Ruby 2.2
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.2.6.exe https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.2.6.exe
+RUN cmd /c "C:\rubyinstaller-2.2.6.exe" /silent /dir=c:\ruby22
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.2.6-x64.exe https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.2.6-x64.exe
+RUN cmd /c "C:\rubyinstaller-2.2.6-x64.exe" /silent /dir=c:\ruby22-x64
+# Ruby 2.3
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.3.3.exe https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.3.exe
+RUN cmd /c "C:\rubyinstaller-2.3.3.exe" /silent /dir=c:\ruby23
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.3.3-x64.exe https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.3-x64.exe
+RUN cmd /c "C:\rubyinstaller-2.3.3-x64.exe" /silent /dir=c:\ruby23-x64
+# Ruby 2.4
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.4.9-1-x86.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.9-1/rubyinstaller-2.4.9-1-x86.exe
+RUN cmd /c "C:\rubyinstaller-2.4.9-1-x86.exe" /silent /dir=c:\ruby24
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.4.9-1-x64.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.9-1/rubyinstaller-2.4.9-1-x64.exe
+RUN cmd /c "C:\rubyinstaller-2.4.9-1-x64.exe" /silent /dir=c:\ruby24-x64
+# Ruby 2.5
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.5.7-1-x86.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-2.5.7-1-x86.exe
+RUN cmd /c "C:\rubyinstaller-2.5.7-1-x86.exe" /silent /dir=c:\ruby25
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.5.7-1-x64.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-2.5.7-1-x64.exe
+RUN cmd /c "C:\rubyinstaller-2.5.7-1-x64.exe" /silent /dir=c:\ruby25-x64
+# Ruby 2.6
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.6.5-1-x86.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x86.exe
+RUN cmd /c "C:\rubyinstaller-2.6.5-1-x86.exe" /silent /dir=c:\ruby26
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.6.5-1-x64.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x64.exe
+RUN cmd /c "C:\rubyinstaller-2.6.5-1-x64.exe" /silent /dir=c:\ruby26-x64
+
+# Ruby 2.7
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.7.0-1-x86.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x86.exe
+RUN cmd /c "C:\rubyinstaller-2.7.0-1-x86.exe" /silent /dir=c:\ruby27
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-2.7.0-1-x64.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.exe
+RUN cmd /c "C:\rubyinstaller-2.7.0-1-x64.exe" /silent /dir=c:\ruby27-x64
+
+# DevKit
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\DevKit-mingw64-32-4.7.2-20130224-1151-sfx.exe https://dl.bintray.com/oneclick/rubyinstaller/DevKit-mingw64-32-4.7.2-20130224-1151-sfx.exe
+RUN cmd /c C:\DevKit-mingw64-32-4.7.2-20130224-1151-sfx.exe -o"c:\DevKit" -y
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe https://dl.bintray.com/oneclick/rubyinstaller/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe
+RUN cmd /c C:\DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe -o"c:\DevKit64" -y
+
+RUN choco install -y git \
+    && choco install -y msys2 --params "'/NoPath /NoUpdate /InstallDir:C:\msys64'"
+RUN refreshenv \
+    && C:\ruby27\bin\ridk install 2 3 \
+    && C:\ruby27-x64\bin\ridk install 2 3
+
+ENTRYPOINT ["cmd"]

data/Dockerfile.trunk

@@ -0,0 +1,17 @@
+FROM cosmo0920/win32-api:latest
+LABEL maintainer "Hiroshi Hatake <cosmo0920.wp@gmail.com>"
+LABEL Description="win32-api building docker image"
+
+# Ruby 2.8
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-head-x86-20200106.exe https://ci.appveyor.com/api/buildjobs/n7m98ejuhuu2rn4g/artifacts/packages%2Fri%2Frecipes%2Finstaller-inno%2Frubyinstaller-head-x64.exe
+RUN cmd /c "C:\rubyinstaller-head-x86-20200106.exe" /silent /dir=c:\ruby28
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-head-x64-20200106.exe https://ci.appveyor.com/api/buildjobs/n7m98ejuhuu2rn4g/artifacts/packages%2Fri%2Frecipes%2Finstaller-inno%2Frubyinstaller-head-x64.exe
+RUN cmd /c "C:\rubyinstaller-head-x64-20200106.exe" /silent /dir=c:\ruby28-x64
+
+RUN mkdir C:\pkg
+COPY build-gem.bat C:\\build-gem.bat
+ENTRYPOINT ["cmd"]

data/MANIFEST

@@ -1,6 +1,6 @@
 * CHANGES
 * MANIFEST
-* README
+* README.md
 * Rakefile
 * win32-api.gemspec
 * ext/extconf.rb

data/{README → README.md}

@@ -1,8 +1,10 @@
-= Description
+# Description
   This is a drop-in replacement for the Win32API library currently part of
   Ruby's standard library.
 
-= Synopsis
+# Synopsis
+
+```ruby
   require 'win32/api'
   include Win32
 
@@ -35,8 +37,9 @@
   addr = GetProcAddress.call(hlib, 'MessageBeep')
   func = Win32::API::Function.new(addr, 'L', 'L')
   func.call(0)
+```
 
-= Differences between win32-api and Win32API
+# Differences between win32-api and Win32API
   * This library has callback support
   * This library supports raw function pointers.
   * This library supports a separate string type for const char* (S).
@@ -48,9 +51,9 @@
   * Removed the support for lower case prototype and return types. Always
     use capital letters.
 
-= Developer's Notes
-  [NOTE: Some of the information below is now out of date, but explains my
-  motivation at the time the project was originally created.]
+# Developer's Notes
+  NOTE: **Some of the information below is now out of date, but explains my
+  motivation at the time the project was originally created.**
 
   The current Win32API library that ships with the standard library has been
   slated for removal from Ruby 2.0 and it will not receive any updates in the
@@ -76,7 +79,7 @@
   Most importantly, we can now add, modify and fix any features that we feel
   best benefit our end users.
 
-= Multiple Binaries
+# Multiple Binaries
   As of win32-api 1.4.8 a binary gem is shipped that contains binaries for
   both Ruby 1.8, Ruby 1.9, and 2.x. For Ruby 2.x, both 32 and 64 bit binaries
   are included as of release 1.5.0.
@@ -84,29 +87,29 @@
   The file under lib/win32 dynamically requires the correct binary based on
   your version of Ruby.
 
-= Documentation
+# Documentation
   The source file contains inline RDoc documentation. If you installed
   this file as a gem, then you have the docs. Run "gem server" and point
   your browser at http://localhost:8808 to see them.
 
-= Warranty
+# Warranty
   This package is provided "as is" and without any express or
   implied warranties, including, without limitation, the implied
   warranties of merchantability and fitness for a particular purpose.
 
-= Known Issues
+# Known Issues
   Possible callback issues when dealing with multi-threaded applications.
 
   Please submit any bug reports to the project page at
-  https://github.com/djberg96/win32-api
+  https://github.com/cosmo0920/win32-api
 
-== Contributions
+## Contributions
   Although this library is free, please consider having your company
   setup a gittip if used by your company professionally.
 
   http://www.gittip.com/djberg96/
 
-= Future Plans
+# Future Plans
   I really don't have future plans for this library since you should use FFI
   as your preferred C interface going forward. All of my own projects have
   since been converted to either use FFI or an analogous OLE interface.
@@ -115,15 +118,17 @@
   there who are still using it, but I strongly encourage you to convert
   your projects to FFI when possible.
 
-= Copyright
+# Copyright
   (C) 2003-2015 Daniel J. Berger
-  (C) 2016 Hiroshi Hatake
+
+  (C) 2016-2020 Hiroshi Hatake
+
   All Rights Reserved
 
-= License
+# License
   Artistic 2.0
 
-= Authors
+# Authors
   Daniel J. Berger
   Park Heesob
   Hiroshi Hatake

data/RELEASE.md

@@ -0,0 +1,32 @@
+## Prerequisites
+
+* Docker for Windows
+
+### Release step
+
+Check the latest ruby-head-YYYYmmDD image:
+https://hub.docker.com/r/cosmo0920/win32-api/tags?page=1&name=ruby-head
+
+```powershell
+PS> mkdir pkg
+PS> docker run -it -v $PWD\pkg:C:\pkg cosmo0920/win32-api:ruby-head-AWESOMEDATE
+```
+
+Build universal gem:
+
+```cmd
+> .\build-gem.bat
+```
+
+Copy built universal gem into mounted directory:
+
+```cmd
+> copy C:\win32-api\win32-api-*.gem C:\pkg
+```
+
+Then, exit and push built gem:
+
+```cmd
+> exit
+> gem push win32-api-*.gem
+```

data/Rakefile

@@ -59,54 +59,73 @@ namespace 'gem' do
   end
 
   desc 'Build a binary gem'
-  task :binary, :ruby2_32, :ruby2_64, :ruby21, :ruby21_64, :ruby22, :ruby22_64, :ruby23_32, :ruby23_64, :ruby24_32, :ruby24_64 do |task, args|
+  task :binary, :ruby2_32, :ruby2_64, :ruby21, :ruby21_64, :ruby22, :ruby22_64, :ruby23_32, :ruby23_64, :ruby24_32, :ruby24_64, :ruby25_32, :ruby25_64, :ruby_26_32, :ruby26_64, :ruby27_32, :ruby27_64, :ruby28_32, :ruby28_64 do |task, args|
     # These are just what's on my system at the moment. Adjust as needed.
+    # ri refers to RubyInstaller, ruby 2.3 and prev were built with RubyInstaller (:ri),
+    # 2.4 and later with RubyInstaller2 (:ri2)
+    # pre variable allows local builds with ruby & DevKit not at drive root
+
+    dk_path = {}
+    if ENV['APPVEYOR'] =~ /true/i
+      pre = "C:"
+      dk_path[:ri]    = "C:/ruby23/DevKit/bin;C:/ruby23/DevKit/mingw/bin"
+      dk_path[:ri_64] = "C:/ruby23-x64/DevKit/bin;C:/ruby23-x64/DevKit/mingw/bin"
+    else
+      ENV['BASEPATH'] = ENV['PATH'].gsub(/\\/, '/')
+      pre = "C:"
+      dk_path[:ri]    = "#{pre}/Devkit/bin;#{pre}/Devkit/mingw/bin"
+      dk_path[:ri_64] = "#{pre}/Devkit64/bin;#{pre}/Devkit64/mingw/bin"
+    end
+    # at present, Appveyor & local DevKit paths match for ri2
+    dk_path[:ri2]    = "C:/msys64/usr/bin;C:/msys64/mingw32/bin"
+    dk_path[:ri2_64] = "C:/msys64/usr/bin;C:/msys64/mingw64/bin"
+
     args.with_defaults(
       {
-        :ruby2_32  => {:path => "c:/ruby200/bin/ruby",     :msys => :msys1},
-        :ruby2_64  => {:path => "c:/ruby200-x64/bin/ruby", :msys => :msys1},
-        :ruby21_32 => {:path => "c:/ruby21/bin/ruby",      :msys => :msys1},
-        :ruby21_64 => {:path => "c:/ruby21-x64/bin/ruby",  :msys => :msys1},
-        :ruby22_32 => {:path => "c:/ruby22/bin/ruby",      :msys => :msys1},
-        :ruby22_64 => {:path => "c:/ruby22-x64/bin/ruby",  :msys => :msys1},
-        :ruby23_32 => {:path => "c:/ruby23/bin/ruby",      :msys => :msys1},
-        :ruby23_64 => {:path => "c:/ruby23-x64/bin/ruby",  :msys => :msys1},
-        :ruby24_32 => {:path => "c:/ruby24/bin/ruby",      :msys => :msys2},
-        :ruby24_64 => {:path => "c:/ruby24-x64/bin/ruby",  :msys => :msys2}
+        :ruby2_32  => {:path => "#{pre}/ruby200/bin",     :ri => :ri,     :omit => false},
+        :ruby2_64  => {:path => "#{pre}/ruby200-x64/bin", :ri => :ri_64,  :omit => false},
+        :ruby21_32 => {:path => "#{pre}/ruby21/bin",      :ri => :ri,     :omit => false},
+        :ruby21_64 => {:path => "#{pre}/ruby21-x64/bin",  :ri => :ri_64,  :omit => false},
+        :ruby22_32 => {:path => "#{pre}/ruby22/bin",      :ri => :ri,     :omit => false},
+        :ruby22_64 => {:path => "#{pre}/ruby22-x64/bin",  :ri => :ri_64,  :omit => false},
+        :ruby23_32 => {:path => "#{pre}/ruby23/bin",      :ri => :ri,     :omit => false},
+        :ruby23_64 => {:path => "#{pre}/ruby23-x64/bin",  :ri => :ri_64,  :omit => false},
+        :ruby24_32 => {:path => "#{pre}/ruby24/bin",      :ri => :ri2,    :omit => false},
+        :ruby24_64 => {:path => "#{pre}/ruby24-x64/bin",  :ri => :ri2_64, :omit => false},
+        :ruby25_32 => {:path => "#{pre}/ruby25/bin",      :ri => :ri2,    :omit => false},
+        :ruby25_64 => {:path => "#{pre}/ruby25-x64/bin",  :ri => :ri2_64, :omit => false},
+        :ruby26_32 => {:path => "#{pre}/ruby26/bin",      :ri => :ri2,    :omit => false},
+        :ruby26_64 => {:path => "#{pre}/ruby26-x64/bin",  :ri => :ri2_64, :omit => false},
+        :ruby27_32 => {:path => "#{pre}/ruby27/bin",      :ri => :ri2,    :omit => true},
+        :ruby27_64 => {:path => "#{pre}/ruby27-x64/bin",  :ri => :ri2_64, :omit => true},
+        :ruby28_32 => {:path => "#{pre}/ruby28/bin",      :ri => :ri2,    :omit => true},
+        :ruby28_64 => {:path => "#{pre}/ruby28-x64/bin",  :ri => :ri2_64, :omit => true},
       }
     )
 
     Rake::Task[:clobber].invoke
 
-    args.each{ |key|
-      default_path = ENV['PATH']
-
-      if key.last[:msys] == :msys1
-        # Adjust devkit paths as needed.
-        if `"#{key.last[:path]}" -v` =~ /x64/i
-          ENV['PATH'] = "C:/Devkit64/bin;C:/Devkit64/mingw/bin;" + ENV['PATH']
-        else
-          ENV['PATH'] = "C:/Devkit/bin;C:/Devkit/mingw/bin;" + ENV['PATH']
-        end
-      elsif key.last[:msys] == :msys2
-        ENV.delete('RI_DEVKIT')
-        # Adjust devkit paths as needed.
-        if `"#{key.last[:path]}" -v` =~ /x64/i
-          ENV['PATH'] = "C:/msys64/usr/bin;C:/msys64/mingw64/bin;" + ENV['PATH']
-        else
-          ENV['PATH'] = "C:/msys64/usr/bin;C:/msys64/mingw32/bin;" + ENV['PATH']
-        end
+    default_path = ENV['PATH']
+
+    args.each { |key|
+      # These lines are used for trunk build.
+      if key.last[:omit] && !File.exist?("#{key.last[:path]}/ruby.exe")
+        puts "#{key.last[:path]}/ruby does not exist! Skip."
+        next
       end
+
+      bld_path = "#{key.last[:path]};#{dk_path[key.last[:ri]]};#{ENV['BASEPATH']}"
       mkdir_p "lib/win32/#{key.first}/win32"
 
       Dir.chdir('ext') do
+        ENV['PATH'] = bld_path
         sh "make distclean" rescue nil
-        sh "#{key.last[:path]} extconf.rb"
+        sh "ruby extconf.rb"
         sh "make"
+        sh "strip --strip-unneeded -p api.so"
+        ENV['PATH'] = default_path
         cp 'api.so', "../lib/win32/#{key.first}/win32/api.so"
       end
-
-      ENV['PATH'] = default_path
     }
 
 text = <<HERE
@@ -154,6 +173,38 @@ begin
       end
     end
 
+    if RbConfig::CONFIG['MINOR'] == '5'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby25_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby25_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '6'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby26_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby26_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '7'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby27_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby27_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '8'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby28_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby28_32/win32/api')
+      end
+    end
+
   end
 rescue LoadError
   require File.join(File.dirname(__FILE__), '../../ext/api')

data/appveyor.yml

@@ -1,65 +1,46 @@
 version: '{build}'
 
+init:
+  # use a minimal path
+  - set PATH=C:\ruby%ruby_version%\bin;C:\Program Files\7-Zip;C:\Program Files\AppVeyor\BuildAgent;C:\Program Files\Git\cmd;C:\Windows\system32
+  # Load ruby trunk build
+  - if %ruby_version%==_trunk (
+      appveyor DownloadFile https://ci.appveyor.com/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z -FileName C:\ruby_trunk.7z &
+      7z x C:\ruby_trunk.7z -oC:\ruby_trunk
+    )
+
 platform: x64
 
 install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - "%devkit64%\\devkitvars.bat"
-  - "%devkit32%\\devkitvars.bat"
-  - ps: Start-FileDownload https://github.com/larskanis/rubyinstaller2/releases/download/2.4.0-7/rubyinstaller-2.4.0-7-x86.exe
-  - rubyinstaller-2.4.0-7-x86.exe TYPE=full /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /CLOSEAPPLICATIONS /NORESTARTAPPLICATIONS /DIR="C:\Ruby24"
-  - ps: Start-FileDownload https://github.com/larskanis/rubyinstaller2/releases/download/2.4.0-7/rubyinstaller-2.4.0-7-x64.exe
-  - rubyinstaller-2.4.0-7-x64.exe TYPE=full /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /CLOSEAPPLICATIONS /NORESTARTAPPLICATIONS /DIR="C:\Ruby24-x64"
   - ruby --version
   - gem --version
-  - IF %msys2%==1 ridk.cmd enable
-  - IF %msys2%==1 gem install bundler
+  # Assume we can use the version of bundler that Appveyor has packaged with each ruby version
   - bundle install
+
 build: off
+
 test_script:
-  - bundle exec rake gem:binary
-  - IF %msys2%==0 bundle exec rake test:all
-  - IF %msys2%==1 ridk.cmd exec bundle exec rake test:all
+  - rake gem:binary
+  - rake -rdevkit test:all
 
 environment:
   matrix:
-    - ruby_version: "24-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 1
-    - ruby_version: "24"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 1
-    - ruby_version: "23-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "23"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "22-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "22"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "21-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "21"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "200-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "200"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
+    - ruby_version: _trunk
+    - ruby_version: 26-x64
+    - ruby_version: 26
+    - ruby_version: 25-x64
+    - ruby_version: 25
+    - ruby_version: 24-x64
+    - ruby_version: 24
+    - ruby_version: 23-x64
+    - ruby_version: 23
+    - ruby_version: 22-x64
+    - ruby_version: 22
+    - ruby_version: 21-x64
+    - ruby_version: 21
+    - ruby_version: 200-x64
+    - ruby_version: 200
+
+matrix:
+  allow_failures:
+    - ruby_version: _trunk

data/build-gem.bat

@@ -0,0 +1,3 @@
+git clone https://github.com/cosmo0920/win32-api win32-api
+cd win32-api
+rake -rdevkit gem:binary

data/ext/win32/api.c

@@ -37,7 +37,7 @@
 
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.6.1.2"
+#define WINDOWS_API_VERSION "1.9.1"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -288,8 +288,10 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
    if(NIL_P(v_return))
       v_return = rb_str_new2("L");
 
+#if defined TAINTING_SUPPORT
    SafeStringValue(v_dll);
    SafeStringValue(v_proc);
+#endif
 
    hLibrary = LoadLibrary(TEXT(RSTRING_PTR(v_dll)));
 
@@ -356,7 +358,9 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
    // Push the numeric prototypes onto our int array for later use.
 
    for(i = 0; i < RARRAY_LEN(v_proto); i++){
+#if defined TAINTING_SUPPORT
       SafeStringValue(RARRAY_PTR(v_proto)[i]);
+#endif
       switch(*(TCHAR*)StringValuePtr(RARRAY_PTR(v_proto)[i])){
          case 'L':
             ptr->prototype[i] = _T_LONG;
@@ -391,7 +395,9 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
       ptr->return_type = _T_VOID;
    }
    else{
+#if defined TAINTING_SUPPORT
       SafeStringValue(v_return);
+#endif
       switch(*RSTRING_PTR(v_return)){
          case 'L':
             ptr->return_type = _T_LONG;
@@ -482,7 +488,9 @@ static VALUE func_init(int argc, VALUE* argv, VALUE self){
    // Push the numeric prototypes onto our int array for later use.
 
    for(i = 0; i < RARRAY_LEN(v_proto); i++){
+#if defined TAINTING_SUPPORT
       SafeStringValue(RARRAY_PTR(v_proto)[i]);
+#endif
       switch(*(char*)StringValuePtr(RARRAY_PTR(v_proto)[i])){
          case 'L':
             ptr->prototype[i] = _T_LONG;
@@ -517,7 +525,9 @@ static VALUE func_init(int argc, VALUE* argv, VALUE self){
       ptr->return_type = _T_VOID;
    }
    else{
+#if defined TAINTING_SUPPORT
       SafeStringValue(v_return);
+#endif
       switch(*RSTRING_PTR(v_return)){
          case 'L':
             ptr->return_type = _T_LONG;

data/lib/win32/api.rb

@@ -42,6 +42,38 @@ begin
       end
     end
 
+    if RbConfig::CONFIG['MINOR'] == '5'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby25_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby25_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '6'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby26_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby26_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '7'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby27_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby27_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '8'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby28_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby28_32/win32/api')
+      end
+    end
+
   end
 rescue LoadError
   require File.join(File.dirname(__FILE__), '../../ext/api')

data/test/test_win32_api.rb

@@ -18,7 +18,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.6.1.2', API::VERSION)
+      assert_equal('1.9.1', API::VERSION)
    end
 
    def test_constructor_basic

data/win32-api.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-api'
-  spec.version    = '1.6.1.2'
+  spec.version    = '1.9.1'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob', 'Hiroshi Hatake']
   spec.license    = 'Artistic-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
 
   spec.required_ruby_version = '>= 1.8.2'
-  spec.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST', 'ext/win32/api.c']
+  spec.extra_rdoc_files = ['CHANGES', 'MANIFEST', 'ext/win32/api.c']
 
   spec.add_development_dependency('test-unit', '>= 2.5.0')
   spec.add_development_dependency('rake')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-api
 version: !ruby/object:Gem::Version
-  version: 1.6.1.2
+  version: 1.9.1
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -49,18 +49,20 @@ email: djberg96@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README
 - CHANGES
 - MANIFEST
 - ext/win32/api.c
 files:
 - CHANGES
+- Dockerfile
+- Dockerfile.trunk
 - Gemfile
-- Gemfile.lock
 - MANIFEST
-- README
+- README.md
+- RELEASE.md
 - Rakefile
 - appveyor.yml
+- build-gem.bat
 - ext/win32/api.c
 - lib/win32/api.rb
 - lib/win32/ruby21_32/win32/api.so
@@ -71,6 +73,13 @@ files:
 - lib/win32/ruby23_64/win32/api.so
 - lib/win32/ruby24_32/win32/api.so
 - lib/win32/ruby24_64/win32/api.so
+- lib/win32/ruby25_32/win32/api.so
+- lib/win32/ruby25_64/win32/api.so
+- lib/win32/ruby26_32/win32/api.so
+- lib/win32/ruby26_64/win32/api.so
+- lib/win32/ruby27_32/win32/api.so
+- lib/win32/ruby27_64/win32/api.so
+- lib/win32/ruby28_64/win32/api.so
 - lib/win32/ruby2_32/win32/api.so
 - lib/win32/ruby2_64/win32/api.so
 - test/test_win32_api.rb
@@ -96,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A superior replacement for Win32API

data/Gemfile.lock

@@ -1,24 +0,0 @@
-PATH
-  remote: .
-  specs:
-    win32-api (1.6.1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    power_assert (0.4.1)
-    rake (12.0.0)
-    test-unit (3.2.3)
-      power_assert
-
-PLATFORMS
-  x64-mingw32
-  x86-mingw32
-
-DEPENDENCIES
-  rake
-  test-unit (>= 2.5.0)
-  win32-api!
-
-BUNDLED WITH
-   1.14.2