win32-api 1.8.0-universal-mingw32 → 1.10.1-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1844be8d73042b3333620e06402d8d8088c3ecc1
-  data.tar.gz: 4540047f0737f859e4bfb85d37998c3d4655d198
+SHA256:
+  metadata.gz: 2a14aa43aa912bee6af9ecd389e4d12e67222aa00e1dcddb665ed053a2067e0e
+  data.tar.gz: 3587ad3d822b763234037c0cd056bcf235c99909e2e06844e466688444d92cad
 SHA512:
-  metadata.gz: 65e5f5a77e9502037a4c4f9591694c1cdbab722bf8aefce69ae397b8e962a993e6347692d4aebebe28b647114c63e47136eba1918f4773e4ed3b8c72a5f89e65
-  data.tar.gz: 5ded9bd1b9eba64b8cb5008edfcaf6b9ac69ad02a9d4c0cd0c560387aa3d1b8f4703a810d58f5b8be03028fea0746703831f352b9a699475516c1abda8c08840
+  metadata.gz: e7e11b1fa8a96665c1148d6cc63e4cad8fc6b44792bf9c3093ea34b7b9e8b9194c0ed1f730996288dc72ab59f1d035add13d8c9cd09874569e556c31b3de04af
+  data.tar.gz: 95cd7d5ed98532b6c45cdb3320e3d033ee7b7c746f4ebcbecd8f1f1226c17182e07ba49c546166a5abb28a4b6a80e6650266f302140a8c616e941c6e8a4c5755

data/CHANGES

@@ -1,3 +1,21 @@
+== 1.10.1 - 23-Apr-2021
+* Use ULONG2NUM() for API.last_error to avoid truncate
+
+== 1.10.0 - 19-Apr-2021
+* Add Ruby 3.1 snapshot support
+* Add API.last_error
+
+== 1.9.2 - 13-Sep-2020
+* Handle Ruby 3.0 snapshot (formerly known as Ruby 2.8).
+
+== 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.

data/Dockerfile

@@ -0,0 +1,113 @@
+FROM mcr.microsoft.com/windows/servercore:20H2
+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
+
+# Ruby 3.0
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-3.0.0-1-x86.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.0-1/rubyinstaller-3.0.0-1-x86.exe
+RUN cmd /c "C:\rubyinstaller-3.0.0-1-x86.exe" /silent /dir=c:\ruby30
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-3.0.0-1-x64.exe https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.0-1/rubyinstaller-3.0.0-1-x64.exe
+RUN cmd /c "C:\rubyinstaller-3.0.0-1-x64.exe" /silent /dir=c:\ruby30-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'"
+# pacman -Syu --noconfirm is needed for downloading ucrt64 repo.
+# They should be removed after using Ruby 2.5.9, 2.6.7, and 2.7.3 installers.
+RUN refreshenv \
+    && C:\ruby27\bin\ridk exec pacman -Syu --noconfirm \
+    && C:\ruby27\bin\ridk install 2 3 \
+    && C:\ruby27-x64\bin\ridk exec pacman -Syu --noconfirm \
+    && 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 3.1
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-head-x86-20210418.exe https://ci.appveyor.com/api/buildjobs/smfh4ojkobb4duif/artifacts/packages%2Fri%2Frecipes%2Finstaller-inno%2Frubyinstaller-head-x86.exe
+RUN cmd /c "C:\rubyinstaller-head-x86-20210418.exe" /silent /dir=c:\ruby31
+RUN powershell \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -OutFile C:\rubyinstaller-head-x64-20210418.exe https://ci.appveyor.com/api/buildjobs/hsgdg4xl5ny74k94/artifacts/packages%2Fri%2Frecipes%2Finstaller-inno%2Frubyinstaller-head-x64.exe
+RUN cmd /c "C:\rubyinstaller-head-x64-20210418.exe" /silent /dir=c:\ruby31-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/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,19 @@
   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-2018 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,41 @@
+## Prerequisites
+
+* Docker for Windows
+
+### Release step
+
+#### Fat GEM
+
+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
+```
+
+#### Non Fat GEM
+
+```cmd
+> rake gem:create
+> gem push win32-api-*.gem
+```

data/Rakefile

@@ -59,7 +59,7 @@ 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, :ruby25_32, :ruby25_64, :ruby_26_32, :ruby26_64, :ruby27_32, :ruby27_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, :ruby30_32, :ruby30_64, :ruby31_32, :ruby31_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)
@@ -94,10 +94,14 @@ namespace 'gem' do
         :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 => true},
-        :ruby26_64 => {:path => "#{pre}/ruby26-x64/bin",  :ri => :ri2_64, :omit => true},
+        :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},
+        :ruby30_32 => {:path => "#{pre}/ruby30/bin",      :ri => :ri2,    :omit => true},
+        :ruby30_64 => {:path => "#{pre}/ruby30-x64/bin",  :ri => :ri2_64, :omit => true},
+        :ruby31_32 => {:path => "#{pre}/ruby31/bin",      :ri => :ri2,    :omit => true},
+        :ruby31_64 => {:path => "#{pre}/ruby31-x64/bin",  :ri => :ri2_64, :omit => true},
       }
     )
 
@@ -194,6 +198,14 @@ begin
         require File.join(File.dirname(__FILE__), 'ruby27_32/win32/api')
       end
     end
+  when '3'
+    if RbConfig::CONFIG['MINOR'] == '0'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby30_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby30_32/win32/api')
+      end
+    end
 
   end
 rescue LoadError

data/appveyor.yml

@@ -1,5 +1,7 @@
 version: '{build}'
 
+image: Visual Studio 2019
+
 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
@@ -26,21 +28,19 @@ test_script:
 environment:
   matrix:
     - ruby_version: _trunk
+    - ruby_version: 30-x64
+    - ruby_version: 30
+    - ruby_version: 27-x64
+    - ruby_version: 27
+    - 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
-    - ruby_version: 25-x64
-    - ruby_version: 25

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

@@ -16,28 +16,34 @@
 #define RARRAY_LEN(a) (RARRAY(a)->len)
 #endif
 
-#if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
-# define NUM2SIZET(x) ((size_t)NUM2ULL(x))
-# define NUM2SSIZET(x) ((ssize_t)NUM2LL(x))
-#else
-# define NUM2SIZET(x) NUM2ULONG(x)
-# define NUM2SSIZET(x) NUM2LONG(x)
+/* Use Ruby defined macro definitions. */
+#if !defined(NUM2SIZET) && !defined(NUM2SSIZET)
+# if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
+#  define NUM2SIZET(x) ((size_t)NUM2ULL(x))
+#  define NUM2SSIZET(x) ((ssize_t)NUM2LL(x))
+# else
+#  define NUM2SIZET(x) NUM2ULONG(x)
+#  define NUM2SSIZET(x) NUM2LONG(x)
+# endif
 #endif
 
-#if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-# define SIZET2NUM(v) ULL2NUM(v)
-# define SSIZET2NUM(v) LL2NUM(v)
-#elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define SIZET2NUM(v) ULONG2NUM(v)
-# define SSIZET2NUM(v) LONG2NUM(v)
-#else
-# define SIZET2NUM(v) UINT2NUM(v)
-# define SSIZET2NUM(v) INT2NUM(v)
+/* Use Ruby defined macro definitions. */
+#if !defined(SIZET2NUM) && !defined(SSIZET2NUM)
+# if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
+#  define SIZET2NUM(v) ULL2NUM(v)
+#  define SSIZET2NUM(v) LL2NUM(v)
+# elif SIZEOF_SIZE_T == SIZEOF_LONG
+#  define SIZET2NUM(v) ULONG2NUM(v)
+#  define SSIZET2NUM(v) LONG2NUM(v)
+# else
+#  define SIZET2NUM(v) UINT2NUM(v)
+#  define SSIZET2NUM(v) INT2NUM(v)
+# endif
 #endif
 
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.8.0"
+#define WINDOWS_API_VERSION "1.10.1"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -56,6 +62,36 @@ typedef struct {
     int prototype[20];
 } Win32API;
 
+typedef struct ThreadData {
+   DWORD win32api_error;
+} ThreadData;
+
+static inline ThreadData* thread_data_get(void);
+static ID id_thread_data;
+
+static ThreadData* thread_data_init(void)
+{
+   ThreadData* td;
+   VALUE obj;
+
+   obj = Data_Make_Struct(rb_cObject, ThreadData, NULL, -1, td);
+   td->win32api_error = 0;
+   rb_thread_local_aset(rb_thread_current(), id_thread_data, obj);
+
+   return td;
+}
+
+static inline ThreadData* thread_data_get()
+{
+   VALUE obj = rb_thread_local_aref(rb_thread_current(), id_thread_data);
+
+   if(obj != Qnil && TYPE(obj) == T_DATA){
+      return (ThreadData*) DATA_PTR(obj);
+   }
+
+   return thread_data_init();
+}
+
 static void api_free(Win32API* ptr){
    if(ptr->library)
       FreeLibrary(ptr->library);
@@ -288,8 +324,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 +394,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 +431,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 +524,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 +561,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;
@@ -765,6 +811,7 @@ static VALUE api_call(int argc, VALUE* argv, VALUE self){
    uintptr_t return_value;
    int i = 0;
    int len;
+   ThreadData* thread_data = thread_data_get();
 
    struct{
       uintptr_t params[20];
@@ -959,6 +1006,8 @@ static VALUE api_call(int argc, VALUE* argv, VALUE self){
         }
    }
 
+   thread_data->win32api_error = GetLastError();
+
    /* Return the appropriate type based on the return type specified
     * in the constructor.
     */
@@ -1013,6 +1062,21 @@ static VALUE api_call(int argc, VALUE* argv, VALUE self){
    return v_return;
 }
 
+/*
+ * call-seq:
+ *    Win32::API.last_error
+ *
+ * Return the last Win32 error code of the current executing thread.
+ *
+ * The error code shouldn't be retrieved by calling GetLastError() manually
+ * because Ruby's internal code may call other Win32 API and reset the error
+ * code before it.
+ */
+static VALUE get_last_error(VALUE self)
+{
+   return ULONG2NUM(thread_data_get()->win32api_error);
+}
+
 /*
  * Wraps the Windows API functions in a Ruby interface.
  */
@@ -1045,6 +1109,9 @@ void Init_api(){
    /* Miscellaneous */
    rb_define_alloc_func(cAPI, api_allocate);
 
+   /* GetLastError alternative */
+   rb_define_singleton_method(cAPI, "last_error", get_last_error, 0);
+
    /* Win32::API Instance Methods */
    rb_define_method(cAPI, "initialize", api_init, -1);
    rb_define_method(cAPI, "call", api_call, -1);

data/lib/win32/api.rb

@@ -65,6 +65,14 @@ begin
         require File.join(File.dirname(__FILE__), 'ruby27_32/win32/api')
       end
     end
+  when '3'
+    if RbConfig::CONFIG['MINOR'] == '0'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby30_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby30_32/win32/api')
+      end
+    end
 
   end
 rescue LoadError

data/test/test_win32_api.rb

@@ -18,7 +18,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.8.0', API::VERSION)
+      assert_equal('1.10.1', API::VERSION)
    end
 
    def test_constructor_basic
@@ -43,6 +43,12 @@ class TC_Win32_API < Test::Unit::TestCase
       assert_equal(0xFFFFFFFF, @gfa.call('C:/foobarbazblah'))
    end
 
+   def test_last_error
+      @gfa.call('C:/foobarbazblah')
+      error_file_not_found = 2
+      assert_equal(error_file_not_found, API.last_error)
+   end
+
    def test_dll_name
       assert_respond_to(@gcd, :dll_name)
       assert_equal('kernel32', @gcd.dll_name)

data/win32-api.gemspec

@@ -2,18 +2,18 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-api'
-  spec.version    = '1.8.0'
+  spec.version    = '1.10.1'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob', 'Hiroshi Hatake']
   spec.license    = 'Artistic-2.0'
   spec.email      = 'djberg96@gmail.com'
-  spec.homepage   = 'http://github.com/djberg96/win32-api'
+  spec.homepage   = 'http://github.com/cosmo0920/win32-api'
   spec.summary    = 'A superior replacement for Win32API'
   spec.test_files = Dir['test/test*']
   spec.extensions = ['ext/extconf.rb']
   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,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: win32-api
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.10.1
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
 - Park Heesob
 - Hiroshi Hatake
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2021-04-23 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
@@ -79,15 +81,19 @@ files:
 - lib/win32/ruby27_64/win32/api.so
 - lib/win32/ruby2_32/win32/api.so
 - lib/win32/ruby2_64/win32/api.so
+- lib/win32/ruby30_32/win32/api.so
+- lib/win32/ruby30_64/win32/api.so
+- lib/win32/ruby31_32/win32/api.so
+- lib/win32/ruby31_64/win32/api.so
 - test/test_win32_api.rb
 - test/test_win32_api_callback.rb
 - test/test_win32_api_function.rb
 - win32-api.gemspec
-homepage: http://github.com/djberg96/win32-api
+homepage: http://github.com/cosmo0920/win32-api
 licenses:
 - Artistic-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,9 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: A superior replacement for Win32API
 test_files:

data/Gemfile.lock

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