Nikolay Sivov : explorerframe: Do not block clicks on the item button.
Alexandre Julliard
julliard at winehq.org
Wed Feb 10 15:34:02 CST 2021
Module: wine
Branch: master
Commit: 7ac196aa0cc97e7730b81a4f67e65f6ca1f6cd8b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac196aa0cc97e7730b81a4f67e65f6ca1f6cd8b
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Feb 10 17:00:19 2021 +0300
explorerframe: Do not block clicks on the item button.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28786
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/explorerframe/nstc.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c
index 0abaded85a6..b1ecace5fae 100644
--- a/dlls/explorerframe/nstc.c
+++ b/dlls/explorerframe/nstc.c
@@ -678,7 +678,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr)
{
TVHITTESTINFO tvhit;
IShellItem *psi;
- HRESULT hr;
+
TRACE("%p (%p)\n", This, nmhdr);
GetCursorPos(&tvhit.pt);
@@ -690,17 +690,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr)
/* TVHT_ maps onto the corresponding NSTCEHT_ */
psi = shellitem_from_treeitem(This, tvhit.hItem);
- hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON);
-
- /* The expando should not be expanded unless
- * double-clicked. */
- if(tvhit.flags == TVHT_ONITEMBUTTON)
- return TRUE;
-
- if(SUCCEEDED(hr))
- return FALSE;
- else
- return TRUE;
+ return FAILED(events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON));
}
static LRESULT on_wm_mbuttonup(NSTC2Impl *This, WPARAM wParam, LPARAM lParam)
More information about the wine-cvs
mailing list