[10/10] comctl32/listview: Don't hittest when it's not needed

Nikolay Sivov bunglehead at gmail.com
Sun May 24 16:20:54 CDT 2009


>From ca2e317da1ac56c9043de9fc57a4c1bcf995d30e Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bunglehead at gmail.com>
Date: Mon, 25 May 2009 00:44:26 +0400
Subject: Don't hittest when it's not needed

---
 dlls/comctl32/listview.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 9b61b44..68a29a1 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -3401,8 +3401,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN
 
         if (!PtInRect(&rect, tmp))
         {
-            NMLISTVIEW nmlv;
-
             /* this path covers the following:
                1. WM_LBUTTONDOWN over selected item (sets focus on it)
                2. change focus with keys
@@ -3419,15 +3417,17 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN
                 infoPtr->nLButtonDownItem = -1;
             }
 
-            lvHitTestInfo.pt = infoPtr->ptClickPos;
-            LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE);
-
-            ZeroMemory(&nmlv, sizeof(nmlv));
-            nmlv.iItem = lvHitTestInfo.iItem;
-            nmlv.ptAction = infoPtr->ptClickPos;
-
             if (!infoPtr->bDragging)
             {
+                NMLISTVIEW nmlv;
+
+                lvHitTestInfo.pt = infoPtr->ptClickPos;
+                LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE);
+
+                ZeroMemory(&nmlv, sizeof(nmlv));
+                nmlv.iItem = lvHitTestInfo.iItem;
+                nmlv.ptAction = infoPtr->ptClickPos;
+
                 notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv);
                 infoPtr->bDragging = TRUE;
             }
-- 
1.5.6.5





More information about the wine-patches mailing list