[PATCH 0/2] MR6218: comctl32/treeview: Allow treeview parent to deny treeview expansion.

List overview All Threads

newer

older

[PATCH v2 0/2] MR6218:...

[PATCH v5 0/2] MR6186:...

Jacob Czekalla (＠JacobCzekalla)

6 Aug 2024 6 Aug '24

6:16 p.m.

When the listview expands or collapses an item it notifies the parent using the TVN_ITEMEXPANDING message. The parent can return true on this message and it prevents the treeview from expanding or collapsing the item. WINE does not let you deny TVN_ITEMEXPANDING by returning true.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53727

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6218

Show replies by date

Jacob Czekalla

6 Aug 6 Aug

6:16 p.m.

New subject: [PATCH 1/2] comctl32/tests: Add test to check if treeview expansion can be denied.

From: Jacob Czekalla jczekalla@codeweavers.com

--- dlls/comctl32/tests/treeview.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index db4cc4fda71..86a25cf2a3e 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -52,6 +52,8 @@ static char *g_endedit_overwrite_ptr; static HFONT g_customdraw_font; static BOOL g_v6;

+static int tvn_itemexpanding_ret = 0; + #define NUM_MSG_SEQUENCES 3 #define TREEVIEW_SEQ_INDEX 0 #define PARENT_SEQ_INDEX 1 @@ -1361,7 +1363,13 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, } case TVN_ITEMEXPANDINGA: { - UINT newmask = pTreeView->itemNew.mask & ~TVIF_CHILDREN; + UINT newmask; + if (tvn_itemexpanding_ret) + { + tvn_itemexpanding_ret = 0; + return TRUE; + } + newmask = pTreeView->itemNew.mask & ~TVIF_CHILDREN; ok(newmask == (TVIF_HANDLE | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_PARAM | TVIF_STATE), "got wrong mask %x\n", pTreeView->itemNew.mask); @@ -1837,6 +1845,8 @@ static void test_expandnotify(void) HWND hTree; BOOL ret; TVITEMA item; + HTREEITEM root; + RECT rc;

hTree = create_treeview_control(0); fill_tree(hTree); @@ -1898,6 +1908,25 @@ static void test_expandnotify(void)

DestroyWindow(hTree);

+ /* check that expansion can be denied by parent */ + hTree = create_treeview_control(0); + fill_tree(hTree); + + root = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_ROOT, 0); + *((HTREEITEM*)&rc) = root; + + /* Simulate the double-click */ + tvn_itemexpanding_ret = 1; + SendMessageA(hTree, TVM_GETITEMRECT, TRUE, (LPARAM)&rc); + SendMessageA(hTree, WM_LBUTTONDBLCLK, MK_LBUTTON, MAKELPARAM(rc.left + ((rc.right - rc.left) / 2), rc.top + ((rc.bottom - rc.top) / 2))); + + /* check that it's expanded */ + item.state = TVIS_EXPANDED; + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + todo_wine ok(!(item.state & TVIS_EXPANDED), "expected no expansion\n"); + + DestroyWindow(hTree); + /* test TVM_GETITEMRECT inside TVN_ITEMEXPANDED notification */ hTree = create_treeview_control(0); fill_tree(hTree);

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6218

Jacob Czekalla

6:16 p.m.

New subject: [PATCH 2/2] comctl32/treeview: Allow treeview parent to deny treeview expansion.

From: Jacob Czekalla jczekalla@codeweavers.com

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53727 --- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/treeview.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 86a25cf2a3e..38f019109b9 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1923,7 +1923,7 @@ static void test_expandnotify(void) /* check that it's expanded */ item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - todo_wine ok(!(item.state & TVIS_EXPANDED), "expected no expansion\n"); + ok(!(item.state & TVIS_EXPANDED), "expected no expansion\n");

DestroyWindow(hTree);

diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 036afd15c69..5f3dbfce71d 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3384,7 +3384,11 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, return FALSE;

if (bUser) - TREEVIEW_SendExpanding(infoPtr, item, action); + { + if(!TREEVIEW_SendExpanding(infoPtr, item, action)) + return TRUE; + } +

if (item->firstChild == NULL) return FALSE; @@ -3513,11 +3517,11 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, !(item->state & TVIS_EXPANDEDONCE)); if (sendsNotifications) { - if (!TREEVIEW_SendExpanding(infoPtr, item, TVE_EXPAND)) - { - TRACE(" TVN_ITEMEXPANDING returned TRUE, exiting...\n"); - return FALSE; - } + if (!TREEVIEW_SendExpanding(infoPtr, item, TVE_EXPAND)) + { + TRACE(" TVN_ITEMEXPANDING returned TRUE, exiting...\n"); + return TRUE; + } } if (!item->firstChild) return FALSE;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6218

Marvin

6:48 p.m.

New subject: [PATCH 2/2] comctl32/treeview: Allow treeview parent to deny treeview expansion.

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=147569

Your paranoid android.

=== w8 (32 bit report) ===