Nikolay Sivov : comctl32/rebar: Don't try to access band data before it' s needed.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 70890031a336c053b39dfeb0ec428742a300bea6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=70890031a336c053b39dfeb0ec...

Author: Nikolay Sivov 
Date:   Thu Feb 11 22:40:15 2010 +0300

comctl32/rebar: Don't try to access band data before it's needed.

---

dlls/comctl32/rebar.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 21aabfa..cc06425 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2919,7 +2919,6 @@ REBAR_PushChevron(const REBAR_INFO *infoPtr, UINT uBand, LPARAM lParam)
 static LRESULT
 REBAR_LButtonDown (REBAR_INFO *infoPtr, LPARAM lParam)
 {
-    REBAR_BAND *lpBand;
     UINT htFlags;
     INT iHitBand;
     POINT ptMouseDown;
@@ -2927,7 +2926,6 @@ REBAR_LButtonDown (REBAR_INFO *infoPtr, LPARAM lParam)
     ptMouseDown.y = (short)HIWORD(lParam);

REBAR_InternalHitTest(infoPtr, &ptMouseDown, &htFlags, &iHitBand);
-    lpBand = REBAR_GetBand(infoPtr, iHitBand);

if (htFlags == RBHT_CHEVRON)
     {
@@ -2935,8 +2933,12 @@ REBAR_LButtonDown (REBAR_INFO *infoPtr, LPARAM lParam)
     }
     else if (htFlags == RBHT_GRABBER || htFlags == RBHT_CAPTION)
     {
+        REBAR_BAND *lpBand;
+
         TRACE("Starting drag\n");

+        lpBand = REBAR_GetBand(infoPtr, iHitBand);
+
         SetCapture (infoPtr->hwndSelf);
         infoPtr->iGrabbedBand = iHitBand;