win32-process 0.7.1 → 0.7.2

data/CHANGES

@@ -1,3 +1,8 @@
+= 0.7.2 - 8-Apr-2013
+* Fixed a 64 bit issue caused by the fact that HANDLE's were set as ulong
+  instead of intptr_t. Thanks go to Crossverse the spot.
+* Added some typedefs in the underlying FFI code for Windows data types.
+
 = 0.7.1 - 3-Jan-2013
 * The _get_errno function is apparently not exported on on Windows XP or
   earlier. On those platforms, FFI.errno is now used instead. Thanks go

data/README

@@ -63,7 +63,7 @@
   Artistic 2.0
 	
 = Copyright
-  (C) 2003-2012 Daniel J. Berger
+  (C) 2003-2013 Daniel J. Berger
   All Rights Reserved
 		
 = Warranty

data/lib/win32/process.rb

@@ -11,7 +11,7 @@ module Process
   extend Process::Constants
 
   # The version of the win32-process library.
-  WIN32_PROCESS_VERSION = '0.7.1'
+  WIN32_PROCESS_VERSION = '0.7.2'
 
   # Disable popups. This mostly affects the Process.kill method.
   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX)

data/lib/win32/process/functions.rb

@@ -16,53 +16,58 @@ module Process::Functions
 
   extend FFI::Library
 
+  typedef :ulong, :dword
+  typedef :uintptr_t, :handle
+  typedef :uintptr_t, :hwnd
+  typedef :uintptr_t, :hmodule
+
   ffi_lib :kernel32
 
-  attach_pfunc :CloseHandle, [:ulong], :bool
-  attach_pfunc :GenerateConsoleCtrlEvent, [:ulong, :ulong], :bool
-  attach_pfunc :GetCurrentProcess, [], :ulong
-  attach_pfunc :GetModuleHandle, :GetModuleHandleA, [:string], :ulong
-  attach_pfunc :GetProcessAffinityMask, [:ulong, :pointer, :pointer], :bool
-  attach_pfunc :GetPriorityClass, [:ulong], :ulong
-  attach_pfunc :GetProcAddress, [:ulong, :string], :ulong
+  attach_pfunc :CloseHandle, [:handle], :bool
+  attach_pfunc :GenerateConsoleCtrlEvent, [:dword, :dword], :bool
+  attach_pfunc :GetCurrentProcess, [], :handle
+  attach_pfunc :GetModuleHandle, :GetModuleHandleA, [:string], :hmodule
+  attach_pfunc :GetProcessAffinityMask, [:handle, :pointer, :pointer], :bool
+  attach_pfunc :GetPriorityClass, [:handle], :dword
+  attach_pfunc :GetProcAddress, [:hmodule, :string], :pointer
   attach_pfunc :GetVersionExA, [:pointer], :bool
-  attach_pfunc :IsProcessInJob, [:ulong, :pointer, :pointer], :void
-  attach_pfunc :OpenProcess, [:ulong, :bool, :ulong], :ulong
-  attach_pfunc :SetHandleInformation, [:ulong, :ulong, :ulong], :bool
+  attach_pfunc :IsProcessInJob, [:handle, :pointer, :pointer], :bool # 2nd arg optional
+  attach_pfunc :OpenProcess, [:dword, :bool, :dword], :handle
+  attach_pfunc :SetHandleInformation, [:handle, :dword, :dword], :bool
   attach_pfunc :SetErrorMode, [:uint], :uint
-  attach_pfunc :SetPriorityClass, [:ulong, :ulong], :bool
-  attach_pfunc :TerminateProcess, [:ulong, :uint], :bool
-  attach_pfunc :WaitForSingleObject, [:ulong, :ulong], :ulong
+  attach_pfunc :SetPriorityClass, [:handle, :dword], :bool
+  attach_pfunc :TerminateProcess, [:handle, :uint], :bool
+  attach_pfunc :WaitForSingleObject, [:handle, :dword], :dword
 
   attach_pfunc :CreateRemoteThread,
-    [:ulong, :pointer, :size_t, :ulong, :pointer, :ulong, :pointer], :ulong
+    [:handle, :pointer, :size_t, :pointer, :pointer, :dword, :pointer], :handle
 
   attach_pfunc :GetVolumeInformationA,
-    [:string, :pointer, :ulong, :pointer, :pointer, :pointer, :pointer, :ulong], :bool
+    [:string, :pointer, :dword, :pointer, :pointer, :pointer, :pointer, :dword], :bool
 
   attach_pfunc :CreateProcessW,
     [:buffer_in, :buffer_in, :pointer, :pointer, :bool,
-     :ulong, :buffer_in, :buffer_in, :pointer, :pointer], :bool
+     :dword, :buffer_in, :buffer_in, :pointer, :pointer], :bool
 
-  attach_pfunc :AssignProcessToJobObject, [:ulong, :ulong], :bool
-  attach_pfunc :CreateJobObjectA, [:pointer, :string], :ulong
-  attach_pfunc :OpenJobObjectA, [:ulong, :bool, :string], :ulong
-  attach_pfunc :QueryInformationJobObject, [:ulong, :int, :pointer, :ulong, :pointer], :bool
-  attach_pfunc :SetInformationJobObject, [:ulong, :int, :pointer, :ulong], :bool
+  attach_pfunc :AssignProcessToJobObject, [:handle, :handle], :bool
+  attach_pfunc :CreateJobObjectA, [:pointer, :string], :handle
+  attach_pfunc :OpenJobObjectA, [:dword, :bool, :string], :handle
+  attach_pfunc :QueryInformationJobObject, [:handle, :int, :pointer, :dword, :pointer], :bool
+  attach_pfunc :SetInformationJobObject, [:handle, :int, :pointer, :dword], :bool
 
   ffi_lib :advapi32
 
   attach_pfunc :ConvertSidToStringSidA, [:buffer_in, :pointer], :bool
-  attach_pfunc :GetTokenInformation, [:ulong, :int, :pointer, :ulong, :pointer], :bool
-  attach_pfunc :OpenProcessToken, [:ulong, :ulong, :pointer], :bool
+  attach_pfunc :GetTokenInformation, [:handle, :int, :pointer, :dword, :pointer], :bool
+  attach_pfunc :OpenProcessToken, [:handle, :dword, :pointer], :bool
 
   attach_pfunc :CreateProcessWithLogonW,
-    [:buffer_in, :buffer_in, :buffer_in, :ulong, :buffer_in, :buffer_in,
-     :ulong, :buffer_in, :buffer_in, :pointer, :pointer], :bool
+    [:buffer_in, :buffer_in, :buffer_in, :dword, :buffer_in, :buffer_in,
+     :dword, :buffer_in, :buffer_in, :pointer, :pointer], :bool
 
   ffi_lib FFI::Library::LIBC
 
-  attach_pfunc :get_osfhandle, :_get_osfhandle, [:int], :ulong
+  attach_pfunc :get_osfhandle, :_get_osfhandle, [:int], :intptr_t
 
   begin
     attach_pfunc :get_errno, :_get_errno, [:pointer], :int

data/lib/win32/process/structs.rb

@@ -8,6 +8,10 @@ require 'ffi'
 module Process::Structs
   extend FFI::Library
 
+  typedef :ulong, :dword
+  typedef :uintptr_t, :handle
+  typedef :short, :word
+
   private
 
   # sizeof(LARGE_INTEGER) == 8
@@ -31,13 +35,13 @@ module Process::Structs
     layout(
       :PerProcessUserTimeLimit, LARGE_INTEGER,
       :PerJobUserTimeLimit, LARGE_INTEGER,
-      :LimitFlags, :ulong,
+      :LimitFlags, :dword,
       :MinimumWorkingSetSize, :size_t,
       :MaximumWorkingSetSize, :size_t,
-      :ActiveProcessLimit, :ulong,
+      :ActiveProcessLimit, :dword,
       :Affinity, :pointer,
-      :PriorityClass, :ulong,
-      :SchedulingClass, :ulong
+      :PriorityClass, :dword,
+      :SchedulingClass, :dword
     )
   end
 
@@ -54,7 +58,7 @@ module Process::Structs
 
   class SECURITY_ATTRIBUTES < FFI::Struct
     layout(
-      :nLength, :ulong,
+      :nLength, :dword,
       :lpSecurityDescriptor, :pointer,
       :bInheritHandle, :bool
     )
@@ -67,27 +71,27 @@ module Process::Structs
       :lpReserved, :string,
       :lpDesktop, :string,
       :lpTitle, :string,
-      :dwX, :ulong,
-      :dwY, :ulong,
-      :dwXSize, :ulong,
-      :dwYSize, :ulong,
-      :dwXCountChars, :ulong,
-      :dwYCountChars, :ulong,
-      :dwFillAttribute, :ulong,
-      :dwFlags, :ulong,
-      :wShowWindow, :short,
-      :cbReserved2, :short,
+      :dwX, :dword,
+      :dwY, :dword,
+      :dwXSize, :dword,
+      :dwYSize, :dword,
+      :dwXCountChars, :dword,
+      :dwYCountChars, :dword,
+      :dwFillAttribute, :dword,
+      :dwFlags, :dword,
+      :wShowWindow, :word,
+      :cbReserved2, :word,
       :lpReserved2, :pointer,
-      :hStdInput, :ulong,
-      :hStdOutput, :ulong,
-      :hStdError, :ulong
+      :hStdInput, :handle,
+      :hStdOutput, :handle,
+      :hStdError, :handle
     )
   end
 
   class PROCESS_INFORMATION < FFI::Struct
     layout(
-      :hProcess, :ulong,
-      :hThread, :ulong,
+      :hProcess, :handle,
+      :hThread, :handle,
       :dwProcessId, :ulong,
       :dwThreadId, :ulong
     )
@@ -95,11 +99,11 @@ module Process::Structs
 
   class OSVERSIONINFO < FFI::Struct
     layout(
-      :dwOSVersionInfoSize, :ulong,
-      :dwMajorVersion, :ulong,
-      :dwMinorVersion, :ulong,
-      :dwBuildNumber, :ulong,
-      :dwPlatformId, :ulong,
+      :dwOSVersionInfoSize, :dword,
+      :dwMajorVersion, :dword,
+      :dwMinorVersion, :dword,
+      :dwBuildNumber, :dword,
+      :dwPlatformId, :dword,
       :szCSDVersion, [:char, 128]
     )
   end

data/test/test_win32_process.rb

@@ -25,7 +25,7 @@ class TC_Win32Process < Test::Unit::TestCase
   end
 
   test "win32-process version is set to the correct value" do
-    assert_equal('0.7.1', Process::WIN32_PROCESS_VERSION)
+    assert_equal('0.7.2', Process::WIN32_PROCESS_VERSION)
   end
 
   test "create basic functionality" do

data/win32-process.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-process'
-  spec.version    = '0.7.1'
+  spec.version    = '0.7.2'
   spec.license    = 'Artistic 2.0'
   spec.authors    = ['Daniel Berger', 'Park Heesob']
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-process
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi