win32-file-security 1.0.1 → 1.0.2

data/CHANGES

@@ -1,3 +1,7 @@
+= 1.0.2 - 8-Apr-2013
+* Fixed HANDLE prototype in underlying FFI code. This affects 64 bit
+  versions of Ruby.
+
 = 1.0.1 - 1-Jan-2013
 * Added a working implementation of File.owned?
 * Added a working implementation of File.chown.

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

@@ -19,39 +19,40 @@ module Windows
       typedef :buffer_in, :buf_in
       typedef :buffer_out, :buf_out
       typedef :string, :str
-
+      typedef :ulong, :dword
+      typedef :uintptr_t, :handle
 
       ffi_lib :advapi32
 
-      attach_pfunc :AddAce, [:ptr, :ulong, :ulong, :ptr, :ulong], :bool
-      attach_pfunc :AdjustTokenPrivileges, [:ulong, :bool, :ptr, :ulong, :ptr, :ptr], :bool
-      attach_pfunc :CopySid, [:ulong, :ptr, :ptr], :bool
+      attach_pfunc :AddAce, [:ptr, :dword, :dword, :ptr, :dword], :bool
+      attach_pfunc :AdjustTokenPrivileges, [:handle, :bool, :ptr, :dword, :ptr, :ptr], :bool
+      attach_pfunc :CopySid, [:dword, :ptr, :ptr], :bool
       attach_pfunc :EncryptFileW, [:buf_in], :bool
-      attach_pfunc :DecryptFileW, [:buf_in, :ulong], :bool
+      attach_pfunc :DecryptFileW, [:buf_in, :dword], :bool
       attach_pfunc :FileEncryptionStatusW, [:buf_in, :ptr], :bool
-      attach_pfunc :GetAce, [:ptr, :ulong, :ptr], :bool
-      attach_pfunc :GetFileSecurityW, [:buf_in, :ulong, :ptr, :ulong, :ptr], :bool
-      attach_pfunc :GetLengthSid, [:ptr], :ulong
+      attach_pfunc :GetAce, [:ptr, :dword, :ptr], :bool
+      attach_pfunc :GetFileSecurityW, [:buf_in, :dword, :ptr, :dword, :ptr], :bool
+      attach_pfunc :GetLengthSid, [:ptr], :dword
       attach_pfunc :GetSecurityDescriptorControl, [:ptr, :ptr, :ptr], :bool
       attach_pfunc :GetSecurityDescriptorOwner, [:ptr, :ptr, :ptr], :bool
-      attach_pfunc :GetSecurityDescriptorDacl, [:ptr, :ptr, :ptr, :ptr], :ulong
-      attach_pfunc :GetSecurityInfo, [:ulong, :ulong, :ulong, :ptr, :ptr, :ptr, :ptr, :ptr], :ulong
-      attach_pfunc :GetTokenInformation, [:ulong, :int, :ptr, :ulong, :ptr], :bool
-      attach_pfunc :InitializeAcl, [:ptr, :ulong, :ulong], :bool
-      attach_pfunc :InitializeSecurityDescriptor, [:ptr, :ulong], :bool
+      attach_pfunc :GetSecurityDescriptorDacl, [:ptr, :ptr, :ptr, :ptr], :bool
+      attach_pfunc :GetSecurityInfo, [:handle, :dword, :dword, :ptr, :ptr, :ptr, :ptr, :ptr], :dword
+      attach_pfunc :GetTokenInformation, [:handle, :int, :ptr, :dword, :ptr], :bool
+      attach_pfunc :InitializeAcl, [:ptr, :dword, :dword], :bool
+      attach_pfunc :InitializeSecurityDescriptor, [:ptr, :dword], :bool
       attach_pfunc :LookupAccountNameW, [:buf_in, :buf_in, :ptr, :ptr, :ptr, :ptr, :ptr], :bool
       attach_pfunc :LookupAccountSidW, [:buf_in, :ptr, :ptr, :ptr, :ptr, :ptr, :ptr], :bool
       attach_pfunc :LookupPrivilegeValueA, [:str, :str, :ptr], :bool
-      attach_pfunc :OpenProcessToken, [:ulong, :ulong, :ptr], :bool
-      attach_pfunc :SetFileSecurityW, [:buf_in, :ulong, :ptr], :bool
+      attach_pfunc :OpenProcessToken, [:handle, :dword, :ptr], :bool
+      attach_pfunc :SetFileSecurityW, [:buf_in, :dword, :ptr], :bool
       attach_pfunc :SetSecurityDescriptorDacl, [:ptr, :bool, :ptr, :bool], :bool
       attach_pfunc :SetSecurityDescriptorOwner, [:ptr, :ptr, :bool], :bool
 
       ffi_lib :kernel32
 
-      attach_pfunc :CloseHandle, [:ulong], :bool
-      attach_pfunc :GetCurrentProcess, [], :ulong
-      attach_pfunc :GetVolumeInformationW, [:buf_in, :buf_out, :ulong, :ptr, :ptr, :ptr, :buf_out, :ulong], :bool
+      attach_pfunc :CloseHandle, [:handle], :bool
+      attach_pfunc :GetCurrentProcess, [], :handle
+      attach_pfunc :GetVolumeInformationW, [:buf_in, :buf_out, :dword, :ptr, :ptr, :ptr, :buf_out, :dword], :bool
 
       ffi_lib :shlwapi
 

data/lib/win32/file/security.rb

@@ -12,7 +12,7 @@ class File
   extend Windows::File::Functions
 
   # The version of the win32-file library
-  WIN32_FILE_SECURITY_VERSION = '1.0.1'
+  WIN32_FILE_SECURITY_VERSION = '1.0.2'
 
   class << self
     remove_method(:owned?)
@@ -25,7 +25,7 @@ class File
     # * encrypted
     # * readonly
     # * root directory (i.e. not encryptable)
-    # * system fiel (i.e. not encryptable)
+    # * system file (i.e. not encryptable)
     # * unsupported
     # * unknown
     #
@@ -211,14 +211,14 @@ class File
       dacl_present_ptr   = FFI::MemoryPointer.new(:bool)
       dacl_defaulted_ptr = FFI::MemoryPointer.new(:ulong)
 
-      val = GetSecurityDescriptorDacl(
+      bool = GetSecurityDescriptorDacl(
         security_ptr,
         dacl_present_ptr,
         dacl_pptr,
         dacl_defaulted_ptr
       )
 
-      if val == 0
+      unless bool
         raise SystemCallError.new("GetSecurityDescriptorDacl", FFI.errno)
       end
 

data/test/test_win32_file_security_version.rb

@@ -8,6 +8,6 @@ require 'win32/file/security'
 
 class TC_Win32_File_Security_Version < Test::Unit::TestCase
   test "version is set to expected value" do
-    assert_equal('1.0.1', File::WIN32_FILE_SECURITY_VERSION)
+    assert_equal('1.0.2', File::WIN32_FILE_SECURITY_VERSION)
   end
 end

data/win32-file-security.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-file-security'
-  spec.version    = '1.0.1'
+  spec.version    = '1.0.2'
   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-security
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi