comctl32: Test appropriate tool window for active state.

There is no point in testing owner of the tooltip itself since it's often created as a popup of the desktop window.

comctl32: Test appropriate tool window for active state.
7b330516 · Dmitry Timoshkov · Alexandre Julliard · 48b9ab37 · 7b330516
Commit 7b330516 authored Feb 05, 2013 by Dmitry Timoshkov Committed by Alexandre Julliard Feb 05, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

tooltips.c dlls/comctl32/tooltips.c +11 -3

No files found.
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -991,9 +991,17 @@ TOOLTIPS_CheckTool (const TOOLTIPS_INFO *infoPtr, BOOL bShowTest)
    if (nTool == -1)
 	return -1;

-    if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest) {
-	if (!TOOLTIPS_IsWindowActive (GetWindow (infoPtr->hwndSelf, GW_OWNER)))
-	    return -1;
+    if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest)
+    {
+        TTTOOL_INFO *ti = &infoPtr->tools[nTool];
+        HWND hwnd = (ti->uFlags & TTF_IDISHWND) ? (HWND)ti->uId : ti->hwnd;
+
+        if (!TOOLTIPS_IsWindowActive(hwnd))
+        {
+            TRACE("not active: hwnd %p, parent %p, active %p\n",
+                  hwnd, GetParent(hwnd), GetActiveWindow());
+            return -1;
+        }
    }

    TRACE("tool %d\n", nTool);