win32-security 0.2.1 → 0.2.2

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.2.2 - 8-Apr-2013
+* Fixed HANDLE prototypes in the underlying FFI code. This affected
+  64 bit versions of Ruby.
+
 == 0.2.1 - 19-Feb-2013
 * Removed a trailing comma that was causing problems.
 

data/lib/win32/security.rb

@@ -20,7 +20,7 @@ module Win32
     extend Windows::Security::Functions
 
     # The version of the win32-security library
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
 
     # Used by OpenProcessToken
     TOKEN_QUERY = 8

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

@@ -13,6 +13,10 @@ module Windows
         end
       end
 
+      typedef :ulong, :dword
+      typedef :uintptr_t, :handle
+      typedef :pointer, :ptr
+
       ffi_lib :kernel32
 
       enum :token_info_class, [
@@ -59,39 +63,39 @@ module Windows
         :MaxTokenInfoClass
       ]
 
-      attach_pfunc :GetCurrentProcess, [], :ulong
-      attach_pfunc :GetCurrentThread, [], :ulong
-      attach_pfunc :GetVersionExA, [:pointer], :bool
-      attach_pfunc :GetLastError, [], :ulong
-      attach_pfunc :CloseHandle, [:ulong], :bool
+      attach_pfunc :GetCurrentProcess, [], :handle
+      attach_pfunc :GetCurrentThread, [], :handle
+      attach_pfunc :GetVersionExA, [:ptr], :bool
+      attach_pfunc :GetLastError, [], :dword
+      attach_pfunc :CloseHandle, [:dword], :bool
 
       ffi_lib :advapi32
 
-      attach_pfunc :AddAccessAllowedAce, [:pointer, :ulong, :ulong, :pointer], :bool
+      attach_pfunc :AddAccessAllowedAce, [:ptr, :dword, :dword, :ptr], :bool
       attach_pfunc :AllocateAndInitializeSid,
-        [:pointer, :int, :ulong, :ulong, :ulong, :ulong, :ulong, :ulong, :ulong, :ulong, :pointer], :bool
-      attach_pfunc :CheckTokenMembership, [:ulong, :pointer, :pointer], :bool
-      attach_pfunc :ConvertSidToStringSid, :ConvertSidToStringSidA, [:pointer, :pointer], :bool
-      attach_pfunc :ConvertStringSidToSid, :ConvertStringSidToSidA, [:string, :pointer], :bool
-      attach_pfunc :EqualSid, [:pointer, :pointer], :bool
-      attach_pfunc :FindFirstFreeAce, [:pointer, :pointer], :bool
-      attach_pfunc :GetAclInformation, [:pointer, :pointer, :ulong, :int], :bool
-      attach_pfunc :GetLengthSid, [:pointer], :ulong
-      attach_pfunc :GetSidLengthRequired, [:uint], :ulong
-      attach_pfunc :GetSidSubAuthority, [:pointer, :ulong], :pointer
-      attach_pfunc :GetTokenInformation, [:ulong, :token_info_class, :pointer, :ulong, :pointer], :bool
-      attach_pfunc :InitializeAcl, [:pointer, :ulong, :ulong], :bool
-      attach_pfunc :InitializeSid, [:pointer, :pointer, :uint], :bool
-      attach_pfunc :IsValidAcl, [:pointer], :bool
-      attach_pfunc :IsValidSid, [:pointer], :bool
-      attach_pfunc :IsWellKnownSid, [:pointer, :int], :bool
+        [:ptr, :int, :dword, :dword, :dword, :dword, :dword, :dword, :dword, :dword, :ptr], :bool
+      attach_pfunc :CheckTokenMembership, [:handle, :ptr, :ptr], :bool
+      attach_pfunc :ConvertSidToStringSid, :ConvertSidToStringSidA, [:ptr, :ptr], :bool
+      attach_pfunc :ConvertStringSidToSid, :ConvertStringSidToSidA, [:string, :ptr], :bool
+      attach_pfunc :EqualSid, [:ptr, :ptr], :bool
+      attach_pfunc :FindFirstFreeAce, [:ptr, :ptr], :bool
+      attach_pfunc :GetAclInformation, [:ptr, :ptr, :dword, :int], :bool
+      attach_pfunc :GetLengthSid, [:ptr], :dword
+      attach_pfunc :GetSidLengthRequired, [:uint], :dword
+      attach_pfunc :GetSidSubAuthority, [:ptr, :dword], :ptr
+      attach_pfunc :GetTokenInformation, [:handle, :token_info_class, :ptr, :dword, :ptr], :bool
+      attach_pfunc :InitializeAcl, [:ptr, :dword, :dword], :bool
+      attach_pfunc :InitializeSid, [:ptr, :ptr, :uint], :bool
+      attach_pfunc :IsValidAcl, [:ptr], :bool
+      attach_pfunc :IsValidSid, [:ptr], :bool
+      attach_pfunc :IsWellKnownSid, [:ptr, :int], :bool
       attach_pfunc :LookupAccountName, :LookupAccountNameA,
-        [:string, :string, :pointer, :pointer, :pointer, :pointer, :pointer], :bool
+        [:string, :string, :ptr, :ptr, :ptr, :ptr, :ptr], :bool
       attach_pfunc :LookupAccountSid, :LookupAccountSidA,
-        [:string, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :bool
-      attach_pfunc :OpenProcessToken, [:ulong, :ulong, :pointer], :bool
-      attach_pfunc :OpenThreadToken, [:ulong, :ulong, :bool, :pointer], :bool
-      attach_pfunc :SetAclInformation, [:pointer, :pointer, :ulong, :int], :bool
+        [:string, :ptr, :ptr, :ptr, :ptr, :ptr, :ptr], :bool
+      attach_pfunc :OpenProcessToken, [:handle, :dword, :ptr], :bool
+      attach_pfunc :OpenThreadToken, [:handle, :dword, :bool, :ptr], :bool
+      attach_pfunc :SetAclInformation, [:ptr, :ptr, :dword, :int], :bool
     end
   end
 end

data/test/test_security.rb

@@ -9,7 +9,7 @@ require 'win32/security'
 
 class TC_Win32_Security < Test::Unit::TestCase
   test "version constant is set to expected value" do
-    assert_equal('0.2.1', Win32::Security::VERSION)
+    assert_equal('0.2.2', Win32::Security::VERSION)
   end
 
   test "elevated security basic functionality" do

data/win32-security.gemspec

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