Issues #5, Issues #8 Fixed detection "Normal" windows and Modal dialogs

AlexanderPro · Feb 10, 2024 · ebc7267 · ebc7267
1 parent b1668bc
commit ebc7267
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/SmartContextMenu/Native/Constants.cs b/SmartContextMenu/Native/Constants.cs
@@ -47,13 +47,16 @@ static class Constants
         public const int DWL_USER = 8;
 
         // WindowStyle
-        public const int WS_MAXIMIZEBOX = 0x00010000;
-        public const int WS_MINIMIZEBOX = 0x00020000;
-        public const int WS_EX_LAYERED = 0x00080000;
-        public const int WS_EX_TOPMOST = 0x00000008;
-        public const int WS_EX_TOOLWINDOW = 0x00000080;
-        public const int WS_EX_TRANSPARENT = 0x20;
-        public const int WS_EX_NOACTIVATE = 0x08000000;
+        public const long WS_CAPTION = 0x00C00000L;
+        public const long WS_SYSMENU = 0x00080000L;
+        public const long WS_POPUP = 0x80000000L;
+        public const long WS_MAXIMIZEBOX = 0x00010000L;
+        public const long WS_MINIMIZEBOX = 0x00020000L;
+        public const long WS_EX_LAYERED = 0x00080000L;
+        public const long WS_EX_TOPMOST = 0x00000008L;
+        public const long WS_EX_TOOLWINDOW = 0x00000080L;
+        public const long WS_EX_TRANSPARENT = 0x00000020L;
+        public const long WS_EX_NOACTIVATE = 0x08000000L;
 
         // Window Messages
         public const int WM_GETICON = 0x7F;

diff --git a/SmartContextMenu/Native/User32.cs b/SmartContextMenu/Native/User32.cs
@@ -65,10 +65,10 @@ static class User32
         public static extern bool GetWindowPlacement(IntPtr hWnd, ref WindowPlacement lpwndpl);
 
         [DllImport("user32.dll")]
-        public static extern int SetWindowLong(IntPtr handle, int nIndex, int dwNewLong);
+        public static extern int SetWindowLong(IntPtr handle, int nIndex, long dwNewLong);
 
         [DllImport("user32.dll")]
-        public static extern int GetWindowLong(IntPtr handle, int nIndex);
+        public static extern long GetWindowLong(IntPtr handle, int nIndex);
 
         [DllImport("user32.dll")]
         public static extern int GetClassLong(IntPtr handle, int nIndex);

diff --git a/SmartContextMenu/Utils/WindowUtils.cs b/SmartContextMenu/Utils/WindowUtils.cs
@@ -30,12 +30,17 @@ public static Bitmap PrintWindow(IntPtr hWnd)
 
         public static IntPtr GetParentWindow(IntPtr hWnd)
         {
-            IntPtr parentHwnd;
-            var resultHwnd = hWnd;
-            while ((parentHwnd = GetParent(resultHwnd)) != IntPtr.Zero)
+            IntPtr resultHwnd;
+            var parentHwnd = hWnd;
+            do
             {
                 resultHwnd = parentHwnd;
-            }
+                var windowStyle = GetWindowLong(resultHwnd, GWL_STYLE);
+                if ((windowStyle & WS_CAPTION) != 0 || (windowStyle & WS_SYSMENU) != 0 || (windowStyle & WS_POPUP) != 0)
+                {
+                    return resultHwnd;
+                }
+            } while ((parentHwnd = GetParent(resultHwnd)) != IntPtr.Zero);
             return resultHwnd;
         }
 

diff --git a/SmartContextMenu/Window.cs b/SmartContextMenu/Window.cs
@@ -93,11 +93,11 @@ public int Transparency
         {
             get
             {
-                int style = GetWindowLong(Handle, GWL_EXSTYLE);
-                bool isLayeredWindow = (style & WS_EX_LAYERED) == WS_EX_LAYERED;
+                var style = GetWindowLong(Handle, GWL_EXSTYLE);
+                var isLayeredWindow = (style & WS_EX_LAYERED) == WS_EX_LAYERED;
                 if (!isLayeredWindow) return 0;
                 GetLayeredWindowAttributes(Handle, out _, out var alpha, out _);
-                int transparency = 100 - (int)Math.Round(100 * alpha / 255f, MidpointRounding.AwayFromZero);
+                var transparency = 100 - (int)Math.Round(100 * alpha / 255f, MidpointRounding.AwayFromZero);
                 return transparency;
             }
         }

diff --git a/SmartContextMenu/WindowDetails.cs b/SmartContextMenu/WindowDetails.cs
@@ -36,21 +36,21 @@ class WindowDetails
 
         public int DWL_DLGPROC { get; set; }
 
-        public int GWL_STYLE { get; set; }
+        public long GWL_STYLE { get; set; }
 
         public int GCL_STYLE { get; set; }
 
-        public int GWL_EXSTYLE { get; set; }
+        public long GWL_EXSTYLE { get; set; }
 
         public uint WindowInfoExStyle { get; set; }
 
         public bool LWA_ALPHA { get; set; }
 
         public bool LWA_COLORKEY { get; set; }
 
-        public int GWL_ID { get; set; }
+        public long GWL_ID { get; set; }
 
-        public int GWL_USERDATA { get; set; }
+        public long GWL_USERDATA { get; set; }
 
         public int DWL_USER { get; set; }