win32-clipboard 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae3c43870e2b279fd8fecf2402d492635e84937
-  data.tar.gz: 890236829d55f6cbf2c60ced0422f5cbd8214b0d
+  metadata.gz: 9de821de27a89d47b900c8107d9414bf1b55f12e
+  data.tar.gz: 5b8a1bff4c1dc00adfed808e4ebe95d796972f40
 SHA512:
-  metadata.gz: 57ab34d912770a26f94b5f368a6a0efd4f7023d939bf42bf9f39d9e6a521afdabc4c4cec340fe01b13ac7f61e78d1f3006a0a1ccd07548c35d2f7c49f96ac9f6
-  data.tar.gz: 7bd917b7b196049f28173bb8aef3b8075eee2ab7a0c4221db791f6adc3306cf85e37ad93a14fa654f4ce728d5fc0b07064f1e721a19bea0e34b7e2d59fdf00d2
+  metadata.gz: 3bee364da37395f10308a3ae1e46091dd07a4f67009df7a4ea44e13fc67ccdb3063fe2507866e09a37e54cec0ba712f6cc81dc39c96c1345e8f5ded358bc4701
+  data.tar.gz: f863bf39bdd43f8efa720affae4c2a80e30eb268badf6f288938c1c28bf842f4bbe19722c66bb88271c98d01eb9c55615f4adb769b03d6b1b9dec71cbf93a52c

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.6.1 - 20-Jan-2014
+* Use 32-bit versions of GetWindowLong and SetWindowLong functions on 32-bit
+  versions of Ruby. Thanks go to Orgad Shaneh for the spot.
+
 == 0.6.0 - 12-Jan-2014
 * Converted code to use FFI.
 * Now requires Ruby 1.9.1 or later and Windows Vista or later.

data/lib/win32/clipboard.rb

@@ -16,7 +16,7 @@ module Win32
     extend Windows::Structs
 
     # The version of this library
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
 
     # Clipboard formats
 
@@ -154,7 +154,7 @@ module Win32
         case format
           when UNICODETEXT
             clip_data.encode!('UTF-16LE')
-	    clip_data << "\0".encode('UTF-16LE')
+            clip_data << "\0".encode('UTF-16LE')
             buf = clip_data
             extra = 4
           when TEXT, OEMTEXT

data/lib/win32/windows/functions.rb

@@ -33,7 +33,6 @@ module Windows
     attach_function :EnumClipboardFormats, [:uint], :uint
     attach_function :GetClipboardData, [:uint], :handle
     attach_function :GetClipboardFormatName, :GetClipboardFormatNameA, [:uint, :pointer, :int], :int
-    attach_function :GetWindowLongPtr, :GetWindowLongPtrA, [:hwnd, :int], :long
     attach_function :IsClipboardFormatAvailable, [:uint], :bool
     attach_function :OpenClipboard, [:hwnd], :bool
     attach_function :PeekMessage, :PeekMessageA, [:pointer, :hwnd, :uint, :uint, :uint], :bool
@@ -41,9 +40,17 @@ module Windows
     attach_function :RegisterClipboardFormat, :RegisterClipboardFormatA, [:string], :uint
     attach_function :SetClipboardData, [:uint, :handle], :handle
     attach_function :SetClipboardViewer, [:hwnd], :hwnd
-    attach_function :SetWindowLongPtr, :SetWindowLongPtrA, [:hwnd, :int, :uintptr_t], :long
     attach_function :TranslateMessage, [:pointer], :bool
 
+    # Use Long on 32-bit Ruby, LongPtr on 64-bit Ruby
+    begin
+      attach_function :GetWindowLongPtr, :GetWindowLongPtrA, [:hwnd, :int], :long
+      attach_function :SetWindowLongPtr, :SetWindowLongPtrA, [:hwnd, :int, :uintptr_t], :long
+    rescue FFI::NotFoundError
+      attach_function :GetWindowLongPtr, :GetWindowLongA, [:hwnd, :int], :long
+      attach_function :SetWindowLongPtr, :SetWindowLongA, [:hwnd, :int, :uintptr_t], :long
+    end
+
     ffi_lib :shell32
 
     attach_function :DragQueryFileA, [:hdrop, :uint, :pointer, :uint], :uint

data/test/test_clipboard.rb

@@ -14,7 +14,7 @@ include Win32
 
 class TC_Win32_ClipBoard < Test::Unit::TestCase
   test "version is set to expected value" do
-    assert_equal('0.6.0', Clipboard::VERSION)
+    assert_equal('0.6.1', Clipboard::VERSION)
   end
 
   test "data method basic functionality" do

data/win32-clipboard.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 Gem::Specification.new do |spec|
   spec.name      = 'win32-clipboard'
-  spec.version   = '0.6.0'
+  spec.version   = '0.6.1'
   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-clipboard
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi