rdp-win32screenshot 0.0.6.3 → 0.0.7.1

data/History.rdoc

@@ -1,3 +1,6 @@
+= 0.0.7 2010-08-18
+* Supports now fully JRuby, 1.9.1 and 1.9.2 MRI!
+
 = 0.0.6 2010-08-07
 * Trying to bring window to the foreground more aggressively (Roger Pack)
 * Added utility class Win32::Screenshot.Util with some helper methods not related directly with taking of the screenshots:

data/VERSION

@@ -1 +1,2 @@
-0.0.6.3
+0.0.7.1
+

data/lib/win32/screenshot/bitmap_maker.rb

@@ -42,7 +42,8 @@ module Win32
                         [:long], :bool
         attach_function :set_active_window, :SetActiveWindow,
                         [:long], :long
-
+        attach_function :GetWindowThreadProcessId, [:ulong, :pointer], 
+                        :uint
 
         # gdi32.dll
         attach_function :create_compatible_dc, :CreateCompatibleDC,
@@ -62,7 +63,9 @@ module Win32
         attach_function :release_dc, :ReleaseDC,
                         [:long, :long], :int
 
-
+        
+
+
         EnumWindowCallback = FFI::Function.new(:bool, [ :long, :pointer ], { :convention => :stdcall }) do |hwnd, param|
           searched_window = WindowStruct.new param
           title = Util.window_title(hwnd)
@@ -119,6 +122,12 @@ module Win32
             attach_thread_input(foreground_thread, other_thread, false) unless other_thread == foreground_thread
           end
         end
+        
+        def get_process_id_from_hwnd hwnd
+          out = FFI::MemoryPointer.new(:uint)
+          GetWindowThreadProcessId(hwnd, out)
+          out.get_uint32(0) # read_uint
+        end
 
         def capture_all(hwnd, &proc)
           width, height = Util.dimensions_for(hwnd)

data/lib/win32/util.rb

@@ -33,6 +33,10 @@ module Win32
           _, _, width, height = rect.unpack('L4')
           return width, height
         end
+        
+        def window_process_id(hwnd)
+          BitmapMaker.get_process_id_from_hwnd(hwnd)
+        end
 
       end
     end

data/spec/win32_screenshot_spec.rb

@@ -174,8 +174,10 @@ describe Win32::Screenshot do
   end
 
   after :all do
-    Process.kill 9, @notepad
-    Process.kill 9, @iexplore rescue nil # allow for a pre-existing IE to have been used.
-    Process.kill 9, @calc
+    for name in [/calculator/i,  /Notepad/, /Internet Explorer/] do
+      # kill them in a jruby friendly way
+      pid = Win32::Screenshot::Util.window_process_id(Win32::Screenshot::Util.window_hwnd(name))
+      system("taskkill /PID #{pid}")
+    end
   end
 end

data/spec/win32_screenshot_util_spec.rb

@@ -4,6 +4,8 @@ describe Win32::Screenshot::Util do
   include SpecHelper
 
   before :all do
+    # should not have any running calculators yet...
+    proc {Win32::Screenshot::Util.window_hwnd("Calculator") }.should raise_exception("window with title 'Calculator' was not found!")
     @calc = IO.popen("calc").pid
     wait_for_calculator_to_open
     @calc_hwnd = Win32::Screenshot::Util.window_hwnd("Calculator")
@@ -33,6 +35,9 @@ describe Win32::Screenshot::Util do
   end
   
   after :all do
-    Process.kill 9, @calc
+    # test our hwnd -> pid method
+    calc_pid = Win32::Screenshot::Util.window_process_id(@calc_hwnd)
+    system("taskkill /PID #{calc_pid}")
+    proc {Win32::Screenshot::Util.window_hwnd("Calculator") }.should raise_exception("window with title 'Calculator' was not found!")
   end
 end

data/win32screenshot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{win32screenshot}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jarmo Pertman", "Aslak Helles\303\270y"]
-  s.date = %q{2010-08-07}
+  s.date = %q{2010-08-18}
   s.description = %q{Capture Screenshots on Windows with Ruby}
   s.email = ["jarmo.p@gmail.com", "aslak.hellesoy@gmail.com"]
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jarmo/win32screenshot}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Capture Screenshots on Windows with Ruby}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<os>, [">= 0"])

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  - 3
-  version: 0.0.6.3
+  - 7
+  - 1
+  version: 0.0.7.1
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -06:00
+date: 2010-08-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency