Attachment 323543 Details for Bug 489387

[patch] Untested patch

AutomationElementFromHandle.patch (text/plain), 12.37 KB, created by Sanford Armstrong on 2009-10-21 21:16:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sanford Armstrong

Created: 2009-10-21 21:16:19 UTC

Size: 12.37 KB

patch

obsolete

>diff --git a/UIAutomation/UIAutomationClient/System.Windows.Automation/AutomationElement.cs b/UIAutomation/UIAutomationClient/System.Windows.Automation/AutomationElement.cs
>index 80c19ed..4b176b8 100644
>--- a/UIAutomation/UIAutomationClient/System.Windows.Automation/AutomationElement.cs
>+++ b/UIAutomation/UIAutomationClient/System.Windows.Automation/AutomationElement.cs
>@@ -455,7 +455,15 @@ namespace System.Windows.Automation
> #region Public Static Methods
> 		public static AutomationElement FromHandle (IntPtr hwnd)
> 		{
>-			throw new NotImplementedException ();
>+			AutomationElement element = null;
>+			foreach (var source in SourceManager.GetAutomationSources ()) {
>+				var sourceElement = source.GetElementFromHandle (hwnd);
>+				if (sourceElement != null) {
>+					element = SourceManager.GetOrCreateAutomationElement (sourceElement);
>+					break;
>+				}
>+			}
>+			return element;
> 		}
> 
> 		public static AutomationElement FromLocalProvider (IRawElementProviderSimple localImpl)
>diff --git a/UIAutomation/UIAutomationSource/Mono.UIAutomation.Source/IAutomationSource.cs b/UIAutomation/UIAutomationSource/Mono.UIAutomation.Source/IAutomationSource.cs
>index 5f86310..cf71ee5 100644
>--- a/UIAutomation/UIAutomationSource/Mono.UIAutomation.Source/IAutomationSource.cs
>+++ b/UIAutomation/UIAutomationSource/Mono.UIAutomation.Source/IAutomationSource.cs
>@@ -34,6 +34,8 @@ namespace Mono.UIAutomation.Source
> 		void Initialize ();
> 
> 		IElement [] GetRootElements ();
>+		
>+		IElement GetElementFromHandle (IntPtr handle);
> 
> 		bool IsAccessibilityEnabled { get; }
> 
>diff --git a/UIAutomationWinforms/UIAutomationWinformsClientTests/DataGridApplication/DataGridApplication.csproj b/UIAutomationWinforms/UIAutomationWinformsClientTests/DataGridApplication/DataGridApplication.csproj
>index d6ce156..f922e74 100644
>--- a/UIAutomationWinforms/UIAutomationWinformsClientTests/DataGridApplication/DataGridApplication.csproj
>+++ b/UIAutomationWinforms/UIAutomationWinformsClientTests/DataGridApplication/DataGridApplication.csproj
>@@ -1,5 +1,5 @@
>-ï»¿<?xml version="1.0" encoding="utf-8"?>
>-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
>   <PropertyGroup>
>     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
>     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
>@@ -12,8 +12,6 @@
>     <AssemblyName>datagrid</AssemblyName>
>     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
>     <FileAlignment>512</FileAlignment>
>-    <StartupObject>
>-    </StartupObject>
>   </PropertyGroup>
>   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
>     <DebugSymbols>true</DebugSymbols>
>@@ -44,7 +42,6 @@
>       <RequiredTargetFramework>3.5</RequiredTargetFramework>
>     </Reference>
>     <Reference Include="System.Data" />
>-    <Reference Include="System.Deployment" />
>     <Reference Include="System.Drawing" />
>     <Reference Include="System.Windows.Forms" />
>     <Reference Include="System.Xml" />
>@@ -63,22 +60,17 @@
>       <SubType>Designer</SubType>
>     </EmbeddedResource>
>     <EmbeddedResource Include="Properties\Resources.resx">
>-      <Generator>ResXFileCodeGenerator</Generator>
>-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
>       <SubType>Designer</SubType>
>+      <Generator>ResXFileCodeGenerator</Generator>
>     </EmbeddedResource>
>     <Compile Include="Properties\Resources.Designer.cs">
>-      <AutoGen>True</AutoGen>
>       <DependentUpon>Resources.resx</DependentUpon>
>     </Compile>
>     <None Include="Properties\Settings.settings">
>       <Generator>SettingsSingleFileGenerator</Generator>
>-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
>     </None>
>     <Compile Include="Properties\Settings.Designer.cs">
>-      <AutoGen>True</AutoGen>
>       <DependentUpon>Settings.settings</DependentUpon>
>-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
>     </Compile>
>   </ItemGroup>
>   <ItemGroup>
>@@ -87,7 +79,7 @@
>       <Name>DataGridAssembly</Name>
>     </ProjectReference>
>   </ItemGroup>
>-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
>+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
>   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
>        Other similar extension points exist, see Microsoft.Common.targets.
>   <Target Name="BeforeBuild">
>diff --git a/UIAutomationWinforms/UIAutomationWinformsClientTests/HelpProviderTest.cs b/UIAutomationWinforms/UIAutomationWinformsClientTests/HelpProviderTest.cs
>index 7bff780..c4c82f1 100644
>--- a/UIAutomationWinforms/UIAutomationWinformsClientTests/HelpProviderTest.cs
>+++ b/UIAutomationWinforms/UIAutomationWinformsClientTests/HelpProviderTest.cs
>@@ -1,4 +1,4 @@
>-ï»¿// Permission is hereby granted, free of charge, to any person obtaining 
>+// Permission is hereby granted, free of charge, to any person obtaining 
> // a copy of this software and associated documentation files (the 
> // "Software"), to deal in the Software without restriction, including 
> // without limitation the rights to use, copy, modify, merge, publish, 
>@@ -68,7 +68,7 @@ namespace MonoTests.Mono.UIAutomation.Winforms.Client
>         }
> 
> 		[Test]
>-		[RequiresSTA]
>+		//[RequiresSTA]
> 		public void PatternsTest ()
> 		{
> 			form.Show ();
>diff --git a/UIAutomationWinforms/UIAutomationWinformsClientTests/UIAutomationWinformsClientTests.csproj b/UIAutomationWinforms/UIAutomationWinformsClientTests/UIAutomationWinformsClientTests.csproj
>index 98c9c71..7792e14 100644
>--- a/UIAutomationWinforms/UIAutomationWinformsClientTests/UIAutomationWinformsClientTests.csproj
>+++ b/UIAutomationWinforms/UIAutomationWinformsClientTests/UIAutomationWinformsClientTests.csproj
>@@ -1,5 +1,5 @@
>-ï»¿<?xml version="1.0" encoding="utf-8"?>
>-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
>   <PropertyGroup>
>     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
>     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
>@@ -12,8 +12,6 @@
>     <AssemblyName>UIAutomationWinformsClientTests</AssemblyName>
>     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
>     <FileAlignment>512</FileAlignment>
>-    <StartupObject>
>-    </StartupObject>
>   </PropertyGroup>
>   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
>     <DebugSymbols>true</DebugSymbols>
>@@ -33,10 +31,6 @@
>     <WarningLevel>4</WarningLevel>
>   </PropertyGroup>
>   <ItemGroup>
>-    <Reference Include="nunit.framework, Version=2.5.0.8332, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
>-      <SpecificVersion>False</SpecificVersion>
>-      <HintPath>..\..\..\..\..\..\..\Program Files\NUnit 2.5\bin\net-1.1\framework\nunit.framework.dll</HintPath>
>-    </Reference>
>     <Reference Include="System" />
>     <Reference Include="System.Data" />
>     <Reference Include="System.Drawing" />
>@@ -54,6 +48,7 @@
>     <Reference Include="UIAutomationTypes">
>       <RequiredTargetFramework>3.0</RequiredTargetFramework>
>     </Reference>
>+    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
>   </ItemGroup>
>   <ItemGroup>
>     <Compile Include="BaseTest.cs" />
>@@ -95,7 +90,7 @@
>       <Name>DataGridAssembly</Name>
>     </ProjectReference>
>   </ItemGroup>
>-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
>+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
>   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
>        Other similar extension points exist, see Microsoft.Common.targets.
>   <Target Name="BeforeBuild">
>diff --git a/UiaDbus/UiaDbus/Interfaces/IApplication.cs b/UiaDbus/UiaDbus/Interfaces/IApplication.cs
>index 99a2703..536b079 100644
>--- a/UiaDbus/UiaDbus/Interfaces/IApplication.cs
>+++ b/UiaDbus/UiaDbus/Interfaces/IApplication.cs
>@@ -37,6 +37,8 @@ namespace Mono.UIAutomation.UiaDbus.Interfaces
> 	public interface IApplication
> 	{
> 		string [] GetRootElementPaths ();
>+		
>+		string GetElementPathFromHandle (int handle);
> 
> 		void AddAutomationEventHandler (int eventId, int [] elementRuntimeId, TreeScope scope, int handlerId);
> 		void AddAutomationPropertyChangedEventHandler (int [] elementRuntimeId, TreeScope scope, int handlerId, int[] properties);
>diff --git a/UiaDbus/UiaDbusBridge/Application.cs b/UiaDbus/UiaDbusBridge/Application.cs
>index da34bfb..0ec83fd 100644
>--- a/UiaDbus/UiaDbusBridge/Application.cs
>+++ b/UiaDbus/UiaDbusBridge/Application.cs
>@@ -219,6 +219,15 @@ namespace Mono.UIAutomation.UiaDbusBridge
> 			return paths;
> 		}
> 
>+		public string GetElementPathFromHandle (int handle)
>+		{
>+			// TODO: Can we assume int is always correct?
>+			var element = AutomationBridge.Instance.FindWrapperByHandle (handle);
>+			if (element != null)
>+				return element.Path;
>+			return string.Empty;
>+		}
>+
> 		public void AddAutomationEventHandler (int eventId, int [] elementRuntimeId,
> 		                                TreeScope scope, int handlerId)
> 		{
>@@ -313,6 +322,7 @@ namespace Mono.UIAutomation.UiaDbusBridge
> 			RemoveEventHandlersByMask (handlerIdMask, structureEventHandlers);
> 		}
> 
>+
> 		public event Mono.UIAutomation.UiaDbus.Interfaces.AutomationEventHandler
> 			AutomationEvent;
> 		public event Mono.UIAutomation.UiaDbus.Interfaces.AutomationPropertyChangedHandler
>diff --git a/UiaDbus/UiaDbusBridge/AutomationBridge.cs b/UiaDbus/UiaDbusBridge/AutomationBridge.cs
>index 3c1d551..2cfd8c9 100644
>--- a/UiaDbus/UiaDbusBridge/AutomationBridge.cs
>+++ b/UiaDbus/UiaDbusBridge/AutomationBridge.cs
>@@ -271,6 +271,16 @@ namespace Mono.UIAutomation.UiaDbusBridge
> 				return wrapper;
> 			return null;
> 		}
>+		
>+		internal ProviderElementWrapper FindWrapperByHandle (int handle)
>+		{
>+			IRawElementProviderSimple provider = null;
>+			pointerProviderMapping.TryGetValue (new IntPtr (handle),
>+			                                    out provider);
>+			if (provider != null)
>+				return FindWrapperByPovider (provider);
>+			return null;
>+		}
> 
> 		#endregion
> 
>diff --git a/UiaDbus/UiaDbusSource/UiaDbusAutomationSource.cs b/UiaDbus/UiaDbusSource/UiaDbusAutomationSource.cs
>index 08682ea..084291c 100644
>--- a/UiaDbus/UiaDbusSource/UiaDbusAutomationSource.cs
>+++ b/UiaDbus/UiaDbusSource/UiaDbusAutomationSource.cs
>@@ -136,6 +136,16 @@ namespace Mono.UIAutomation.UiaDbusSource
> 			Log.Info ("UiaDbusAutomationSource: GetRootElements count will be: " + dbusElements.Count);
> 			return dbusElements.ToArray ();
> 		}
>+		
>+		public IElement GetElementFromHandle (IntPtr handle)
>+		{
>+			foreach (var appPair in GetUiaApplications ()) {
>+				string path = appPair.Value.GetElementPathFromHandle (handle.ToInt32 ());
>+				if (!string.IsNullOrEmpty (path))
>+					return GetOrCreateElement (appPair.Key, path);
>+			}
>+			return null;
>+		}
> 
> 		public void AddAutomationEventHandler (AutomationEvent eventId,
> 		                                       IElement element,
>@@ -294,7 +304,7 @@ namespace Mono.UIAutomation.UiaDbusSource
> 
> 		public void RemoveAllEventHandlers ()
> 		{
>-			foreach (DCI.IApplication app in GetUiaApplications ())
>+			foreach (DCI.IApplication app in GetUiaApplications ().Values)
> 				app.RemoveAllEventHandlers (EventHandlerManager.ClientPrefix);
> 		}
> 
>@@ -367,10 +377,10 @@ namespace Mono.UIAutomation.UiaDbusSource
> 			return candidateBusNames;
> 		}
> 
>-		private DCI.IApplication [] GetUiaApplications ()
>+		private Dictionary<string, DCI.IApplication> GetUiaApplications ()
> 		{
>-			List<DCI.IApplication> dbusApps =
>-				new List<DCI.IApplication> ();
>+			Dictionary<string, DCI.IApplication> dbusApps =
>+				new Dictionary<string, DCI.IApplication> ();
> 
> 			foreach (string busName in GetUiaDbusNames ()) {
> 				DCI.IApplication app =
>@@ -378,10 +388,10 @@ namespace Mono.UIAutomation.UiaDbusSource
> 					                                         new ObjectPath (DC.Constants.ApplicationPath));
> 				if (app == null)
> 					continue;
>-				dbusApps.Add (app);
>+				dbusApps [busName] = app;
> 			}
> 
>-			return dbusApps.ToArray ();
>+			return dbusApps;
> 		}
> 
> 		private UiaDbusElement CreateElement (DCI.IAutomationElement dbusElement, string busName, string elementPath)

Actions: View | Diff

Attachments on bug 489387: 323543