Merge pull request #2465 from comintern/next

Fix broken inspection result form captions (plus focus events for DockableToolwindows).

Author: retailcoder

RetailCoder.VBE/UI/DockableToolwindowPresenter.cs

@@ -1,10 +1,10 @@
 using System;
-using System.Configuration;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using NLog;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
+using Rubberduck.VBEditor.Extensions;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI
@@ -55,7 +55,7 @@ private IWindow CreateToolWindow(IDockableUserControl control)
             {
                 var info = _vbe.Windows.CreateToolWindow(_addin, _DockableWindowHost.RegisteredProgId, control.Caption, control.ClassId);
                 _userControlObject = info.UserControl;
-                toolWindow = info.ToolWindow;
+                toolWindow = info.ToolWindow;                
             }
             catch (COMException exception)
             {
@@ -77,6 +77,9 @@ private IWindow CreateToolWindow(IDockableUserControl control)
 
             EnsureMinimumWindowSize(toolWindow);
 
+            //Get the hwnd here - otherwise, FindWindowEx won't find it (because it's hidden).
+            toolWindow.RealHwnd = toolWindow.ToHwnd();
+
             toolWindow.IsVisible = _settings != null && _settings.IsWindowVisible(this);
 
             userControlHost.AddUserControl(control as UserControl, new IntPtr(_vbe.MainWindow.HWnd));

RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml

@@ -597,15 +597,15 @@
                     <controls:LinkButton Margin="4"
                             Visibility="{Binding CanExecuteQuickFixInModule, Converter={StaticResource BoolToVisibility}}"
                             Command="{Binding QuickFixInModuleCommand}"
-                            Content="{Resx ResxName=Rubberduck.Inspections.InspectionsUI, Key=QuickFix_ThisModule}" />
+                            Content="{Resx ResxName=Rubberduck.Inspections.Resources.InspectionsUI, Key=QuickFix_ThisModule}" />
                     <controls:LinkButton Margin="4"
                             Visibility="{Binding CanExecuteQuickFixInProject, Converter={StaticResource BoolToVisibility}}"
                             Command="{Binding QuickFixInProjectCommand}"
-                            Content="{Resx ResxName=Rubberduck.Inspections.InspectionsUI, Key=QuickFix_ThisProject}" />
+                            Content="{Resx ResxName=Rubberduck.Inspections.Resources.InspectionsUI, Key=QuickFix_ThisProject}" />
                     <controls:LinkButton Margin="4"
                             Visibility="{Binding CanDisableInspection, Converter={StaticResource BoolToVisibility}}"
                             Command="{Binding DisableInspectionCommand}"
-                            Content="{Resx ResxName=Rubberduck.Inspections.InspectionsUI, Key=DisableThisInspection}" />
+                            Content="{Resx ResxName=Rubberduck.Inspections.Resources.InspectionsUI, Key=DisableThisInspection}" />
                 </WrapPanel>
             </StackPanel>
         </Border>

Rubberduck.VBEEditor/Extensions/IDEExtensions.cs

@@ -5,7 +5,6 @@
 using Rubberduck.VBEditor.Application;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SafeComWrappers.MSForms;
-using Exception = System.Exception;
 
 namespace Rubberduck.VBEditor.Extensions
 {
@@ -205,100 +204,4 @@ public static bool HostSupportsUnitTests(this IVBE vbe)
             return false;
         }
     }
-
-    public static class VBProjectExtensions
-    {
-        /// <summary>
-        /// Imports all source code files from target directory into project.
-        /// </summary>
-        /// <remarks>
-        /// Only files with extensions "cls", "bas, "frm", and "doccls" are imported.
-        /// It is the callers responsibility to remove any existing components prior to importing.
-        /// </remarks>
-        /// <param name="project"></param>
-        /// <param name="filePath">Directory path containing the source files.</param>
-        public static void ImportDocumentTypeSourceFiles(this IVBProject project, string filePath)
-        {
-            var dirInfo = new DirectoryInfo(filePath);
-
-            var files = dirInfo.EnumerateFiles()
-                                .Where(f => f.Extension == ComponentTypeExtensions.DocClassExtension);
-            foreach (var file in files)
-            {
-                try
-                {
-                    project.VBComponents.ImportSourceFile(file.FullName);
-                }
-                catch (IndexOutOfRangeException) { }    // component didn't exist
-            }
-        }
-
-        public static void LoadAllComponents(this IVBProject project, string filePath)
-        {
-            var dirInfo = new DirectoryInfo(filePath);
-
-            var files = dirInfo.EnumerateFiles()
-                                .Where(f => f.Extension == ComponentTypeExtensions.StandardExtension ||
-                                            f.Extension == ComponentTypeExtensions.ClassExtension ||
-                                            f.Extension == ComponentTypeExtensions.DocClassExtension ||
-                                            f.Extension == ComponentTypeExtensions.FormExtension
-                                            )
-                                .ToList();
-
-            var exceptions = new List<Exception>();
-
-            foreach (var component in project.VBComponents)
-            {
-                try
-                {
-                    var name = component.Name;
-                    project.VBComponents.RemoveSafely(component);
-
-                    var file = files.SingleOrDefault(f => f.Name == name + f.Extension);
-                    if (file != null)
-                    {
-                        try
-                        {
-                            project.VBComponents.ImportSourceFile(file.FullName);
-                        }
-                        catch (IndexOutOfRangeException)
-                        {
-                            exceptions.Add(new IndexOutOfRangeException(string.Format(VBEEditorText.NonexistentComponentErrorText, Path.GetFileNameWithoutExtension(file.FullName))));
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    exceptions.Add(ex);
-                }
-            }
-
-            foreach (var file in files)
-            {
-                try
-                {
-                    if (project.VBComponents.All(v => v.Name + file.Extension != file.Name))
-                    {
-                        try
-                        {
-                            project.VBComponents.ImportSourceFile(file.FullName);
-                        }
-                        catch (IndexOutOfRangeException)
-                        {
-                            exceptions.Add(new IndexOutOfRangeException(string.Format(VBEEditorText.NonexistentComponentErrorText, Path.GetFileNameWithoutExtension(file.FullName))));
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    exceptions.Add(ex);
-                }
-            }
-
-            if (exceptions.Count != 0)
-            {
-                throw new AggregateException(string.Empty, exceptions);
-            }
-        }
-    }
 }

Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs

@@ -1,3 +1,104 @@
-namespace Rubberduck.VBEditor.Extensions
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+
+namespace Rubberduck.VBEditor.Extensions
 {
+    public static class VBProjectExtensions
+    {
+        /// <summary>
+        /// Imports all source code files from target directory into project.
+        /// </summary>
+        /// <remarks>
+        /// Only files with extensions "cls", "bas, "frm", and "doccls" are imported.
+        /// It is the callers responsibility to remove any existing components prior to importing.
+        /// </remarks>
+        /// <param name="project"></param>
+        /// <param name="filePath">Directory path containing the source files.</param>
+        public static void ImportDocumentTypeSourceFiles(this IVBProject project, string filePath)
+        {
+            var dirInfo = new DirectoryInfo(filePath);
+
+            var files = dirInfo.EnumerateFiles()
+                                .Where(f => f.Extension == ComponentTypeExtensions.DocClassExtension);
+            foreach (var file in files)
+            {
+                try
+                {
+                    project.VBComponents.ImportSourceFile(file.FullName);
+                }
+                catch (IndexOutOfRangeException) { }    // component didn't exist
+            }
+        }
+
+        public static void LoadAllComponents(this IVBProject project, string filePath)
+        {
+            var dirInfo = new DirectoryInfo(filePath);
+
+            var files = dirInfo.EnumerateFiles()
+                                .Where(f => f.Extension == ComponentTypeExtensions.StandardExtension ||
+                                            f.Extension == ComponentTypeExtensions.ClassExtension ||
+                                            f.Extension == ComponentTypeExtensions.DocClassExtension ||
+                                            f.Extension == ComponentTypeExtensions.FormExtension
+                                            )
+                                .ToList();
+
+            var exceptions = new List<Exception>();
+
+            foreach (var component in project.VBComponents)
+            {
+                try
+                {
+                    var name = component.Name;
+                    project.VBComponents.RemoveSafely(component);
+
+                    var file = files.SingleOrDefault(f => f.Name == name + f.Extension);
+                    if (file != null)
+                    {
+                        try
+                        {
+                            project.VBComponents.ImportSourceFile(file.FullName);
+                        }
+                        catch (IndexOutOfRangeException)
+                        {
+                            exceptions.Add(new IndexOutOfRangeException(string.Format(VBEEditorText.NonexistentComponentErrorText, Path.GetFileNameWithoutExtension(file.FullName))));
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    exceptions.Add(ex);
+                }
+            }
+
+            foreach (var file in files)
+            {
+                try
+                {
+                    if (project.VBComponents.All(v => v.Name + file.Extension != file.Name))
+                    {
+                        try
+                        {
+                            project.VBComponents.ImportSourceFile(file.FullName);
+                        }
+                        catch (IndexOutOfRangeException)
+                        {
+                            exceptions.Add(new IndexOutOfRangeException(string.Format(VBEEditorText.NonexistentComponentErrorText, Path.GetFileNameWithoutExtension(file.FullName))));
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    exceptions.Add(ex);
+                }
+            }
+
+            if (exceptions.Count != 0)
+            {
+                throw new AggregateException(string.Empty, exceptions);
+            }
+        }
+    }
 }

Rubberduck.VBEEditor/Extensions/WindowExtensions.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Office.Interop.Word;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.SafeComWrappers.MSForms;
+
+namespace Rubberduck.VBEditor.Extensions
+{
+    public static class WindowExtensions
+    {
+        //The hWnd property on most of the VBE windows is completely worthless (it just returns 0).  This will get its
+        //*real* hWnd.
+        public static IntPtr ToHwnd(this IWindow window)
+        {
+            //Try the obvious first.
+            if (window.HWnd != 0)
+            {
+                return new IntPtr(window.HWnd);
+            }
+            //Try FindWindowEx next.
+            var hwnd = NativeMethods.FindWindowEx(IntPtr.Zero, IntPtr.Zero, window.Type.ToClassName(), window.Caption);
+            if (hwnd != IntPtr.Zero)
+            {
+                return hwnd;
+            }
+            //Try enum all the child windows last - ugh.
+            var finder = new NativeMethods.ChildWindowFinder(window.Caption);
+            finder.EnumWindowsProcToChildWindowByCaption(IntPtr.Zero, IntPtr.Zero);
+            return finder.ResultHandle;
+        }
+
+        public static string ToClassName(this WindowKind kind)
+        {
+            switch (kind)
+            {
+                case WindowKind.Designer:
+                    return "DesignerWindow";
+                case WindowKind.Browser:
+                    return "DockingView";
+                case WindowKind.CodeWindow:
+                case WindowKind.Watch:
+                case WindowKind.Locals:
+                case WindowKind.Immediate:
+                    return "VbaWindow";
+                case WindowKind.ProjectWindow:
+                    return "PROJECT";
+                case WindowKind.PropertyWindow:
+                    return "wndclass_pbrs";
+                case WindowKind.Find:                    
+                case WindowKind.FindReplace:
+                    return "#32770 (Dialog)";
+                case WindowKind.Toolbox:
+                    return "F3 MinFrame 77ec0000";
+                case WindowKind.LinkedWindowFrame:  //WTF is this?
+                    return string.Empty;        
+                case WindowKind.MainWindow:
+                    return "wndclass_desked_gsk";
+                case WindowKind.ToolWindow:
+                    return "VBFloatingPalette";
+                default:
+                    return string.Empty;       
+            }
+        }
+    }
+}

Rubberduck.VBEEditor/NativeMethods.cs

@@ -39,6 +39,14 @@ public static class NativeMethods
         [DllImport("user32", ExactSpelling = true, CharSet = CharSet.Unicode)]
         internal static extern int EnumChildWindows(IntPtr parentWindowHandle, EnumChildWindowsDelegate lpEnumFunction, IntPtr lParam);
 
+        /// <param name="parentHandle">         Handle of the parent window. IntPtr.Zero is the desktop. </param>
+        /// <param name="childAfter">           The child window to begin searching after. </param>
+        /// <param name="lclassName">           The window class name (optional). </param>
+        /// <param name="windowTitle">          The window caption (optional). </param>
+        /// <returns>   An IntPtr to the found windows hWnd, IntPtr.Zero if no match is found. </returns>
+        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        public static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
+
         /// <summary>   Gets window text. </summary>
         ///
         /// <param name="hWnd">         The window handle. </param>

Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj

@@ -127,6 +127,7 @@
     <Compile Include="Events\ProjectEventArgs.cs" />
     <Compile Include="Events\ProjectRenamedEventArgs.cs" />
     <Compile Include="Extensions\MSAccessComponentTypeExtensions.cs" />
+    <Compile Include="Extensions\WindowExtensions.cs" />
     <Compile Include="Native\WinEvents.cs" />
     <Compile Include="SafeComWrappers\Abstract\ISafeComWrapper.cs" />
     <Compile Include="SafeComWrappers\Abstract\IVBComponentsEventsSink.cs" />

Rubberduck.VBEEditor/SafeComWrappers/Abstract/IWindow.cs

@@ -5,6 +5,7 @@ namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
 {
     public interface IWindow : ISafeComWrapper, IEquatable<IWindow>
     {
+        IntPtr RealHwnd { get; set; }
         int HWnd { get; }
         string Caption { get; }
         bool IsVisible { get; set; }

Rubberduck.VBEEditor/SafeComWrappers/VB6/Window.cs

@@ -12,6 +12,8 @@ public Window(VB.Window window)
         {
         }
 
+        public IntPtr RealHwnd { get; set; }
+
         public int HWnd
         {
             get { return IsWrappingNullReference ? 0 : Target.HWnd; }