rautomation 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd70f4859a5f1f16541465e836d116265af26eb4
-  data.tar.gz: 7bae3a8bc91207cdfa3e302ffdbde778ead2ac69
+  metadata.gz: d60457345affb72ade2ec56f93991a918cb39cd8
+  data.tar.gz: d136c890f577984d093d2831aa6f19559a54a271
 SHA512:
-  metadata.gz: ea5fd4f9d351eec5ffe23f207ab5f6679d861d410adc6fe908902497195c3ce776deff5c1428afd884c9bd8ef62a1f57d11da968bad26e2ca638afaea06dc529
-  data.tar.gz: f9c6a60d917eeef6178a4fdc9f3f68d8cbd04e8ee4d6194130859036d243cb842167a68900cc2ad811659099ca682c08ccfa30763f8aa6d0a1e4a491744e9d1c
+  metadata.gz: 562a850a9175f49764a49927a6dd86666afc248065a1c9cee6e4ba739702f613777f71fbb354074b071af979b60399d4d59abe61ed3ce283bc4e188f43b3d7ca
+  data.tar.gz: a26f7646d7b025c58584906fc9808bd0eeca4321f3b3caf53f2a8fd4ab8e02b2fc50cb8b69976e6dbfb6e0438226aeaac30ba61ef584a7bfc9fa699b79490484

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rautomation (0.9.0)
+    rautomation (0.9.1)
       ffi
 
 GEM

data/History.rdoc

@@ -1,3 +1,8 @@
+== 0.9.1
+
+=== MsUia adapter
+  * Ability to interact with controls that do not have native window handles (for example WPF applications).
+
 == 0.9.0 / 2013-04-22
 
 === MsUia adapter

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/ext/UiaDll/UiaDll/AutomatedSelectList.cpp

@@ -17,6 +17,16 @@ array<String^>^ AutomatedSelectList::Selection::get() {
   return selections;
 }
 
+int AutomatedSelectList::GetOptions(const char* options[]) {
+  auto selectionItems = SelectionItems;
+
+	if( NULL != options ) {
+		StringHelper::CopyNames(selectionItems, options);
+	}
+
+	return selectionItems->Count;
+}
+
 bool AutomatedSelectList::SelectByIndex(const int whichItem)
 {
 	try {

data/ext/UiaDll/UiaDll/AutomatedSelectList.h

@@ -12,6 +12,7 @@ public:
 	bool SelectByIndex(const int whichItem);
 	bool SelectByValue(const char* whichItem);
 	bool GetValueByIndex(const int whichItem, char* comboValue, const int comboValueSize);
+  int GetOptions(const char* options[]);
 
   property array<String^>^ Selection {
     array<String^>^ get();

data/ext/UiaDll/UiaDll/AutomationClicker.cpp

@@ -1,10 +1,6 @@
 #include "StdAfx.h"
 #include "AutomationClicker.h"
 
-AutomationClicker::AutomationClicker(const HWND windowHandle) {
-	_automationElement = AutomationElement::FromHandle(IntPtr(windowHandle));
-}
-
 void AutomationClicker::Click() {
 	if( CanInvoke() ) {
 		return Invoke();
@@ -18,33 +14,33 @@ void AutomationClicker::Click() {
 }
 
 void AutomationClicker::MouseClick() {
-	_automationElement->SetFocus();
-	auto clickablePoint = _automationElement->GetClickablePoint();
-	Cursor::Position = Point((int)clickablePoint.X, (int)clickablePoint.Y);
+	_control->SetFocus();
+	auto clickablePoint = _control->GetClickablePoint();
+	Cursor::Position = System::Drawing::Point((int)clickablePoint.X, (int)clickablePoint.Y);
 	mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0);
 	mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
 }
 
 bool AutomationClicker::CanInvoke() {
-	return (bool)(_automationElement->GetCurrentPropertyValue(AutomationElement::IsInvokePatternAvailableProperty));
+	return (bool)(_control->GetCurrentPropertyValue(AutomationElement::IsInvokePatternAvailableProperty));
 }
 
 void AutomationClicker::Invoke() {
-	dynamic_cast<InvokePattern^>(_automationElement->GetCurrentPattern(InvokePattern::Pattern))->Invoke();
+	dynamic_cast<InvokePattern^>(_control->GetCurrentPattern(InvokePattern::Pattern))->Invoke();
 }
 
 bool AutomationClicker::CanToggle() {
-	return (bool)(_automationElement->GetCurrentPropertyValue(AutomationElement::IsTogglePatternAvailableProperty));
+	return (bool)(_control->GetCurrentPropertyValue(AutomationElement::IsTogglePatternAvailableProperty));
 }
 
 void AutomationClicker::Toggle() {
-	dynamic_cast<TogglePattern^>(_automationElement->GetCurrentPattern(TogglePattern::Pattern))->Toggle();
+	dynamic_cast<TogglePattern^>(_control->GetCurrentPattern(TogglePattern::Pattern))->Toggle();
 }
 
 bool AutomationClicker::CanSelect() {
-	return (bool)(_automationElement->GetCurrentPropertyValue(AutomationElement::IsSelectionItemPatternAvailableProperty));
+	return (bool)(_control->GetCurrentPropertyValue(AutomationElement::IsSelectionItemPatternAvailableProperty));
 }
 
 void AutomationClicker::Select() {
-	dynamic_cast<SelectionItemPattern^>(_automationElement->GetCurrentPattern(SelectionItemPattern::Pattern))->Select();
+	dynamic_cast<SelectionItemPattern^>(_control->GetCurrentPattern(SelectionItemPattern::Pattern))->Select();
 }

data/ext/UiaDll/UiaDll/AutomationClicker.h

@@ -3,16 +3,17 @@ using namespace System::Windows::Automation;
 using namespace System::Windows::Forms;
 using namespace System::Drawing;
 
-ref class AutomationClicker
+#include "AutomationControl.h"
+
+ref class AutomationClicker : AutomationControl
 {
 public:
-	AutomationClicker(const HWND windowHandle);
+  AutomationClicker(const HWND windowHandle) : AutomationControl(windowHandle) {}
+  AutomationClicker(const FindInformation& findInformation) : AutomationControl(findInformation) {}
 	void Click();
 	void MouseClick();
 
 private:
-	AutomationElement^	_automationElement;
-
 	bool CanInvoke();
 	void Invoke();
 

data/ext/UiaDll/UiaDll/AutomationControl.h

@@ -22,6 +22,14 @@ public:
 		String^ get() { return _control->Current.ClassName; }
 	}
 
+  property bool IsEnabled {
+    bool get() { return _control->Current.IsEnabled; }
+  }
+
+  property bool IsFocused {
+    bool get() { return _control->Current.HasKeyboardFocus; }
+  }
+
   property Rect BoundingRectangle {
     Rect get() { return _control->Current.BoundingRectangle; }
   }

data/ext/UiaDll/UiaDll/ControlMethods.cpp

@@ -3,13 +3,13 @@
 #include "StringHelper.h"
 
 extern "C" {
-	__declspec ( dllexport ) void Control_GetValue(const HWND windowHandle, char* theValue, const int maximumLength) {
-		auto control = gcnew AutomationControl(windowHandle);
+	__declspec ( dllexport ) void Control_GetValue(const FindInformation& findInformation, char* theValue, const int maximumLength) {
+		auto control = gcnew AutomationControl(findInformation);
 		StringHelper::CopyToUnmanagedString(control->Value, theValue, maximumLength);
 	}
 
-	__declspec ( dllexport ) void Control_SetValue(const HWND windowHandle, const char* theValue) {
-		auto control = gcnew AutomationControl(windowHandle);
+	__declspec ( dllexport ) void Control_SetValue(const FindInformation& findInformation, const char* theValue) {
+		auto control = gcnew AutomationControl(findInformation);
 		control->Value = gcnew String(theValue);
 	}
 }

data/ext/UiaDll/UiaDll/ExpandCollapseHelper.cpp

@@ -2,37 +2,37 @@
 #include "ExpandCollapseHelper.h"
 
 
-void ExpandCollapseHelper::ExpandByValue(const HWND windowHandle, const char* whichItem)
+void ExpandCollapseHelper::ExpandByValue(const FindInformation& findInformation, const char* whichItem)
 {
-	Expand(ExpandableItem(windowHandle, whichItem));
+	Expand(ExpandableItem(findInformation, whichItem));
 }
 
-void ExpandCollapseHelper::ExpandByIndex(const HWND windowHandle, const int whichItemIndex)
+void ExpandCollapseHelper::ExpandByIndex(const FindInformation& findInformation, const int whichItemIndex)
 {
-	auto expandableItem = ExpandableItems(windowHandle)[whichItemIndex];
+	auto expandableItem = ExpandableItems(findInformation)[whichItemIndex];
 	Expand(expandableItem);
 }
 
-void ExpandCollapseHelper::CollapseByValue(const HWND windowHandle, const char* whichItem)
+void ExpandCollapseHelper::CollapseByValue(const FindInformation& findInformation, const char* whichItem)
 {
-	Collapse(ExpandableItem(windowHandle, whichItem));
+	Collapse(ExpandableItem(findInformation, whichItem));
 }
 
-void ExpandCollapseHelper::CollapseByIndex(const HWND windowHandle, const int whichItemIndex)
+void ExpandCollapseHelper::CollapseByIndex(const FindInformation& findInformation, const int whichItemIndex)
 {
-	auto expandableItem = ExpandableItems(windowHandle)[whichItemIndex];
+	auto expandableItem = ExpandableItems(findInformation)[whichItemIndex];
 	Collapse(expandableItem);
 }
 
-AutomationElementCollection^ ExpandCollapseHelper::ExpandableItems(const HWND windowHandle)
+AutomationElementCollection^ ExpandCollapseHelper::ExpandableItems(const FindInformation& findInformation)
 {
-	auto automationElement = AutomationElement::FromHandle(IntPtr(windowHandle));
+	auto automationElement = (gcnew AutomationControl(findInformation))->Element;
 	return automationElement->FindAll(System::Windows::Automation::TreeScope::Subtree, IsExpandable);
 }
 
-AutomationElement^ ExpandCollapseHelper::ExpandableItem(const HWND windowHandle, const char* whichItem)
+AutomationElement^ ExpandCollapseHelper::ExpandableItem(const FindInformation& findInformation, const char* whichItem)
 {
-	auto automationElement = AutomationElement::FromHandle(IntPtr(windowHandle));
+	auto automationElement = (gcnew AutomationControl(findInformation))->Element;
 	auto andTheNameMatches = gcnew PropertyCondition(AutomationElement::NameProperty, gcnew String(whichItem));
 	return automationElement->FindFirst(System::Windows::Automation::TreeScope::Subtree, gcnew AndCondition(IsExpandable, andTheNameMatches));
 }

data/ext/UiaDll/UiaDll/ExpandCollapseHelper.h

@@ -1,17 +1,20 @@
 #pragma once
+
+#include "AutomationControl.h"
+
 using namespace System::Windows::Automation;
 
 ref class ExpandCollapseHelper
 {
 public:
-	void ExpandByValue(const HWND windowHandle, const char* whichItem);
-	void ExpandByIndex(const HWND windowHandle, const int whichItemIndex);
-	void CollapseByValue(const HWND windowHandle, const char* whichItem);
-	void CollapseByIndex(const HWND windowHandle, const int whichItemIndex);
+	void ExpandByValue(const FindInformation& findInformation, const char* whichItem);
+	void ExpandByIndex(const FindInformation& findInformation, const int whichItemIndex);
+	void CollapseByValue(const FindInformation& findInformation, const char* whichItem);
+	void CollapseByIndex(const FindInformation& findInformation, const int whichItemIndex);
 
 private:
-	AutomationElementCollection^ ExpandableItems(const HWND windowHandle);
-	AutomationElement^ ExpandableItem(const HWND windowHandle, const char* whichItem);
+	AutomationElementCollection^ ExpandableItems(const FindInformation& findInformation);
+	AutomationElement^ ExpandableItem(const FindInformation& findInformation, const char* whichItem);
 	void Expand(AutomationElement^ automationElement);
 	void Collapse(AutomationElement^ automationElement);
 

data/ext/UiaDll/UiaDll/SelectListMethods.cpp

@@ -8,8 +8,13 @@ extern "C" {
 		return autoSelectList->Count;
 	}
 
-	__declspec ( dllexport ) int SelectList_SelectedIndex(const HWND windowHandle) {
-		auto autoSelectList = gcnew AutomatedSelectList(windowHandle);
+  __declspec ( dllexport ) int SelectList_Options(const FindInformation& findInformation, const char* options[]) {
+    auto selectList = gcnew AutomatedSelectList(findInformation);
+    return selectList->GetOptions(options);
+  }
+
+	__declspec ( dllexport ) int SelectList_SelectedIndex(const FindInformation& findInformation) {
+		auto autoSelectList = gcnew AutomatedSelectList(findInformation);
 		return autoSelectList->SelectedIndex;
 	}
 
@@ -20,8 +25,8 @@ extern "C" {
     StringHelper::CopyToUnmanagedString(firstSelection, selection, selectionLength);
   }
 
-	__declspec ( dllexport ) bool SelectList_ValueAt(const HWND windowHandle, const int whichItem, char* comboValue, const int comboValueSize) {
-		auto autoSelectList = gcnew AutomatedSelectList(windowHandle);
+	__declspec ( dllexport ) bool SelectList_ValueAt(const FindInformation& findInformation, const int whichItem, char* comboValue, const int comboValueSize) {
+		auto autoSelectList = gcnew AutomatedSelectList(findInformation);
 		return autoSelectList->GetValueByIndex(whichItem, comboValue, comboValueSize);
 	}
 

data/ext/UiaDll/UiaDll/TableMethods.cpp

@@ -3,13 +3,13 @@
 
 extern "C" {
 
-	__declspec ( dllexport ) int Table_GetHeaders(const HWND windowHandle, const char* headers[]) {
-		auto tableControl = gcnew AutomatedTable(windowHandle);
+	__declspec ( dllexport ) int Table_GetHeaders(const FindInformation& findInformation, const char* headers[]) {
+		auto tableControl = gcnew AutomatedTable(findInformation);
 		return tableControl->GetHeaders(headers);
 	}
 
-	__declspec ( dllexport ) int Table_GetValues(const HWND windowHandle, const char* values[]) {
-		auto tableControl = gcnew AutomatedTable(windowHandle);
+	__declspec ( dllexport ) int Table_GetValues(const FindInformation& findInformation, const char* values[]) {
+		auto tableControl = gcnew AutomatedTable(findInformation);
 		return tableControl->GetValues(values);
 	}
 
@@ -18,18 +18,18 @@ extern "C" {
 		return tableControl->GetValues(values);
   }
 
-	__declspec ( dllexport ) int Table_RowCount(const HWND windowHandle) {
+	__declspec ( dllexport ) int Table_RowCount(const FindInformation& findInformation) {
 		try {
-			auto tableControl = gcnew AutomatedTable(windowHandle);
+			auto tableControl = gcnew AutomatedTable(findInformation);
 			return tableControl->RowCount;
 		} catch(Exception^ e) {
 			Console::WriteLine(e->ToString());
 		}
 	}
 
-	__declspec ( dllexport ) bool Table_CoordinateIsValid(const HWND windowHandle, const int whichItemIndex, const int whichColumnIndex) {
+	__declspec ( dllexport ) bool Table_CoordinateIsValid(const FindInformation& findInformation, const int whichItemIndex, const int whichColumnIndex) {
 		try {
-			auto tableControl = gcnew AutomatedTable(windowHandle);
+			auto tableControl = gcnew AutomatedTable(findInformation);
 			return tableControl->Exists(whichItemIndex, whichColumnIndex);
 		} catch(Exception^ e) {
 			Console::WriteLine(e->ToString());
@@ -37,9 +37,9 @@ extern "C" {
 		}
 	}
 
-	__declspec ( dllexport ) void Table_ValueAt(const HWND windowHandle, const int row, const int column, char *foundValue, const int foundValueLength) {
+	__declspec ( dllexport ) void Table_ValueAt(const FindInformation& findInformation, const int row, const int column, char *foundValue, const int foundValueLength) {
 		try {
-			auto tableControl = gcnew AutomatedTable(windowHandle);
+			auto tableControl = gcnew AutomatedTable(findInformation);
 			auto rowValue = tableControl->ValueAt(row, column);
 			StringHelper::CopyToUnmanagedString(rowValue, foundValue, foundValueLength);
 		} catch(Exception^ e) {
@@ -47,27 +47,27 @@ extern "C" {
 		}
 	}
 
-	__declspec ( dllexport ) void Table_SelectByIndex(const HWND windowHandle, const int dataItemIndex) {
+	__declspec ( dllexport ) void Table_SelectByIndex(const FindInformation& findInformation, const int dataItemIndex) {
 		try {
-			auto tableControl = gcnew AutomatedTable(windowHandle);
+			auto tableControl = gcnew AutomatedTable(findInformation);
 			tableControl->Select(dataItemIndex);
 		} catch(Exception^ e) {
 			Console::WriteLine(e->ToString());
 		}
 	}
 
-	__declspec ( dllexport ) bool Table_IsSelectedByIndex(const HWND windowHandle, const int dataItemIndex) {
+	__declspec ( dllexport ) bool Table_IsSelectedByIndex(const FindInformation& findInformation, const int dataItemIndex) {
 		try {
-			auto tableControl = gcnew AutomatedTable(windowHandle);
+			auto tableControl = gcnew AutomatedTable(findInformation);
 			return tableControl->IsSelected(dataItemIndex);
 		} catch(Exception^ e) {
 			Console::WriteLine(e->ToString());
 		}
 	}
 
-	__declspec ( dllexport ) void Table_SelectByValue(const HWND windowHandle, const char* dataItemValue) {
+	__declspec ( dllexport ) void Table_SelectByValue(const FindInformation& findInformation, const char* dataItemValue) {
 		try {
-			auto tableControl = gcnew AutomatedTable(windowHandle);
+			auto tableControl = gcnew AutomatedTable(findInformation);
 			tableControl->Select(dataItemValue);
 		} catch(Exception^ e) {
 			Console::WriteLine(e->ToString());

data/ext/UiaDll/UiaDll/UiaDll.cpp

@@ -14,12 +14,12 @@ IUIAutomation* getGlobalIUIAutomation() ;
 
 extern "C" {
 
-	__declspec ( dllexport ) bool ElementExists(const FindInformation& findInformation) {
-        auto automationElement = gcnew AutomationControl(findInformation);
-        return automationElement->Exists;
-	}
+  __declspec ( dllexport ) bool ElementExists(const FindInformation& findInformation) {
+    auto automationElement = gcnew AutomationControl(findInformation);
+    return automationElement->Exists;
+  }
 
-	__declspec ( dllexport ) int BoundingRectangle(const FindInformation& findInformation, long *rectangle) {
+  __declspec ( dllexport ) int BoundingRectangle(const FindInformation& findInformation, long *rectangle) {
     try {
       auto automationElement = gcnew AutomationControl(findInformation);
       auto boundary = automationElement->BoundingRectangle;
@@ -34,9 +34,9 @@ extern "C" {
       Console::WriteLine("BoundingRectangle:  {0}", e->Message);
       return 0;
     }
-	}
+  }
 
-	__declspec ( dllexport ) int ControlType(const FindInformation& findInformation) {
+  __declspec ( dllexport ) int ControlType(const FindInformation& findInformation) {
     try {
       auto automationElement = gcnew AutomationControl(findInformation);
       return automationElement->ControlType->Id;
@@ -44,7 +44,7 @@ extern "C" {
       Console::WriteLine("ControlType:  {0}", e->Message);
       return 0;
     }
-	}
+  }
 
   __declspec ( dllexport ) int ProcessId(const FindInformation& findInformation) {
     try {
@@ -57,21 +57,49 @@ extern "C" {
   }
 
   __declspec ( dllexport ) void Name(const FindInformation& findInformation, char* name, const int nameLength) {
-		try {
-			auto control = gcnew AutomationControl(findInformation);
-			StringHelper::CopyToUnmanagedString(control->Name, name, nameLength);
-		} catch(Exception^ e) {
+    try {
+      auto control = gcnew AutomationControl(findInformation);
+      StringHelper::CopyToUnmanagedString(control->Name, name, nameLength);
+    } catch(Exception^ e) {
       Console::WriteLine("Name:  {0}", e->Message);
-		}
+    }
   }
 
   __declspec ( dllexport ) void ClassName(const FindInformation& findInformation, char* className, const int classNameLength) {
-		try {
-			auto control = gcnew AutomationControl(findInformation);
-			StringHelper::CopyToUnmanagedString(control->ClassName, className, classNameLength);
-		} catch(Exception^ e) {
+    try {
+      auto control = gcnew AutomationControl(findInformation);
+      StringHelper::CopyToUnmanagedString(control->ClassName, className, classNameLength);
+    } catch(Exception^ e) {
       Console::WriteLine("ClassName:  {0}", e->Message);
-		}
+    }
+  }
+
+  __declspec ( dllexport ) bool IsEnabled(const FindInformation& findInformation) {
+    try {
+      return (gcnew AutomationControl(findInformation))->IsEnabled;
+    } catch(Exception^ e) {
+      Console::WriteLine("IsEnabled:  {0}", e->Message);
+      return false;
+    }
+  }
+
+  __declspec ( dllexport ) bool IsFocused(const FindInformation& findInformation) {
+    try {
+      return (gcnew AutomationControl(findInformation))->IsFocused;
+    } catch(Exception^ e) {
+      Console::WriteLine("IsFocused:  {0}", e->Message);
+      return false;
+    }
+  }
+
+  __declspec ( dllexport ) bool SetControlFocus(const FindInformation& findInformation) {
+    try {
+      (gcnew AutomationControl(findInformation))->Element->SetFocus();
+      return true;
+    } catch(Exception^ e) {
+      Console::WriteLine("IsFocused:  {0}", e->Message);
+      return false;
+    }
   }
 
   __declspec ( dllexport ) int GetClassNames(const FindInformation& findInformation, const char* classNames[]) {
@@ -87,173 +115,165 @@ extern "C" {
     return allChildren->Count;
   }
 
-	__declspec ( dllexport ) IUIAutomationElement *RA_ElementFromHandle(HWND hwnd) {
-		IUIAutomationElement *pElement ;
-
-		HRESULT hr = getGlobalIUIAutomation()->ElementFromHandle(hwnd, &pElement) ;
-		if (SUCCEEDED(hr))
-			return pElement ;
-		else {
-			printf("RA_ElementFromHandle: Cannot find element from handle 0x%x. HRESULT was 0x%x\r\n", hwnd, hr) ;
-			return NULL ;
-		}
-	}
-
-	__declspec ( dllexport ) IUIAutomationElement *RA_ElementFromPoint(int xCoord, int yCoord) {
-		IUIAutomationElement *pElement ;
-		POINT point;
-
-		point.x = xCoord;
-		point.y = yCoord;
-
-		HRESULT hr = getGlobalIUIAutomation()->ElementFromPoint(point, &pElement) ;
-		if (SUCCEEDED(hr))
-			return pElement ;
-		else {
-			printf("RA_ElementFromPoint: Cannot find element from point %d , %d. HRESULT was 0x%x\r\n", xCoord, yCoord, hr) ;
-			return NULL ;
-		}
-	}
-
-	__declspec ( dllexport ) IUIAutomationElement *RA_FindChildById(IUIAutomationElement *pElement, char *automationId) {
-		IUIAutomationCondition *pCondition ;
-		VARIANT varProperty ;
-
-		VariantInit(&varProperty) ;
-		varProperty.vt = VT_BSTR ;
-		varProperty.bstrVal = _bstr_t(automationId) ;
-
-		HRESULT hr = getGlobalIUIAutomation()->CreatePropertyCondition(UIA_AutomationIdPropertyId, varProperty, &pCondition) ;
-		if (SUCCEEDED(hr)) {
-			IUIAutomationElement *pFound ;
-
-			hr = pElement->FindFirst(TreeScope_Descendants, pCondition, &pFound) ;
-			if (SUCCEEDED(hr)) {
-				if (pFound == NULL)
-					printf("RA_FindChildById: Element with automation id %s was not found\r\n", automationId) ;
-
-				return pFound ;
-			} else {
-				printf("RA_FindChildById: FindFirst for children looking for %s failed. hr = 0x%x\r\n", automationId, hr) ;
-				return NULL ;
-			}
-		} else {
-			printf("RA_FindChildById: Cannot create search condition. hr = 0x%x\r\n", hr) ;
-			return NULL ;
-		}
-	}
-
-	__declspec ( dllexport ) HWND RA_CurrentNativeWindowHandle(IUIAutomationElement *pElement) {
-		UIA_HWND uia_hwnd ;
-
-		if (pElement == NULL) {
-			printf("RA_CurrentNativeWindowHandle: Cannot operate on NULL element\r\n") ;
-			return (HWND)0 ;
-		}
-
-		pElement->get_CurrentNativeWindowHandle(&uia_hwnd) ;
-		return (HWND)uia_hwnd ;
-	}
-
-	__declspec ( dllexport ) BOOL RA_SetFocus(IUIAutomationElement *pElement) {
-		HRESULT hr = pElement->SetFocus() ;
-		if (hr != S_OK)
-			printf("RA_SetFocus: SetFocus on element returned 0x%x\r\n", hr) ;
-
-		return SUCCEEDED(hr) ;
-	}
-
-	__declspec ( dllexport ) int RA_GetCurrentControlType(IUIAutomationElement *pElement) {
-		CONTROLTYPEID control_type ;
-
-		HRESULT hr = pElement->get_CurrentControlType(&control_type) ;
-		if (SUCCEEDED(hr))
-			return control_type ;
-		else {
-			printf("RA_GetCurrentControlType: CurrentControlType returned 0x%x\r\n", hr) ;
-			return 0 ;
-		}
-	}
-
-	__declspec ( dllexport ) long RA_ClickMouse() {
-		mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0);
-		mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
-		return 0;
-	}
-
-	__declspec ( dllexport ) long RA_MoveMouse(int x, int y) {
-		return SetCursorPos(x,y);
-	}
-
-	__declspec ( dllexport ) int RA_CurrentIsOffscreen(IUIAutomationElement *pElement, int *visible) {
-		BOOL offscreen;
-
-		HRESULT hr = pElement->get_CurrentIsOffscreen(&offscreen) ;
-		if (SUCCEEDED(hr)) {
-			if(offscreen){
-				*visible = 1;
-			}
-			else
-			{
-				*visible = 0;
-			}
-			return 1;
-		}
-		else {
-			printf("RA_CurrentIsOffscreen: get_CurrentIsOffscreen failed 0x%x\r\n", hr) ;
-			return 0 ;
-		}
-	}
-
-	__declspec ( dllexport ) int RA_FindChildren(IUIAutomationElement *pElement, IUIAutomationElement *pChildren[]) {
-		IUIAutomationCondition *pTrueCondition ;
-		IUIAutomationElementArray *pElementArray ;
-		int element_count ;
-
-		HRESULT hr = getGlobalIUIAutomation()->CreateTrueCondition(&pTrueCondition) ;
-		if (FAILED(hr)) {
-			printf("RA_FindChildren: Could not create true condition 0x%x\r\n", hr) ;
-			return 0 ;
-		}
-
-		hr = pElement->FindAll(TreeScope_Children, pTrueCondition, &pElementArray) ;
-		if (FAILED(hr)) {
-			printf("RA_FindChildren: FindAll failed 0x%x\r\n", hr) ;
-			return 0 ;
-		}
-
-		hr = pElementArray->get_Length(&element_count) ;
-		if (FAILED(hr)) {
-			printf("RA_FindChildren: get_length failed 0x%x\r\n", hr) ;
-			return 0 ;
-		}
-
-		if (pChildren != NULL) {
-			// given some memory get the details
-			for (int index = 0; index < element_count; index++) {
-				IUIAutomationElement *pElement ;
-
-				hr = pElementArray->GetElement(index, &pElement) ;
-				if (FAILED(hr)) {
-					printf("RA_FindChildren: GetElement failed 0x%x\r\n", hr) ;
-				} else {
-					pChildren[index] = pElement ;
-				}
-			}
-		}
-
-		return element_count ;
-	}
-
-	__declspec ( dllexport ) bool RA_GetControlName(const HWND windowHandle, char* windowName, const int windowNameLength) {
-		try {
-			auto control = gcnew AutomationControl(windowHandle);
-			StringHelper::CopyToUnmanagedString(control->Name, windowName, windowNameLength);
-			return true;
-		} catch(Exception^ e) {
-			return false;
-		}
-	}
+  __declspec ( dllexport ) IUIAutomationElement *RA_ElementFromHandle(HWND hwnd) {
+    IUIAutomationElement *pElement ;
+
+    HRESULT hr = getGlobalIUIAutomation()->ElementFromHandle(hwnd, &pElement) ;
+    if (SUCCEEDED(hr))
+      return pElement ;
+    else {
+      printf("RA_ElementFromHandle: Cannot find element from handle 0x%x. HRESULT was 0x%x\r\n", hwnd, hr) ;
+      return NULL ;
+    }
+  }
+
+  __declspec ( dllexport ) IUIAutomationElement *RA_ElementFromPoint(int xCoord, int yCoord) {
+    IUIAutomationElement *pElement ;
+    POINT point;
+
+    point.x = xCoord;
+    point.y = yCoord;
+
+    HRESULT hr = getGlobalIUIAutomation()->ElementFromPoint(point, &pElement) ;
+    if (SUCCEEDED(hr))
+      return pElement ;
+    else {
+      printf("RA_ElementFromPoint: Cannot find element from point %d , %d. HRESULT was 0x%x\r\n", xCoord, yCoord, hr) ;
+      return NULL ;
+    }
+  }
+
+  __declspec ( dllexport ) IUIAutomationElement *RA_FindChildById(IUIAutomationElement *pElement, char *automationId) {
+    IUIAutomationCondition *pCondition ;
+    VARIANT varProperty ;
+
+    VariantInit(&varProperty) ;
+    varProperty.vt = VT_BSTR ;
+    varProperty.bstrVal = _bstr_t(automationId) ;
+
+    HRESULT hr = getGlobalIUIAutomation()->CreatePropertyCondition(UIA_AutomationIdPropertyId, varProperty, &pCondition) ;
+    if (SUCCEEDED(hr)) {
+      IUIAutomationElement *pFound ;
+
+      hr = pElement->FindFirst(TreeScope_Descendants, pCondition, &pFound) ;
+      if (SUCCEEDED(hr)) {
+        if (pFound == NULL)
+          printf("RA_FindChildById: Element with automation id %s was not found\r\n", automationId) ;
+
+        return pFound ;
+      } else {
+        printf("RA_FindChildById: FindFirst for children looking for %s failed. hr = 0x%x\r\n", automationId, hr) ;
+        return NULL ;
+      }
+    } else {
+      printf("RA_FindChildById: Cannot create search condition. hr = 0x%x\r\n", hr) ;
+      return NULL ;
+    }
+  }
+
+  __declspec ( dllexport ) HWND RA_CurrentNativeWindowHandle(IUIAutomationElement *pElement) {
+    UIA_HWND uia_hwnd ;
+
+    if (pElement == NULL) {
+      printf("RA_CurrentNativeWindowHandle: Cannot operate on NULL element\r\n") ;
+      return (HWND)0 ;
+    }
+
+    pElement->get_CurrentNativeWindowHandle(&uia_hwnd) ;
+    return (HWND)uia_hwnd ;
+  }
+
+  __declspec ( dllexport ) int RA_GetCurrentControlType(IUIAutomationElement *pElement) {
+    CONTROLTYPEID control_type ;
+
+    HRESULT hr = pElement->get_CurrentControlType(&control_type) ;
+    if (SUCCEEDED(hr))
+      return control_type ;
+    else {
+      printf("RA_GetCurrentControlType: CurrentControlType returned 0x%x\r\n", hr) ;
+      return 0 ;
+    }
+  }
+
+  __declspec ( dllexport ) long RA_ClickMouse() {
+    mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0);
+    mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
+    return 0;
+  }
+
+  __declspec ( dllexport ) long RA_MoveMouse(int x, int y) {
+    return SetCursorPos(x,y);
+  }
+
+  __declspec ( dllexport ) int RA_CurrentIsOffscreen(IUIAutomationElement *pElement, int *visible) {
+    BOOL offscreen;
+
+    HRESULT hr = pElement->get_CurrentIsOffscreen(&offscreen) ;
+    if (SUCCEEDED(hr)) {
+      if(offscreen){
+        *visible = 1;
+      }
+      else
+      {
+        *visible = 0;
+      }
+      return 1;
+    }
+    else {
+      printf("RA_CurrentIsOffscreen: get_CurrentIsOffscreen failed 0x%x\r\n", hr) ;
+      return 0 ;
+    }
+  }
+
+  __declspec ( dllexport ) int RA_FindChildren(IUIAutomationElement *pElement, IUIAutomationElement *pChildren[]) {
+    IUIAutomationCondition *pTrueCondition ;
+    IUIAutomationElementArray *pElementArray ;
+    int element_count ;
+
+    HRESULT hr = getGlobalIUIAutomation()->CreateTrueCondition(&pTrueCondition) ;
+    if (FAILED(hr)) {
+      printf("RA_FindChildren: Could not create true condition 0x%x\r\n", hr) ;
+      return 0 ;
+    }
+
+    hr = pElement->FindAll(TreeScope_Children, pTrueCondition, &pElementArray) ;
+    if (FAILED(hr)) {
+      printf("RA_FindChildren: FindAll failed 0x%x\r\n", hr) ;
+      return 0 ;
+    }
+
+    hr = pElementArray->get_Length(&element_count) ;
+    if (FAILED(hr)) {
+      printf("RA_FindChildren: get_length failed 0x%x\r\n", hr) ;
+      return 0 ;
+    }
+
+    if (pChildren != NULL) {
+      // given some memory get the details
+      for (int index = 0; index < element_count; index++) {
+        IUIAutomationElement *pElement ;
+
+        hr = pElementArray->GetElement(index, &pElement) ;
+        if (FAILED(hr)) {
+          printf("RA_FindChildren: GetElement failed 0x%x\r\n", hr) ;
+        } else {
+          pChildren[index] = pElement ;
+        }
+      }
+    }
+
+    return element_count ;
+  }
+
+  __declspec ( dllexport ) bool RA_GetControlName(const HWND windowHandle, char* windowName, const int windowNameLength) {
+    try {
+      auto control = gcnew AutomationControl(windowHandle);
+      StringHelper::CopyToUnmanagedString(control->Name, windowName, windowNameLength);
+      return true;
+    } catch(Exception^ e) {
+      return false;
+    }
+  }
 
   __declspec ( dllexport ) bool IsSet(const FindInformation& findInformation) {
     try {
@@ -275,78 +295,78 @@ extern "C" {
     }
   }
 
-	__declspec ( dllexport ) int RA_Select(IUIAutomationElement *pElement) {
-		ISelectionItemProvider *pSelectionPattern ;
-		HRESULT hr = pElement->GetCurrentPattern(UIA_SelectionItemPatternId, (IUnknown**)&pSelectionPattern) ;
-		if (FAILED(hr)) {
-			printf("RA_GetIsSelected: getCurrentPattern failed 0x%x\r\n") ;
-			return FALSE ;
-		}
-
-		hr = pSelectionPattern->Select();
-		if (FAILED(hr)) {
-			printf("RA_Select: Select failed 0x%x\r\n", hr) ;
-			return 0 ;
-		}
-
-		return 1;
-	}
-
-	__declspec ( dllexport ) void RA_Click(const HWND windowHandle, char* errorInfo, const int errorInfoSize) {
-		try {
-			auto automationClicker = gcnew AutomationClicker(windowHandle);
-			automationClicker->Click();
-		} catch(Exception^ e) {
-			if( errorInfo ) {
-				StringHelper::CopyToUnmanagedString(e->ToString(), errorInfo, errorInfoSize);
-			}
-		}
-	}
-
-	__declspec ( dllexport ) void RA_PointAndClick(const HWND windowHandle, char* errorInfo, const int errorInfoSize) {
-		try {
-			auto automationClicker = gcnew AutomationClicker(windowHandle);
-			automationClicker->MouseClick();
-		} catch(Exception^ e) {
-			if( errorInfo ) {
-				StringHelper::CopyToUnmanagedString(e->ToString(), errorInfo, errorInfoSize);
-			}
-		}
-	}
-
-	__declspec ( dllexport ) void RA_ExpandItemByValue(const HWND windowHandle, const char* whichItem) {
-		try {
-			auto expandCollapseHelper = gcnew ExpandCollapseHelper();
-			expandCollapseHelper->ExpandByValue(windowHandle, whichItem);
-		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
-		}
-	}
-
-	__declspec ( dllexport ) void RA_ExpandItemByIndex(const HWND windowHandle, const int whichItemIndex) {
-		try {
-			auto expandCollapseHelper = gcnew ExpandCollapseHelper();
-			expandCollapseHelper->ExpandByIndex(windowHandle, whichItemIndex);
-		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
-		}
-	}
-
-	__declspec ( dllexport ) void RA_CollapseItemByValue(const HWND windowHandle, const char* whichItem) {
-		try {
-			auto expandCollapseHelper = gcnew ExpandCollapseHelper();
-			expandCollapseHelper->CollapseByValue(windowHandle, whichItem);
-		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
-		}
-	}
-
-	__declspec ( dllexport ) void RA_CollapseItemByIndex(const HWND windowHandle, const int whichItemIndex) {
-		try {
-			auto expandCollapseHelper = gcnew ExpandCollapseHelper();
-			expandCollapseHelper->CollapseByIndex(windowHandle, whichItemIndex);
-		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
-		}
-	}
+  __declspec ( dllexport ) int RA_Select(IUIAutomationElement *pElement) {
+    ISelectionItemProvider *pSelectionPattern ;
+    HRESULT hr = pElement->GetCurrentPattern(UIA_SelectionItemPatternId, (IUnknown**)&pSelectionPattern) ;
+    if (FAILED(hr)) {
+      printf("RA_GetIsSelected: getCurrentPattern failed 0x%x\r\n") ;
+      return FALSE ;
+    }
+
+    hr = pSelectionPattern->Select();
+    if (FAILED(hr)) {
+      printf("RA_Select: Select failed 0x%x\r\n", hr) ;
+      return 0 ;
+    }
+
+    return 1;
+  }
+
+  __declspec ( dllexport ) void RA_Click(const FindInformation& findInformation, char* errorInfo, const int errorInfoSize) {
+    try {
+      auto automationClicker = gcnew AutomationClicker(findInformation);
+      automationClicker->Click();
+    } catch(Exception^ e) {
+      if( errorInfo ) {
+        StringHelper::CopyToUnmanagedString(e->ToString(), errorInfo, errorInfoSize);
+      }
+    }
+  }
+
+  __declspec ( dllexport ) void RA_PointAndClick(const HWND windowHandle, char* errorInfo, const int errorInfoSize) {
+    try {
+      auto automationClicker = gcnew AutomationClicker(windowHandle);
+      automationClicker->MouseClick();
+    } catch(Exception^ e) {
+      if( errorInfo ) {
+        StringHelper::CopyToUnmanagedString(e->ToString(), errorInfo, errorInfoSize);
+      }
+    }
+  }
+
+  __declspec ( dllexport ) void RA_ExpandItemByValue(const FindInformation& findInformation, const char* whichItem) {
+    try {
+      auto expandCollapseHelper = gcnew ExpandCollapseHelper();
+      expandCollapseHelper->ExpandByValue(findInformation, whichItem);
+    } catch(Exception^ e) {
+      Console::WriteLine(e->ToString());
+    }
+  }
+
+  __declspec ( dllexport ) void RA_ExpandItemByIndex(const FindInformation& findInformation, const int whichItemIndex) {
+    try {
+      auto expandCollapseHelper = gcnew ExpandCollapseHelper();
+      expandCollapseHelper->ExpandByIndex(findInformation, whichItemIndex);
+    } catch(Exception^ e) {
+      Console::WriteLine(e->ToString());
+    }
+  }
+
+  __declspec ( dllexport ) void RA_CollapseItemByValue(const FindInformation& findInformation, const char* whichItem) {
+    try {
+      auto expandCollapseHelper = gcnew ExpandCollapseHelper();
+      expandCollapseHelper->CollapseByValue(findInformation, whichItem);
+    } catch(Exception^ e) {
+      Console::WriteLine(e->ToString());
+    }
+  }
+
+  __declspec ( dllexport ) void RA_CollapseItemByIndex(const FindInformation& findInformation, const int whichItemIndex) {
+    try {
+      auto expandCollapseHelper = gcnew ExpandCollapseHelper();
+      expandCollapseHelper->CollapseByIndex(findInformation, whichItemIndex);
+    } catch(Exception^ e) {
+      Console::WriteLine(e->ToString());
+    }
+  }
 }