win32-pipe 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a494308e731c0475969ecbfe838322433db1eec7
-  data.tar.gz: 82f8cada5b940758be02ec8597320124ad690078
+  metadata.gz: 3efdd5d2b5a0d1c4155f89cd532f1f60f56e9efc
+  data.tar.gz: fb14d03d04dfb70e0425d60c38fd248b37d86382
 SHA512:
-  metadata.gz: fa88c692a19e8a6e7bd133bfd87654f8d11297ab05b6e64656c4895cfb38b7802aea1e6aa30b8588e144967a896de5bedc59ee12bcd40119c343cdea025790fa
-  data.tar.gz: 4c9444293aef0c48e9f2988a566900f49a9e2b14e62aa5c83f0264949a29d3b1d04bd60092d1f72459be83e4f2ad0d010157d70671567727409f32ec20b2f5f0
+  metadata.gz: e67c81f9a4368a9ca83463bdae86c498407478e5cfc8ed96ffc680234d8e9bcf5b4553a5be612990d908fac84ab1b6d15efcde86ea78ab43a671bf1b3f06385e
+  data.tar.gz: 545532d071afaef42922a643c5a835f8e01e0fab14e50ee235d8e4c169c311b7e94db26ce555464a2684232fe219affe08f82f53f660f0b144e429fa903879cc

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.3.3 - 21-Oct-2013
+* Fixed INVALID_HANDLE_VALUE for 64-bit Ruby.
+* Now internally uses a struct for OVERLAPPED event instead of packed string.
+
 == 0.3.2 - 27-Jul-2013
 * Don't raise an error if GetLastError returns ERROR_SUCCESS in server. Thanks
   to go Ben Jansen for the patch.

data/lib/win32/pipe.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), 'pipe', 'windows', 'constants')
 require File.join(File.dirname(__FILE__), 'pipe', 'windows', 'functions')
+require File.join(File.dirname(__FILE__), 'pipe', 'windows', 'structs')
 
 # The Win32 module serves as a namespace only.
 module Win32
@@ -9,12 +10,13 @@ module Win32
   class Pipe
     include Windows::Constants
     include Windows::Functions
+    include Windows::Structs
 
     # Error raised when anything other than a SystemCallError occurs.
     class Error < StandardError; end
 
     # The version of this library
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
 
     PIPE_BUFFER_SIZE = 512 #:nodoc:
     PIPE_TIMEOUT = 5000    #:nodoc:
@@ -98,7 +100,7 @@ module Win32
       @pending_io   = false
       @buffer       = 0.chr * PIPE_BUFFER_SIZE
       @size         = 0
-      @overlapped   = 0.chr * 20 # sizeof(OVERLAPPED)
+      @overlapped   = Overlapped.new
       @transferred  = 0
       @asynchronous = false
 
@@ -108,7 +110,7 @@ module Win32
 
       if @asynchronous
         @event = CreateEvent(nil, true, true, nil)
-        @overlapped[16, 4] = [@event].pack('L')
+        @overlapped[:hEvent] = @event
       end
     end
 

data/lib/win32/pipe/windows/constants.rb

@@ -1,5 +1,9 @@
+require 'ffi'
+
 module Windows
   module Constants
+    include FFI::Library
+
     PIPE_WAIT             = 0x00000000
     PIPE_NOWAIT           = 0x00000001
     PIPE_ACCESS_INBOUND   = 0x00000001
@@ -20,7 +24,6 @@ module Windows
     FILE_ATTRIBUTE_NORMAL        = 0x00000080
 
     INFINITE = 0xFFFFFFFF
-    INVALID_HANDLE_VALUE = 0xFFFFFFFF
     NMPWAIT_WAIT_FOREVER = 0xFFFFFFFF
     ERROR_PIPE_BUSY = 231
     ERROR_IO_PENDING = 997
@@ -33,5 +36,7 @@ module Windows
     FILE_SHARE_READ  = 1
     FILE_SHARE_WRITE = 2
     OPEN_EXISTING    = 3
+
+    INVALID_HANDLE_VALUE = FFI::Pointer.new(-1).address
   end
 end

data/lib/win32/pipe/windows/structs.rb

@@ -0,0 +1,18 @@
+require 'ffi'
+
+module Windows
+  module Structs
+    extend FFI::Library
+
+    # I'm assuming the anonymous struct for the internal union here.
+    class Overlapped < FFI::Struct
+      layout(
+        :Internal, :uintptr_t,
+        :InternalHigh, :uintptr_t,
+        :Offset, :ulong,
+        :OffsetHigh, :ulong,
+        :hEvent, :uintptr_t
+      )
+    end
+  end
+end

data/test/test_win32_pipe.rb

@@ -14,7 +14,7 @@ class TC_Win32_Pipe < Test::Unit::TestCase
   end
 
   test "version is set to expected value" do
-    assert_equal('0.3.2', Pipe::VERSION)
+    assert_equal('0.3.3', Pipe::VERSION)
   end
 
   test "name method basic functionality" do

data/win32-pipe.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
 	spec.name       = 'win32-pipe'
-	spec.version    = '0.3.2'
+	spec.version    = '0.3.3'
 	spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0'
 	spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win32-pipe
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -58,6 +58,7 @@ files:
 - lib/win32/pipe/server.rb
 - lib/win32/pipe/windows/constants.rb
 - lib/win32/pipe/windows/functions.rb
+- lib/win32/pipe/windows/structs.rb
 - lib/win32/pipe.rb
 - MANIFEST
 - Rakefile
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: win32utils
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: An interface for named pipes on MS Windows