win32-api 1.9.2-universal-mingw32 → 1.10.0-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbda787ddee639f0586e7661d07814ec87374373feb4b0e0be0db1123dcce9cd
-  data.tar.gz: 34c0c1da9f2d7d7ba24b53fdfbf6b07953769dc7e8d963e803debf0f39fa0d3c
+  metadata.gz: 0e094917b41770c3fc5a82f79b60638d3eb3dc7d5255e17e1aae7089a0070979
+  data.tar.gz: 2e548c70a32503b0b4f3353bde818a72a4ca75975d6a972d7a570cfc48a93348
 SHA512:
-  metadata.gz: 982edadad844e9bfbe6f3012f959ca2df820a16bce05d70594c1e45901e54d445afae627613455706a719bc99274efc91c08d4fe11e9649ac136ad299c053e68
-  data.tar.gz: 5f46486f077ddfda70c4ebebfd5fe2bc060b70fdc7d45a30357f2d4adf1d282eafef4b010967550ffa2dc9cf8dbe6ba23959253fde68302f9a7f5d343f7867aa
+  metadata.gz: 1fb21c7689902148c217af40a432791037c9492519f84d171ac3c70225258313af9a13aef7bb2c94b3c319488256dfa3092c123d742d401f46127b9d50168018
+  data.tar.gz: c3f81dfa40a40920cb44a9dda2e19164e8edb0c3ed41c18577b93186b8abd31cebd76b803c6a22ab82b8fe899cb2b403b8ccd1bbabb55c962552084ca816e70d

data/CHANGES

@@ -1,3 +1,7 @@
+== 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).
 

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:1903
+FROM mcr.microsoft.com/windows/servercore:20H2
 LABEL maintainer "Hiroshi Hatake <cosmo0920.wp@gmail.com>"
 LABEL Description="win32-api building docker image"
 
@@ -80,6 +80,16 @@ RUN powershell \
 	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; \
@@ -92,8 +102,12 @@ 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

@@ -2,15 +2,15 @@ FROM cosmo0920/win32-api:latest
 LABEL maintainer "Hiroshi Hatake <cosmo0920.wp@gmail.com>"
 LABEL Description="win32-api building docker image"
 
-# Ruby 3.0
+# Ruby 3.1
 RUN powershell \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-	Invoke-WebRequest -OutFile C:\rubyinstaller-head-x86-20200911.exe https://ci.appveyor.com/api/buildjobs/trvw8cisuqismasc/artifacts/packages%2Fri%2Frecipes%2Finstaller-inno%2Frubyinstaller-head-x86.exe
-RUN cmd /c "C:\rubyinstaller-head-x86-20200911.exe" /silent /dir=c:\ruby30
+	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-20200911.exe https://ci.appveyor.com/api/buildjobs/ufndgf49pysdvpt9/artifacts/packages%2Fri%2Frecipes%2Finstaller-inno%2Frubyinstaller-head-x64.exe
-RUN cmd /c "C:\rubyinstaller-head-x64-20200911.exe" /silent /dir=c:\ruby30-x64
+	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

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, :ruby30_32, :ruby30_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)
@@ -100,6 +100,8 @@ namespace 'gem' do
         :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},
       }
     )
 

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,6 +28,10 @@ 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
@@ -34,12 +40,6 @@ environment:
     - 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:

data/ext/win32/api.c

@@ -43,7 +43,7 @@
 
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.9.2"
+#define WINDOWS_API_VERSION "1.10.0"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -62,6 +62,35 @@ 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);
+   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);
@@ -781,6 +810,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];
@@ -975,6 +1005,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.
     */
@@ -1029,6 +1061,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 INT2NUM(thread_data_get()->win32api_error);
+}
+
 /*
  * Wraps the Windows API functions in a Ruby interface.
  */
@@ -1061,6 +1108,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/test/test_win32_api.rb

@@ -18,7 +18,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.9.2', API::VERSION)
+      assert_equal('1.10.0', 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,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-api'
-  spec.version    = '1.9.2'
+  spec.version    = '1.10.0'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob', 'Hiroshi Hatake']
   spec.license    = 'Artistic-2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-api
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -83,6 +83,8 @@ files:
 - 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
@@ -106,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: A superior replacement for Win32API