uia 0.4.2 → 0.4.3

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

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Windows.Automation;
 
 namespace UIA.Helper
@@ -8,11 +10,15 @@ namespace UIA.Helper
     {
         private readonly AutomationElement _element;
 
+        [DllImport("user32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        static extern bool IsWindow(IntPtr hWnd);
+
         protected Element()
         {
         }
 
-        private Element(AutomationElement element)
+        protected Element(AutomationElement element)
         {
             _element = element;
         }
@@ -179,7 +185,14 @@ namespace UIA.Helper
 
         public static Element ByRuntimeId(int[] runtimeId)
         {
-            return FindFirst(new PropertyCondition(AutomationElement.RuntimeIdProperty, runtimeId), TreeScope.Descendants);
+            var condition = new PropertyCondition(AutomationElement.RuntimeIdProperty, runtimeId);
+            return ClosestParentOfId(runtimeId).FindFirst(TreeScope.Subtree, condition);
+        }
+
+        private static Element ClosestParentOfId(IEnumerable<int> runtimeId)
+        {
+            var parentHandle = runtimeId.LastOrDefault(x => IsWindow(x.IntPtr())).IntPtr();
+            return IntPtr.Zero != parentHandle ? ByHandle(parentHandle) : new RootElement();
         }
 
         private static Element[] Find(AutomationElement element, TreeScope scope, Condition condition)
@@ -199,4 +212,10 @@ namespace UIA.Helper
             return null == automationElement ? null : new Element(automationElement);
         }
     }
+
+    class RootElement : Element
+    {
+        public RootElement() : base(AutomationElement.RootElement)
+        { }
+    }
 }

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

@@ -21,6 +21,11 @@ namespace UIA.Helper
 
             return new Point(rectangle.Left + rectangle.Width / 2, rectangle.Top + rectangle.Height / 2);
         }
+
+        public static IntPtr IntPtr(this int value)
+        {
+            return new IntPtr(value);
+        }
     }
 
     public static class PropertyExtensions

data/ext/UiaDll/UiaDll.Test/ElementInformationTest.cpp

@@ -59,7 +59,7 @@ TEST_F(ElementInformationTest, ItKnowsTheWindowHandle)
   auto element = gcnew ElementStub("");
   element->NativeWindowHandle = 12345;
 
-  ASSERT_EQ(ElementInformation(element).nativeWindowHandle, 12345);
+  ASSERT_EQ(ElementInformation(element).handle, 12345);
 }
 
 TEST_F(ElementInformationTest, ItKnowsTheControlType)
@@ -116,7 +116,7 @@ TEST_F(ElementInformationTest, ItCanBeRefreshed)
   const int expectedId[] = {46, 2};
   ASSERT_THAT(expectedId, ::testing::ElementsAreArray(elementInformation.runtimeId, elementInformation.runtimeIdLength));
   ASSERT_STREQ("Refreshed", elementInformation.name);
-  ASSERT_EQ(123, elementInformation.nativeWindowHandle);
+  ASSERT_EQ(123, elementInformation.handle);
 }
 
 TEST_F(ElementInformationTest, ItCanBeInitializedFromManyElements) {
@@ -203,7 +203,7 @@ TEST(ElementInformation, ToString_HasName)
 TEST(ElementInformation, ToString_HasHandle)
 {
   ElementInformation el;
-  el.nativeWindowHandle = 0x123;
+  el.handle = 0x123;
   ASSERT_EXPECTED_EL_TO_STRING("id: (null), name: (null), handle: 0x123, runtime_id: (null)");
 }
 
@@ -221,7 +221,7 @@ TEST(ElementInformation, ToString_AllTheThings)
   ElementInformation el;
   el.name = StringHelper::ToUnmanaged("someName");
   el.id = StringHelper::ToUnmanaged("someId");
-  el.nativeWindowHandle = 0xffff;
+  el.handle = 0xffff;
   el.runtimeId = new int[1];
   el.runtimeId[0] = 42789;
   el.runtimeIdLength = 1;

data/ext/UiaDll/UiaDll.Test/ElementStub.h

@@ -73,8 +73,8 @@ public:
 
   virtual property int NativeWindowHandle
   {
-    int get() override { return _nativeWindowHandle; }
-    void set(int value) { _nativeWindowHandle = value; }
+    int get() override { return _handle; }
+    void set(int value) { _handle = value; }
   }
 
   virtual property int ControlTypeId
@@ -100,7 +100,7 @@ private:
   String^ _id;
   array<int>^ _runtimeIds;
   array<int>^ _patterns;
-  int _nativeWindowHandle;
+  int _handle;
   int _controlTypeId;
   bool _isEnabled;
   bool _isVisible;

data/ext/UiaDll/UiaDll/ElementMethods.cpp

@@ -8,8 +8,8 @@ extern "C" {
     Element^ foundElement = nullptr;
 
     try {
-      if( element->nativeWindowHandle > 0 ) {
-        foundElement = Element::ByHandle(IntPtr(element->nativeWindowHandle));
+      if( element->handle > 0 ) {
+        foundElement = Element::ByHandle(IntPtr(element->handle));
       } else {
         foundElement = Element::ByRuntimeId(ArrayHelper::ToArray(element->runtimeId, element->runtimeIdLength));
       }

data/ext/UiaDll/UiaDll/ElementStructures.h

@@ -4,7 +4,7 @@
 #include <stdio.h>
 
 typedef struct _ElementInformation {
-  int nativeWindowHandle;
+  int handle;
   int* runtimeId;
   int runtimeIdLength;
   char* name;
@@ -20,9 +20,9 @@ typedef struct _ElementInformation {
   bool hasKeyboardFocus;
   long boundingRectangle[4];
 
-  _ElementInformation() : name(NULL), nativeWindowHandle(0), runtimeId(NULL), patterns(NULL), id(NULL), className(NULL), helpText(NULL) {}
+  _ElementInformation() : name(NULL), handle(0), runtimeId(NULL), patterns(NULL), id(NULL), className(NULL), helpText(NULL) {}
 
-  _ElementInformation(Element^ element) : name(NULL), nativeWindowHandle(0), runtimeId(NULL), patterns(NULL), id(NULL), className(NULL), helpText(NULL) {
+  _ElementInformation(Element^ element) : name(NULL), handle(0), runtimeId(NULL), patterns(NULL), id(NULL), className(NULL), helpText(NULL) {
     Refresh(element);
   }
 
@@ -55,7 +55,7 @@ typedef struct _ElementInformation {
       id = StringHelper::ToUnmanaged(element->Id);
       name = StringHelper::ToUnmanaged(element->Name);
       className = StringHelper::ToUnmanaged(element->ClassName);
-      nativeWindowHandle = element->NativeWindowHandle;
+      handle = element->NativeWindowHandle;
       runtimeId = ArrayHelper::FromArray(element->RuntimeId);
       runtimeIdLength = element->RuntimeId->Length;
       controlTypeId = element->ControlTypeId;
@@ -81,7 +81,7 @@ typedef struct _ElementInformation {
   const int ToString(char* s, const int length) {
     const char* format = "id: %s, name: %s, handle: 0x%x, runtime_id: %s";
     auto runtimeIdString = RuntimeIdString();
-    auto neededLength = _snprintf(s, length, format, id, name, nativeWindowHandle, runtimeIdString) + 1;
+    auto neededLength = _snprintf(s, length, format, id, name, handle, runtimeIdString) + 1;
     delete[] runtimeIdString;
     return neededLength;
   }

data/lib/uia/version.rb

@@ -1,3 +1,3 @@
 module Uia
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -370470925
+      hash: 795502381
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -370470925
+      hash: 795502381
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.28