win32-file-stat 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570cfbe24ce0b82de003f94d55e00b53dff39c77
-  data.tar.gz: 36cebc20ffc58f5ac96b8daad1558cd48a121f3c
+  metadata.gz: 75bb3ff1b6a06d263f6c2889c0fb0b65ff58cd3d
+  data.tar.gz: 38edc506a14074f9b03ec850dc26d30416e0488c
 SHA512:
-  metadata.gz: 6d573af01f22041b8c4b89512865a74e25e93c87a9b3d4450af2e6143a5d405322e506bd26d4ebe12c40e0af64fc218ec481fdce4e87017ba6145727cbd4a813
-  data.tar.gz: 9208feadbeec27b4add065953b2bc35469bf41fa2bf417a606be7688acf71cd1b80bb4eeb76923e16aeab0ea114da2cc3dc73d2a9fea2af6fb9016860cd3ff72
+  metadata.gz: b77bde2136ca2582504014257f2be8bad69f3cd6709cfe94fc47821bbf387597be76e2bb9b3a7542830aabbb8583a9d6651b39879310a18023853201640ae0ea
+  data.tar.gz: 870e7223034d3c07928e78ecc259424a2cbf3f714273e3c38d816fde593c9e8f1821773eb48e8fac4c8fc488d9b0f7f890e37e75b93380b5ab3573e0ce7784a7

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.5.1 - 8-Dec-2014
+* Added code to work around 64-bit JRuby bug.
+* Some minor refactoring for the get_current_process_sid method.
+
 == 1.5.0 - 10-Nov-2014
 * Added the #streams method, which shows alt streams for the file.
 * Use require_relative where appropriate.

data/lib/win32/file/stat.rb

@@ -58,7 +58,7 @@ class File::Stat
   attr_reader :streams
 
   # The version of the win32-file-stat library
-  WIN32_FILE_STAT_VERSION = '1.5.0'
+  WIN32_FILE_STAT_VERSION = '1.5.1'
 
   # Creates and returns a File::Stat object, which encapsulate common status
   # information for File objects on MS Windows sytems. The information is
@@ -564,6 +564,15 @@ class File::Stat
 
   private
 
+  # Workaround for bug in 64-big JRuby. Hope to remove it some day.
+  def get_ptr_type
+    if RUBY_PLATFORM == 'java' && ENV_JAVA['sun.arch.data.model'] == '64'
+      :ulong_long
+    else
+      :uintptr_t
+    end
+  end
+
   # Allow stringy arguments
   def string_check(arg)
     return arg if arg.is_a?(String)
@@ -786,16 +795,16 @@ class File::Stat
   # Return the sid of the current process.
   #
   def get_current_process_sid(token_type)
-    token = FFI::MemoryPointer.new(:uintptr_t)
+    token = FFI::MemoryPointer.new(get_ptr_type)
     sid = nil
 
-    begin
-      # Get the current process sid
-      unless OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, token)
-        raise SystemCallError.new("OpenProcessToken", FFI.errno)
-      end
+    # Get the current process sid
+    unless OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, token)
+      raise SystemCallError.new("OpenProcessToken", FFI.errno)
+    end
 
-      token   = token.read_pointer.to_i
+    begin
+      token = token.read_pointer.to_i
       rlength = FFI::MemoryPointer.new(:pointer)
 
       if token_type == TokenUser
@@ -822,7 +831,7 @@ class File::Stat
 
       sid = ptr.read_pointer.read_string
     ensure
-      CloseHandle(token) if token
+      CloseHandle(token)
     end
 
     sid
@@ -851,14 +860,14 @@ class File::Stat
 
     # Second attempt, now with the needed size
     if GetFileSecurity(wfile, flags, security_ptr, size_needed, size_needed_ptr)
-      token = FFI::MemoryPointer.new(:uintptr_t)
+      token = FFI::MemoryPointer.new(get_ptr_type)
 
       pflags = TOKEN_IMPERSONATE | TOKEN_QUERY | TOKEN_DUPLICATE | STANDARD_RIGHTS_READ
 
       if OpenProcessToken(GetCurrentProcess(), pflags, token)
         begin
           token  = token.read_pointer.to_i
-          token2 = FFI::MemoryPointer.new(:uintptr_t)
+          token2 = FFI::MemoryPointer.new(get_ptr_type)
 
           if DuplicateToken(token, SecurityImpersonation, token2)
             begin

data/lib/win32/file/windows/functions.rb

@@ -12,12 +12,17 @@ module Windows
       end
 
       typedef :ulong, :dword
-      typedef :uintptr_t, :handle
       typedef :pointer, :ptr
       typedef :buffer_in, :buf_in
       typedef :string, :str
       typedef :long, :ntstatus
 
+      if RUBY_PLATFORM == 'java' && ENV_JAVA['sun.arch.data.model'] == '64'
+        typedef :ulong_long, :handle
+      else
+        typedef :uintptr_t, :handle
+      end
+
       ffi_convention :stdcall
 
       ffi_lib :kernel32

data/test/test_file_stat.rb

@@ -54,7 +54,7 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
   end
 
   test "version is set to expected value" do
-    assert_equal('1.5.0', File::Stat::WIN32_FILE_STAT_VERSION)
+    assert_equal('1.5.1', File::Stat::WIN32_FILE_STAT_VERSION)
   end
 
   test "constructor does not modify argument" do

data/win32-file-stat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name      = 'win32-file-stat'
-  spec.version   = '1.5.0'
+  spec.version   = '1.5.1'
   spec.authors   = ['Daniel J. Berger', 'Park Heesob']
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-file-stat
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: win32-security
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -102,12 +102,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []