Mikołaj Zalewski : comctl32: toolbar: Set correcly hwndTrack in TrackMouseEvent call.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 764c5b3b35a6a05c734ea7799a335423ffec7ed0
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=764c5b3b35a6a05c734ea779...

Author: Mikołaj Zalewski 
Date:   Thu Sep 28 20:56:08 2006 +0200

comctl32: toolbar: Set correcly hwndTrack in TrackMouseEvent call.

---

dlls/comctl32/toolbar.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 9de8e76..4f725ed 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -6226,15 +6226,14 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wPa
         /* fill in the TRACKMOUSEEVENT struct */
         trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
         trackinfo.dwFlags = TME_QUERY;
-        trackinfo.hwndTrack = hwnd;
-        trackinfo.dwHoverTime = HOVER_DEFAULT;

/* call _TrackMouseEvent to see if we are currently tracking for this hwnd */
         _TrackMouseEvent(&trackinfo);

/* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */
-        if(!(trackinfo.dwFlags & TME_LEAVE)) {
+        if(trackinfo.hwndTrack != hwnd || !(trackinfo.dwFlags & TME_LEAVE)) {
             trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
+            trackinfo.hwndTrack = hwnd;

/* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */
             /* and can properly deactivate the hot toolbar button */