win 0.1.26 → 0.1.27

data/VERSION

@@ -1 +1 @@
-0.1.26
+0.1.27

data/lib/win/dde.rb

@@ -281,7 +281,7 @@ module Win
             DMLERR_EXECACKTIMEOUT => 'A request for a synchronous execute transaction has timed out.',
             DMLERR_INVALIDPARAMETER => 'A parameter failed to be validated by the DDEML. Possible causes: ' +
                     'Application used a data handle initialized with a different item name handle than was required ' +
-                    'by the transaction.' +
+                    'by the transaction. ' +
                     'The application used a data handle that was initialized with a different clipboard data format ' +
                     'than was required by the transaction. ' +
                     'The application used a client-side conversation handle with server-side function or vice versa. ' +
@@ -755,7 +755,7 @@ module Win
              &->(api, old_id=0, cmd, &block){
              raise ArgumentError, 'No callback block' unless block
              old_id = 0 unless old_id
-             id = FFI::MemoryPointer.new(:long).put_uint32(0, old_id)
+             id = FFI::MemoryPointer.new(:uint32).put_uint32(0, old_id)
              status = api.call(id, block, cmd, 0)
              id = status == 0 ? id.get_uint32(0) : nil
              [id, status] }
@@ -779,7 +779,6 @@ module Win
     #
     function :DdeUninitialize, [:uint32], :int, boolean: true
 
-
     ##
     # The DdeCreateStringHandle function creates a handle that identifies the specified string.
     # A Dynamic Data Exchange (DDE) client or server application can pass the string handle as a
@@ -814,7 +813,8 @@ module Win
     #
     function :DdeCreateStringHandle, [:uint32, :pointer, :int], :ulong, zeronil: true,
              &->(api, instance_id, string, code_page=CP_WINANSI){
-             api.call(instance_id, FFI::MemoryPointer.from_string(string), code_page) }
+             string_pointer = FFI::MemoryPointer.from_string(string)
+             api.call(instance_id, string_pointer, code_page) }
 
     ##
     # The DdeFreeStringHandle function frees a string handle in the calling application.
@@ -1117,7 +1117,7 @@ module Win
     #  data_handle = dde_client_transaction(data_pointer, size, conv, item, format, type, timeout, result)
     #
     function :DdeClientTransaction, [:pointer, :uint32, :ulong, :ulong, :uint, :uint, :uint32, :pointer],
-             :HDDEDATA, boolean: true
+             :HDDEDATA, zeronil: true
 
     ##
     # The DdeGetData function copies data from the specified Dynamic Data Exchange (DDE) object to the specified
@@ -1200,9 +1200,9 @@ module Win
     #
     function :DdeAccessData, [:HDDEDATA, :pointer], :pointer,
              &->(api, data_handle){
-             size_buffer = FFI::MemoryPointer.new(:int16)
+             size_buffer = FFI::MemoryPointer.new(:uint32)
              buffer = api.call(data_handle, size_buffer)
-             size = size_buffer.get_int16(0)
+             size = size_buffer.get_uint32(0)
              size == 0 ? [nil, 0] : [buffer, size] }
     # weird lambda literal instead of block is needed because RDoc goes crazy if block is attached to meta-definition
 

data/lib/win/library.rb

@@ -63,7 +63,7 @@ module Win
         @namespace.send(@function_name.to_sym, *args)
       end
 
-      alias_method :[], :call
+     # alias_method :[], :call
     end
 
     # Contains class methods (macros) that can be used in any module mixing in Win::Library
@@ -355,11 +355,11 @@ module Win
             end
           else
             if zeronil
-              ->(*args, &block){ (res = block ? block[api[*args]] : api[*args]) != 0 ? res : nil }
+              ->(*args, &block){ (res = block ? block[api.call(*args)] : api.call(*args)) != 0 ? res : nil }
             elsif boolean
-              ->(*args, &block){ block ? block[api[*args]] : api[*args] != 0 }
+              ->(*args, &block){ block ? block[api.call(*args)] : api.call(*args) != 0 }
             else
-              ->(*args, &block){ block ? block[api[*args]] : api[*args] }
+              ->(*args, &block){ block ? block[api.call(*args)] : api.call(*args) }
             end
           end
 

data/spec/win/dde_spec.rb

@@ -6,7 +6,7 @@ module WinDDETest
   include Win::DDE
   include Win::GUI::Message
 
-  POKE_STRING = "Poke_string\x00\x00"
+  POKE_STRING = "Poke_string"
 
   def dde_cmd
     APPCLASS_STANDARD
@@ -346,31 +346,40 @@ module WinDDETest
       before(:each) do
         setup_server do |*args|
           @server_calls << extract_values(*args)
-          @data, size = dde_get_data(args[5]) if args.first == XTYP_POKE || args.first == XTYP_EXECUTE
+          @data_out, size = dde_get_data(args[5]) if args.first == XTYP_POKE || args.first == XTYP_EXECUTE
           DDE_FACK
         end
+        @conv_handle = dde_connect( @server_id, @service_handle, @topic_handle, context=nil)
+        @data_in = FFI::MemoryPointer.from_string POKE_STRING
       end
       after(:each) { teardown_server}
 
       spec{ use{ DdeClientTransaction(data=nil, size=0, conv=0, item=0, format=0, type=0, timeout=0, result=nil) }}
       spec{ use{ dde_client_transaction(data=nil, size=0, conv=0, item=0, format=0, type=0, timeout=0, result=nil) }}
 
+
+      it "returns 0/nil if initiated transaction unsuccessful" do
+        res = DdeClientTransaction(@data_in, @data_in.size, 1234, @topic_handle, CF_TEXT, XTYP_POKE, 1000, nil)
+        res.should == 0     # wrong conversation handle
+        res = dde_client_transaction(@data_in, @data_in.size, 1234, @topic_handle, CF_TEXT, XTYP_POKE, 1000, nil)
+        res.should == nil   # wrong conversation handle
+        res = dde_client_transaction(@data_in, @data_in.size, @conv_handle, 0, CF_TEXT, XTYP_POKE, 1000, nil)
+        res.should == nil   # wrong item handle (cannot be NULL in XTYP_POKE transaction)
+        @server_calls.any? {|call| call[0] == 'XTYP_POKE'}.should be_false
+      end
+
       it "original api is used by CLIENT to begins a data transaction with server" do
-        @conv_handle = dde_connect( @server_id, @service_handle, @topic_handle, context=nil)
-        str = FFI::MemoryPointer.from_string POKE_STRING
-        res = DdeClientTransaction(str, str.size, @conv_handle, @topic_handle, CF_TEXT, XTYP_POKE, 1000, nil)
+        res = DdeClientTransaction(@data_in, @data_in.size, @conv_handle, @topic_handle, CF_TEXT, XTYP_POKE, 1000, nil)
         res.should == 1
-        @server_calls.any? {|call| call[0] = 'XTYP_POKE'}.should be_true
-        @data.read_string.should == POKE_STRING.rstrip
+        @server_calls.any? {|call| call[0] == 'XTYP_POKE'}.should be_true
+        @data_out.read_string.should == POKE_STRING.rstrip
       end
 
       it "snake_case api begins a data transaction between a client and a server" do
-        str = FFI::MemoryPointer.from_string POKE_STRING
-        @conv_handle = dde_connect( @server_id, @service_handle, @topic_handle, context=nil)
-        res = dde_client_transaction(str, str.size, @conv_handle, @topic_handle, 0, XTYP_EXECUTE, 1000, nil)
-        res.should == true
-        @server_calls.any? {|call| call[0] = 'XTYP_EXECUTE'}.should be_true
-        @data.read_string.should == POKE_STRING.rstrip
+        res = dde_client_transaction(@data_in, @data_in.size, @conv_handle, 0, 0, XTYP_EXECUTE, 1000, nil)
+        res.should be_true
+        @server_calls.any? {|call| call[0] == 'XTYP_EXECUTE'}.should be_true
+        @data_out.read_string.should == POKE_STRING.rstrip
       end
     end # describe dde_client_transaction
 
@@ -398,10 +407,10 @@ module WinDDETest
             data, size = dde_get_data(data_handle)
             data.should be_an FFI::MemoryPointer
             data.read_string.should == POKE_STRING.rstrip
-            size.should == 14
-            DdeGetData(data_handle, nil, 0, 0).should == 14
+            size.should == 12
+            DdeGetData(data_handle, nil, 0, 0).should == 12
             data = FFI::MemoryPointer.new(:char, 1024)
-            DdeGetData(data_handle, data, data.size, 0).should == 14
+            DdeGetData(data_handle, data, data.size, 0).should == 12
             data.read_string.should == POKE_STRING.rstrip
           end
           DDE_FACK
@@ -442,10 +451,10 @@ module WinDDETest
             data, size = dde_access_data(data_handle)
             data.should be_kind_of FFI::Pointer
             data.read_string.should == POKE_STRING.rstrip
-            size.should == 14
+            size.should == 12
             buf = FFI::MemoryPointer.new(:int16)
             data = DdeAccessData(data_handle, buf)
-            buf.get_int16(0).should == 14
+            buf.get_int16(0).should == 12
             data.should be_kind_of FFI::Pointer
             data.read_string.should == POKE_STRING.rstrip
             dde_unaccess_data(data_handle)

data/win.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{win}
-  s.version = "0.1.26"
+  s.version = "0.1.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["arvicco"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-03-23}
   s.description = %q{Rubyesque interfaces and wrappers for Windows API functions pre-defined using FFI }
   s.email = %q{arvitallian@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win
 version: !ruby/object:Gem::Version 
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors: 
 - arvicco
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +03:00
+date: 2010-03-23 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency