- Clear data structure after dragging.

- WM_SETCURSOR does not need to be handled as it is not sent whilst the window is captured. - Make uDragListMessage non-static so that we can re-use it elsewhere.

- Clear data structure after dragging.
3864956e · Robert Shearman · Alexandre Julliard · 79dcdd0a · 3864956e
Commit 3864956e authored Sep 14, 2004 by Robert Shearman Committed by Alexandre Julliard Sep 14, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 13 deletions

draglist.c dlls/comctl32/draglist.c +3 -13

No files found.
--- a/dlls/comctl32/draglist.c
+++ b/dlls/comctl32/draglist.c
@@ -74,7 +74,7 @@ typedef struct _DRAGLISTDATA
    RECT last_drag_icon_rect;
 } DRAGLISTDATA;

-static UINT uDragListMessage = 0; /* registered window message code */
+UINT uDragListMessage = 0; /* registered window message code */
 static DWORD dwLastScrollTime = 0;
 static HICON hDragArrow = NULL;

@@ -99,9 +99,10 @@ static inline void DragList_EndDrag(HWND hwnd, DRAGLISTDATA * data)
 {
    KillTimer(hwnd, DRAGLIST_TIMERID);
    ReleaseCapture();
-    data->dragging = FALSE;
    /* clear any drag insert icon present */
    InvalidateRect(GetParent(hwnd), &data->last_drag_icon_rect, TRUE);
+    /* clear data for next use */
+    memset(data, 0, sizeof(*data));
 }

 /***********************************************************************
@@ -118,8 +119,6 @@ DragList_SubclassWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, 
    {
    case WM_LBUTTONDOWN:
        SetFocus(hwnd);
-        data->cursor = NULL;
-        SetRectEmpty(&data->last_drag_icon_rect);
        data->dragging = DragList_Notify(hwnd, DL_BEGINDRAG);
        if (data->dragging)
        {
@@ -183,15 +182,6 @@ DragList_SubclassWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, 
        }
        break;

-	case WM_SETCURSOR:
-	    /* if app has told us to set a cursor then do so */
-        if (data->dragging && data->cursor)
-        {
-            SetCursor(data->cursor);
-            return TRUE;
-        }
-        break;
-
    case WM_GETDLGCODE:
        /* tell dialog boxes that we want to receive WM_KEYDOWN events
         * for keys like VK_ESCAPE */