Issues #13 More correct fix for the 2000 character limit issue

Author: AlexanderPro

WindowTextExtractor/Forms/MainForm.cs

@@ -867,22 +867,23 @@ public bool PreFilterMessage(ref Message m)
                                 User32.SetCursor(cursorHandle);
                                 var cursorPosition = Cursor.Position;
                                 var element = AutomationElement.FromPoint(new System.Windows.Point(cursorPosition.X, cursorPosition.Y));
-                                var windowProcessId = element.Current.ProcessId;
-                                if (element != null && windowProcessId != _processId)
+                                if (element != null && element.Current.ProcessId != _processId)
                                 {
                                     var windowHandle = new IntPtr(element.Current.NativeWindowHandle);
                                     if (windowHandle == IntPtr.Zero)
                                     {
                                         windowHandle = User32.WindowFromPoint(new Point(cursorPosition.X, cursorPosition.Y));
-                                        if (windowHandle != IntPtr.Zero)
-                                        {
-                                            User32.GetWindowThreadProcessId(windowHandle, out windowProcessId);
-                                            var windowStyle = User32.GetWindowLong(windowHandle, Constants.GWL_STYLE);
-                                            if (((windowStyle & Constants.WS_CAPTION) != 0 || (windowStyle & Constants.WS_SYSMENU) != 0 || (windowStyle & Constants.WS_POPUP) != 0))
-                                            {
-                                                element = AutomationElement.FromHandle(windowHandle);
-                                            }
-                                        }
+                                    }
+
+                                    var windowProcessId = element.Current.ProcessId;
+                                    if (windowProcessId == 0)
+                                    {
+                                        User32.GetWindowThreadProcessId(windowHandle, out windowProcessId);
+                                    }
+
+                                    if (!element.Current.IsContentElement)
+                                    {
+                                        element = AutomationElement.FromHandle(windowHandle);
                                     }
 
                                     var previousHandle = IntPtr.Zero;
@@ -946,7 +947,7 @@ public bool PreFilterMessage(ref Message m)
                                     }
                                     else
                                     {
-                                        var text = WindowUtils.ExtractTextFromConsoleWindow(windowProcessId) ?? element.GetTextFromWindow();
+                                        var text = WindowUtils.ExtractTextFromConsoleWindow(windowProcessId) ?? (element.Current.IsContentElement ? element.GetTextFromWindow() : WindowUtils.GetWindowText(windowHandle));
                                         text = text == null ? "" : text.TrimEnd().TrimEnd(Environment.NewLine);
                                         if (_settings.ShowEmptyItems || (!_settings.ShowEmptyItems && !string.IsNullOrEmpty(text)))
                                         {

WindowTextExtractor/Native/Constants.cs

@@ -29,11 +29,6 @@ static class Constants
         public const int DWL_DLGPROC = 4;
         public const int DWL_USER = 8;
 
-        // WindowStyle
-        public const long WS_CAPTION = 0x00C00000L;
-        public const long WS_SYSMENU = 0x00080000L;
-        public const long WS_POPUP = 0x80000000L;
-
         // LayeredWindowAttributes
         public const int LWA_ALPHA = 0x00000002;
 

WindowTextExtractor/Utils/WindowUtils.cs

@@ -368,7 +368,7 @@ public static void SetOpacity(IntPtr handle, byte opacity)
             User32.SetLayeredWindowAttributes(handle, 0, opacity, Constants.LWA_ALPHA);
         }
 
-        private static string GetWindowText(IntPtr handle)
+        public static string GetWindowText(IntPtr handle)
         {
             var length = User32.GetWindowTextLength(handle);
             if (length > 0)