uia 0.4.4 → 0.5

data/ChangeLog

@@ -1,3 +1,8 @@
+===	Version 0.5	/ 2014-05-26
+*	Bug Fixes
+		*	fixed issue #5 where finding by runtime_id was not working on Windows 8
+		machines
+
 ===	Version 0.4.4	/	2014-05-23
 *	Enhancements
 		*		modified how it uses the runtime_id to locate an element to use the

data/ext/UiaDll/UIA.Helper/Element.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Windows.Automation;
 
 namespace UIA.Helper
@@ -10,10 +10,6 @@ namespace UIA.Helper
     {
         private readonly AutomationElement _element;
 
-        [DllImport("user32")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        static extern bool IsWindow(IntPtr hWnd);
-
         protected Element()
         {
         }
@@ -186,13 +182,19 @@ namespace UIA.Helper
         public static Element ByRuntimeId(int[] runtimeId)
         {
             var condition = new PropertyCondition(AutomationElement.RuntimeIdProperty, runtimeId);
-            return ClosestParentOfId(runtimeId).FindFirst(TreeScope.Subtree, condition);
+
+            Element foundElement = null;
+            PotentialParentsOf(runtimeId)
+                .FirstOrDefault(x => null != (foundElement = x.FindFirst(TreeScope.Subtree, condition)));
+
+            return foundElement;
         }
 
-        private static Element ClosestParentOfId(IEnumerable<int> runtimeId)
+        private static IEnumerable<Element> PotentialParentsOf(IEnumerable<int> runtimeId)
         {
-            var parentHandle = runtimeId.FirstOrDefault(x => IsWindow(x.IntPtr())).IntPtr();
-            return IntPtr.Zero != parentHandle ? ByHandle(parentHandle) : new RootElement();
+            return runtimeId.Where(x => Win32.IsWindow(x.IntPtr()))
+                     .Select(x => ByHandle(x.IntPtr()))
+                     .Concat(new[] {new RootElement()});
         }
 
         private static Element[] Find(AutomationElement element, TreeScope scope, Condition condition)

data/ext/UiaDll/UIA.Helper/UIA.Helper.csproj

@@ -50,6 +50,7 @@
     <Compile Include="Element.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Win32.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

data/ext/UiaDll/UIA.Helper/Win32.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace UIA.Helper
+{
+    class Win32
+    {
+        [DllImport("user32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool IsWindow(IntPtr hWnd);
+    }
+}

data/lib/uia/version.rb

@@ -1,3 +1,3 @@
 module Uia
-  VERSION = '0.4.4'
+  VERSION = '0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -145,6 +145,7 @@ files:
 - ext/UiaDll/UIA.Helper/Mouse.cs
 - ext/UiaDll/UIA.Helper/Properties/AssemblyInfo.cs
 - ext/UiaDll/UIA.Helper/UIA.Helper.csproj
+- ext/UiaDll/UIA.Helper/Win32.cs
 - ext/UiaDll/UiaDll.Test/AssemblyInfo.cpp
 - ext/UiaDll/UiaDll.Test/ElementInformationTest.cpp
 - ext/UiaDll/UiaDll.Test/ElementStub.h
@@ -262,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -945145251
+      hash: -806601741
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -945145251
+      hash: -806601741
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.28