win32-clipboard 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9de821de27a89d47b900c8107d9414bf1b55f12e
-  data.tar.gz: 5b8a1bff4c1dc00adfed808e4ebe95d796972f40
+  metadata.gz: f1e9d66dee40bab2644c326883aa740d9cda4c7a
+  data.tar.gz: a35a610cd2d18dd40fdc04486b9492c41df6a065
 SHA512:
-  metadata.gz: 3bee364da37395f10308a3ae1e46091dd07a4f67009df7a4ea44e13fc67ccdb3063fe2507866e09a37e54cec0ba712f6cc81dc39c96c1345e8f5ded358bc4701
-  data.tar.gz: f863bf39bdd43f8efa720affae4c2a80e30eb268badf6f288938c1c28bf842f4bbe19722c66bb88271c98d01eb9c55615f4adb769b03d6b1b9dec71cbf93a52c
+  metadata.gz: 019a82dd2e1110b082fa59c815f551b53a1620db009112d5d506889c88527f78d8cd84692112627ebb1f725406cd258a60d22c07552377922e68a8502c845c19
+  data.tar.gz: 22c2fad73246cd26eedca03248e5a3f0afc2d28bea15350341807ee4c57102f5c9089ae175a1cf47e016886df1f3c473afa197200796d0164b6d6e3afdfd5fa3

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.6.2 - 27-Jan-2014
+* Fix and more tests for the internal get_image_data. Thanks go to u338steven
+  for the spot and patches.
+
 == 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.

data/Rakefile

@@ -45,6 +45,12 @@ namespace :test do
     t.verbose = true
     t.test_files = FileList['test/test_clipboard.rb']
   end
+
+  Rake::TestTask.new(:image) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList['test/test_image_clipboard.rb']
+  end
 end
 
 task :default => 'test:all'

data/lib/win32/clipboard.rb

@@ -16,7 +16,7 @@ module Win32
     extend Windows::Structs
 
     # The version of this library
-    VERSION = '0.6.1'
+    VERSION = '0.6.2'
 
     # Clipboard formats
 
@@ -162,7 +162,7 @@ module Win32
             buf = clip_data
             extra = 4
           when BITMAP, DIB
-            buf = clip_data[14..clip_data.length] # sizeof(BITMAPFILEHEADER) = 14
+            buf = clip_data[BITMAP_FILE_HEADER_SIZE..clip_data.length]
             extra = 0
         end
 
@@ -320,6 +320,14 @@ module Win32
 
     private
 
+    # sizeof(BITMAPFILEHEADER)
+
+    BITMAP_FILE_HEADER_SIZE = 14
+
+    # sizeof(BITMAPINFOHEADER)
+
+    BITMAP_INFO_HEADER_SIZE = 40
+
     # Opens the clipboard and prevents other applications from modifying
     # the clipboard content until it is closed.
     #
@@ -357,8 +365,7 @@ module Win32
 
         bmi = BITMAPINFO.new(ptr)
 
-        size_image = bmi[:bmiHeader][:biSizeImage]
-        size_image = buf_size + 16 if size_image == 0
+        file_size = buf_size + BITMAP_FILE_HEADER_SIZE
 
         # Calculate the header size
         case bmi[:bmiHeader][:biBitCount]
@@ -369,10 +376,14 @@ module Win32
           when 8
             table_size = 256
           when 16, 32
-            if bmi[:bmiHeader][:biCompression] == 0
+            if bmi[:bmiHeader][:biCompression] == BI_RGB
+              table_size = bmi[:bmiHeader][:biClrUsed]
+            elsif bmi[:bmiHeader][:biCompression] == BI_BITFIELDS
               table_size = bmi[:bmiHeader][:biClrUsed]
-            elsif compression == 3
-              table_size = 3
+              if bmi[:bmiHeader][:biSize] == BITMAP_INFO_HEADER_SIZE
+                # Add bit fields size
+                table_size += 3
+              end
             else
               raise "invalid bit/compression combination"
             end
@@ -382,10 +393,12 @@ module Win32
             raise "invalid bit count"
         end # case
 
-        # TODO: Document what's happening here.
-        offset = 0x36 + (table_size * 4)
+        # offset = sizeof(BITMAPFILEHEADER)
+        #          + sizeof(BITMAPINFOHEADER or BITMAPV4HEADER or BITMAPV5HEADER)
+        #          + (color table size)
+        offset = BITMAP_FILE_HEADER_SIZE + bmi[:bmiHeader][:biSize] + (table_size * 4)
 
-        buf = "\x42\x4D" + [size_image].pack('L') + 0.chr * 4 + [offset].pack('L') + ptr.read_bytes(buf_size)
+        buf = "\x42\x4D" + [file_size].pack('L') + 0.chr * 4 + [offset].pack('L') + ptr.read_bytes(buf_size)
       ensure
         GlobalUnlock(handle) if handle
       end

data/lib/win32/windows/constants.rb

@@ -6,5 +6,7 @@ module Windows
     GWL_USERDATA = -21
     GWL_WNDPROC  = -4
     CF_TEXT = 1
+    BI_RGB = 0
+    BI_BITFIELDS = 3
   end
 end

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.1', Clipboard::VERSION)
+    assert_equal('0.6.2', Clipboard::VERSION)
   end
 
   test "data method basic functionality" do

data/test/test_image_clipboard.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+###########################################################################
+# test_image_clipboard.rb
+#
+# Test suite for the win32-clipboard library(only get_image_data).
+###########################################################################
+require 'test-unit'
+require 'win32/clipboard'
+include Win32
+
+class TC_Image_ClipBoard < Test::Unit::TestCase
+  class << self
+    def startup
+      $is_ready = false
+      @t = Thread.new do
+        begin
+          Win32::Clipboard.notify_change {$is_ready = true}
+        rescue => e
+          puts $!
+          puts e.backtrace
+        end
+      end
+      # wait for notify_change running
+      until $is_ready
+        Clipboard.set_data('foo')
+        sleep 0.1
+      end
+    end
+
+    def shutdown
+      @t.kill
+    end
+  end
+
+  dir = File.join(File.dirname(__FILE__), 'img')
+  Dir.glob("#{dir}/*.bmp") do |file|
+    test "get_image_data file: " + File.basename(file) do
+      $is_ready = false
+
+      bmp = File.open(file, "rb").read
+      Clipboard.set_data(bmp, Clipboard::DIB)
+
+      until $is_ready
+        sleep 0.1
+      end
+
+      assert_equal(Clipboard.data(Clipboard::DIB), bmp)
+    end
+  end
+
+end

data/win32-clipboard.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 Gem::Specification.new do |spec|
   spec.name      = 'win32-clipboard'
-  spec.version   = '0.6.1'
+  spec.version   = '0.6.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-clipboard
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -75,8 +75,21 @@ files:
 - lib/win32/windows/constants.rb
 - lib/win32/windows/functions.rb
 - lib/win32/windows/structs.rb
+- test/img/16bit.bmp
+- test/img/16bit_bitfields.bmp
+- test/img/16bit_bitfields1.bmp
+- test/img/16bit_bitfields2.bmp
+- test/img/1bit.bmp
+- test/img/24bit.bmp
+- test/img/32bit.bmp
+- test/img/32bit_bitfields.bmp
+- test/img/32bit_bitfields1.bmp
+- test/img/32bit_bitfields2.bmp
+- test/img/4bit.bmp
+- test/img/8bit.bmp
 - test/test_clipboard.rb
 - test/test_html_clipboard.rb
+- test/test_image_clipboard.rb
 - win32-clipboard.gemspec
 homepage: http://github.com/djberg96/win32-clipboard
 licenses: