Changeset 45137 in vbox for trunk/src/VBox

Timestamp:

Mar 22, 2013 10:52:19 AM (12 years ago)

Author:

vboxsync

Message:

VBoxTray: fix visible regions for Aero

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

@@ -161 +161 @@
         GetWindowText(hwnd, szWindowText, sizeof(szWindowText));
 
+        DWORD pid = 0;
+        DWORD tid = GetWindowThreadProcessId(hwnd, &pid);
+
         /* Filter out Windows XP shadow windows */
         /** @todo still shows inside the guest */
         if (   szWindowText[0] == 0
-            && dwStyle == (WS_POPUP|WS_VISIBLE|WS_CLIPSIBLINGS)
-            && dwExStyle == (WS_EX_LAYERED|WS_EX_TOOLWINDOW|WS_EX_TRANSPARENT|WS_EX_TOPMOST))
+            && (
+                    (dwStyle == (WS_POPUP|WS_VISIBLE|WS_CLIPSIBLINGS)
+                            && dwExStyle == (WS_EX_LAYERED|WS_EX_TOOLWINDOW|WS_EX_TRANSPARENT|WS_EX_TOPMOST))
+                 || (dwStyle == (WS_POPUP|WS_VISIBLE|WS_DISABLED|WS_CLIPSIBLINGS|WS_CLIPCHILDREN)
+                            && dwExStyle == (WS_EX_TOOLWINDOW | WS_EX_TRANSPARENT | WS_EX_LAYERED | WS_EX_NOACTIVATE))
+                 || (dwStyle == (WS_POPUP|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN)
+                                       && dwExStyle == (WS_EX_TOOLWINDOW))
+                            ))
         {
             Log(("VBoxTray: Filter out shadow window style=%x exstyle=%x\n", dwStyle, dwExStyle));
+            Log(("VBoxTray: Enum hwnd=%x rect (%d,%d) (%d,%d) (filtered)\n", hwnd, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
+            Log(("VBoxTray: title=%s style=%x exStyle=%x\n", szWindowText, dwStyle, dwExStyle));
+            Log(("VBoxTray: pid=%d tid=%d\n", pid, tid));
             return TRUE;
         }
@@ -174 +186 @@
         if (strcmp(szWindowText, "Program Manager"))
         {
-            Log(("VBoxTray: Enum hwnd=%x rect (%d,%d) (%d,%d)\n", hwnd, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
+            Log(("VBoxTray: Enum hwnd=%x rect (%d,%d) (%d,%d) (applying)\n", hwnd, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
             Log(("VBoxTray: title=%s style=%x exStyle=%x\n", szWindowText, dwStyle, dwExStyle));
+            Log(("VBoxTray: pid=%d tid=%d\n", pid, tid));
 
             HRGN hrgn = CreateRectRgn(0,0,0,0);
@@ -204 +217 @@
             Log(("VBoxTray: Enum hwnd=%x rect (%d,%d) (%d,%d) (ignored)\n", hwnd, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
             Log(("VBoxTray: title=%s style=%x\n", szWindowText, dwStyle));
+            Log(("VBoxTray: pid=%d tid=%d\n", pid, tid));
         }
     }