Daniel Jelinski : comctl32/treeview: Inlined TREEVIEW_RButtonUp.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5e86d843374333558d362fa9f5d379ac2e4e1d73
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5e86d843374333558d362fa9f5...

Author: Daniel Jelinski 
Date:   Fri Jul 13 20:47:45 2012 +0200

comctl32/treeview: Inlined TREEVIEW_RButtonUp.

---

dlls/comctl32/treeview.c |   25 ++++++-------------------
 1 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 88c1ff4..b784924 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -208,7 +208,6 @@ static VOID TREEVIEW_Invalidate(const TREEVIEW_INFO *, const TREEVIEW_ITEM *);
 static LRESULT TREEVIEW_DoSelectItem(TREEVIEW_INFO *, INT, HTREEITEM, INT);
 static VOID TREEVIEW_SetFirstVisible(TREEVIEW_INFO *, TREEVIEW_ITEM *, BOOL);
 static LRESULT TREEVIEW_EnsureVisible(TREEVIEW_INFO *, HTREEITEM, BOOL);
-static LRESULT TREEVIEW_RButtonUp(const TREEVIEW_INFO *, const POINT *);
 static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel);
 static VOID TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr);
 static LRESULT TREEVIEW_HScroll(TREEVIEW_INFO *, WPARAM);
@@ -4260,7 +4259,12 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam)
    SetFocus(infoPtr->hwnd);
    if(!TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK))
    {
-	    TREEVIEW_RButtonUp(infoPtr, &ht.pt);
+	    /* Change to screen coordinate for WM_CONTEXTMENU */
+	    ClientToScreen(infoPtr->hwnd, &ht.pt);
+
+	    /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */
+	    SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
+		(WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
    }
     }

@@ -4268,23 +4272,6 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam)
 }

static LRESULT
-TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
-{
-    TVHITTESTINFO ht;
-
-    ht.pt = *pPt;
-
-    /* Change to screen coordinate for WM_CONTEXTMENU */
-    ClientToScreen(infoPtr->hwnd, &ht.pt);
-
-    /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */
-    SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
-        (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
-    return 0;
-}
-
-
-static LRESULT
 TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, LPARAM lParam)
 {
     TREEVIEW_ITEM *dragItem = (HTREEITEM)lParam;