March 2023 - Wine-Commits - list.winehq.org

Angelo Haller : comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: cc6d05fbdf682e01ea788ec1d4a9404c5beb3391 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc6d05fbdf682e01ea788ec1d4a940… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:08 2022 -0500 comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function. Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit 425fd8f80e23e34667697f7032d002da8d10a352) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5c695c216e5..60072558da9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -436,6 +436,7 @@ static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL); static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); +static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *, INT, INT, const LVITEMW *); static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT); static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT); static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); @@ -3563,7 +3564,6 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) INT nFirst = min(infoPtr->nSelectionMark, nItem); INT nLast = max(infoPtr->nSelectionMark, nItem); HWND hwndSelf = infoPtr->hwndSelf; - NMLVODSTATECHANGE nmlv; DWORD old_mask; LVITEMW item; INT i; @@ -3585,13 +3585,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) for (i = nFirst; i <= nLast; i++) LISTVIEW_SetItemState(infoPtr,i,&item); - ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iFrom = nFirst; - nmlv.iTo = nLast; - nmlv.uOldState = 0; - nmlv.uNewState = item.state; + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); - notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; infoPtr->notify_mask |= old_mask; @@ -8894,6 +8889,22 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO return LISTVIEW_MoveIconTo(infoPtr, nItem, &Pt, FALSE); } +/* Make sure to also disable per item notifications via the notification mask. */ +static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *infoPtr, INT nFirst, INT nLast, const LVITEMW *item) +{ + NMLVODSTATECHANGE nmlv; + + if (!item) return; + + ZeroMemory(&nmlv, sizeof(nmlv)); + nmlv.iFrom = nFirst; + nmlv.iTo = nLast; + nmlv.uOldState = 0; + nmlv.uNewState = item->state; + + notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); +} + /*** * DESCRIPTION: * Sets the state of one or many items.

1 0

Angelo Haller : comctl32/listview: Send LVN_ODSTATECHANGED notification for LVS_OWNERDATA listview on selection changes.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 1e7f10d2d93f88ca3adc1af304e8fe30ad74ca2f URL: https://gitlab.winehq.org/wine/wine/-/commit/1e7f10d2d93f88ca3adc1af304e8fe… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:10 2022 -0500 comctl32/listview: Send LVN_ODSTATECHANGED notification for LVS_OWNERDATA listview on selection changes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52534 Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit c73290154297e037d2f9181eba01759e1e13965f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 16 ++++++++++++---- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index eb778c323f4..a20ce36a989 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3608,6 +3608,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) */ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) { + INT nFirst = -1, nLast = -1; RANGES selection; DWORD old_mask; LVITEMW item; @@ -3659,21 +3660,28 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) iterator_destroy(&i); } - /* disable per item notifications on LVS_OWNERDATA style - FIXME: single LVN_ODSTATECHANGED should be used */ + /* Disable per item notifications on LVS_OWNERDATA style */ old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); - iterator_rangesitems(&i, selection); while(iterator_next(&i)) - LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + { + /* Find the range for LVN_ODSTATECHANGED */ + if (nFirst == -1) + nFirst = i.nItem; + nLast = i.nItem; + LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + } /* this will also destroy the selection */ iterator_destroy(&i); + if (infoPtr->dwStyle & LVS_OWNERDATA) + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); + infoPtr->notify_mask |= old_mask; LISTVIEW_SetItemFocus(infoPtr, nItem); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a8589b96a06..13069410ac1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3575,7 +3575,7 @@ static void test_ownerdata_multiselect(void) ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", TRUE); + "ownerdata select multiple notification", FALSE); res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res); @@ -3592,7 +3592,7 @@ static void test_ownerdata_multiselect(void) ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", TRUE); + "ownerdata select multiple notification", FALSE); res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res);

1 0

Angelo Haller : comctl32/listview: Send LVN_ODSTATECHANGED only for LVS_OWNERDATA listviews.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: eab4d0ad1f344d9178573fd510ab7217b2ab13a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/eab4d0ad1f344d9178573fd510ab72… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:09 2022 -0500 comctl32/listview: Send LVN_ODSTATECHANGED only for LVS_OWNERDATA listviews. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53123 Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit 6c814f81aa3ab1ffdc27837c6b0d7a2c9b445316) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 60072558da9..eb778c323f4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3585,7 +3585,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) for (i = nFirst; i <= nLast; i++) LISTVIEW_SetItemState(infoPtr,i,&item); - LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); + if (infoPtr->dwStyle & LVS_OWNERDATA) + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); if (!IsWindow(hwndSelf)) return FALSE;

1 0

Angelo Haller : comctl32/listview: Send one deselect all items notification for LVS_OWNERDATA listviews.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 813b704ece756dafacc8f018c1615ec8c3dfa63d URL: https://gitlab.winehq.org/wine/wine/-/commit/813b704ece756dafacc8f018c1615e… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:07 2022 -0500 comctl32/listview: Send one deselect all items notification for LVS_OWNERDATA listviews. Send one deselect all items notification on selection change for LVS_OWNERDATA listviews instead of notifying about each individual item change. Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit 8b392553b32677d25fd3e0fe14f70a5693f3b42c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1b39cf3d41a..5c695c216e5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3404,7 +3404,14 @@ static BOOL LISTVIEW_DeselectAllSkipItems(LISTVIEW_INFO *infoPtr, RANGES toSkip) lvItem.state = 0; lvItem.stateMask = LVIS_SELECTED; - + + /* Only send one deselect all (-1) notification for LVS_OWNERDATA style */ + if (infoPtr->dwStyle & LVS_OWNERDATA) + { + LISTVIEW_SetItemState(infoPtr, -1, &lvItem); + return TRUE; + } + /* need to clone the DPA because callbacks can change it */ if (!(clone = ranges_clone(infoPtr->selectionRanges))) return FALSE; iterator_rangesitems(&i, ranges_diff(clone, toSkip));

1 0

Angelo Haller : comctl32/tests: Add multi select tests for ownerdata listviews.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: a911175205c2aec6e29803aa93071a1066307977 URL: https://gitlab.winehq.org/wine/wine/-/commit/a911175205c2aec6e29803aa93071a… Author: Angelo Haller <angelo(a)szanni.org> Date: Thu Apr 28 08:20:10 2022 -0500 comctl32/tests: Add multi select tests for ownerdata listviews. Add tests for selecting multiple items in ownerdata listviews by using SHIFT/CTRL and arrow keys. Signed-off-by: Angelo Haller <angelo(a)szanni.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ca9e3586de3957716391f76abdb9a16cb6093c32) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/listview.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ffdb30bcaca..129d51ec7f8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3529,6 +3529,56 @@ static void test_ownerdata(void) DestroyWindow(hwnd); } +static void test_ownerdata_multiselect(void) +{ + HWND hwnd; + DWORD res; + LVITEMA item; + + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 20, 0); + expect(1, res); + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(0, res); + + memset(&item, 0, sizeof(item)); + item.state = LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(1, res); + + res = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, 0); + expect(0, res); + + hold_key(VK_SHIFT); + + res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); + expect(0, res); + res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); + expect(0, res); + + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(2, res); + + hold_key(VK_CONTROL); + + res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); + expect(0, res); + res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); + expect(0, res); + + release_key(VK_CONTROL); + release_key(VK_SHIFT); + + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(3, res); + + DestroyWindow(hwnd); +} + static void test_norecompute(void) { static CHAR testA[] = "test"; @@ -6682,6 +6732,7 @@ START_TEST(listview) test_subitem_rect(); test_sorting(); test_ownerdata(); + test_ownerdata_multiselect(); test_norecompute(); test_nosortheader(); test_setredraw(); @@ -6740,6 +6791,7 @@ START_TEST(listview) test_columns(); test_sorting(); test_ownerdata(); + test_ownerdata_multiselect(); test_norecompute(); test_nosortheader(); test_indentation();

1 0

Angelo Haller : comctl32/tests: Add hold_key and release_key functions.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 9513e43d9ca997ec4468397e26be36ed655b3f1e URL: https://gitlab.winehq.org/wine/wine/-/commit/9513e43d9ca997ec4468397e26be36… Author: Angelo Haller <angelo(a)szanni.org> Date: Thu Apr 28 08:20:09 2022 -0500 comctl32/tests: Add hold_key and release_key functions. Add functions to simulate the holding of keys like SHIFT, CTRL,... Move existing SHIFT key press emulation to these functions. Signed-off-by: Angelo Haller <angelo(a)szanni.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d78448464f8e3d4f4e7419c42559de515acfcd2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/listview.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 236a9d14372..ffdb30bcaca 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -461,6 +461,30 @@ static const struct message listview_end_label_edit_kill_focus[] = { { 0 } }; +static void hold_key(int vk) +{ + BYTE kstate[256]; + BOOL res; + + res = GetKeyboardState(kstate); + ok(res, "GetKeyboardState failed.\n"); + kstate[vk] |= 0x80; + res = SetKeyboardState(kstate); + ok(res, "SetKeyboardState failed.\n"); +} + +static void release_key(int vk) +{ + BYTE kstate[256]; + BOOL res; + + res = GetKeyboardState(kstate); + ok(res, "GetKeyboardState failed.\n"); + kstate[vk] &= ~0x80; + res = SetKeyboardState(kstate); + ok(res, "SetKeyboardState failed.\n"); +} + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -2355,7 +2379,6 @@ static void test_multiselect(void) int i, j; static const int items=5; DWORD item_count; - BYTE kstate[256]; select_task task; LONG_PTR style; LVITEMA item; @@ -2422,10 +2445,7 @@ static void test_multiselect(void) selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); ok(selected_count == 1, "expected 1, got %d\n", selected_count); - /* Set SHIFT key pressed */ - GetKeyboardState(kstate); - kstate[VK_SHIFT]=0x80; - SetKeyboardState(kstate); + hold_key(VK_SHIFT); for (j=1;j<=(task.count == -1 ? item_count : task.count);j++) { r = SendMessageA(hwnd, WM_KEYDOWN, task.loopVK, 0); @@ -2440,10 +2460,7 @@ static void test_multiselect(void) "Failed multiple selection %s. There should be %d selected items (is %d)\n", task.descr, item_count, selected_count); - /* Set SHIFT key released */ - GetKeyboardState(kstate); - kstate[VK_SHIFT]=0x00; - SetKeyboardState(kstate); + release_key(VK_SHIFT); } DestroyWindow(hwnd);

1 0

Angelo Haller : comctl32/tests: Add change sequence for ownerdata listviews.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 7fc9c2ef9a6a50292975e8766df9b405b2b54c28 URL: https://gitlab.winehq.org/wine/wine/-/commit/7fc9c2ef9a6a50292975e8766df9b4… Author: Angelo Haller <angelo(a)szanni.org> Date: Thu Apr 28 08:20:11 2022 -0500 comctl32/tests: Add change sequence for ownerdata listviews. Add a new test sequence for ownerdata listviews that logs solely item change notifications for single and multiple items changing. Use it in the ownerdata multiselect tests. Signed-off-by: Angelo Haller <angelo(a)szanni.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1132f5f74be000a8cda980030f8405fa41df8b07) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/listview.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 129d51ec7f8..a8589b96a06 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -37,6 +37,7 @@ enum seq_index { PARENT_SEQ_INDEX, PARENT_FULL_SEQ_INDEX, PARENT_CD_SEQ_INDEX, + PARENT_ODSTATECHANGED_SEQ_INDEX, LISTVIEW_SEQ_INDEX, EDITBOX_SEQ_INDEX, COMBINED_SEQ_INDEX, @@ -244,6 +245,14 @@ static const struct message ownerdata_deselect_all_parent_seq[] = { { 0 } }; +static const struct message ownerdata_multiselect_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + static const struct message change_all_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -522,6 +531,10 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP add_message(sequences, PARENT_SEQ_INDEX, &msg); add_message(sequences, COMBINED_SEQ_INDEX, &msg); } + /* log change messages for single and multiple items changing in ownerdata listviews */ + if (message == WM_NOTIFY && (msg.id == LVN_ITEMCHANGED || msg.id == LVN_ODSTATECHANGED)) + add_message(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, &msg); + add_message(sequences, PARENT_FULL_SEQ_INDEX, &msg); switch (message) @@ -3555,8 +3568,15 @@ static void test_ownerdata_multiselect(void) hold_key(VK_SHIFT); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); expect(0, res); + + ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, + ownerdata_multiselect_odstatechanged_seq, + "ownerdata select multiple notification", TRUE); + res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res); @@ -3565,8 +3585,15 @@ static void test_ownerdata_multiselect(void) hold_key(VK_CONTROL); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); expect(0, res); + + ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, + ownerdata_multiselect_odstatechanged_seq, + "ownerdata select multiple notification", TRUE); + res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res);

1 0

Dmitry Timoshkov : comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 4696811b12d1ad8edbb8eb3293ae5bfeb89aaec3 URL: https://gitlab.winehq.org/wine/wine/-/commit/4696811b12d1ad8edbb8eb3293ae5b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 11 17:24:36 2022 +0300 comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8961e7220b9fe3e7dc6a43528ccb13f7dc9a8564) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/listview.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..236a9d14372 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -472,7 +472,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + + msg.id = nmlv->hdr.code; + if (msg.id == LVN_ITEMCHANGING || msg.id == LVN_ITEMCHANGED) + { + msg.wParam = nmlv->iItem; + msg.lParam = nmlv->uChanged; + } + } if (message == WM_COMMAND) msg.id = HIWORD(wParam); /* log system messages, except for painting */

1 0

Santino Mazza : riched20: Ensure that cursor is visible when selecting text.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 3ef233435c0d76610957d3be33103b0bebad460c URL: https://gitlab.winehq.org/wine/wine/-/commit/3ef233435c0d76610957d3be33103b… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 14:13:58 2022 -0300 riched20: Ensure that cursor is visible when selecting text. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40444 Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> (cherry picked from commit 25209c162fc209124b369abbad55d915d31909b2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 1 + dlls/riched20/tests/editor.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 429f023ebe4..a7dee6682a7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2142,6 +2142,7 @@ int set_selection( ME_TextEditor *editor, int to, int from ) if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); + editor_ensure_visible( editor, &editor->pCursors[0] ); if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 430bb81a773..24ada648c6e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5032,7 +5032,6 @@ static void check_EM_SETSEL_multiline(HWND hwnd) oldY = get_scroll_pos_y(hwnd); SendMessageA(hwnd, EM_SETSEL, 59, 59); curY = get_scroll_pos_y(hwnd); - todo_wine ok(oldY < curY, "oldY %d >= curY %d\n", oldY, curY); }

1 0

Santino Mazza : riched20/tests: When selection is out of view, the scrollbar should move.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 8ceee3b79b10e78abfc6e95fa89f2e9b9c44adb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ceee3b79b10e78abfc6e95fa89f2e… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 14:11:27 2022 -0300 riched20/tests: When selection is out of view, the scrollbar should move. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> (cherry picked from commit ee131e9eba7dad090f0baf4a73fab2d62dc73b52) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 85f7c00383a..430bb81a773 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5018,6 +5018,24 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } +/* When the selection is out of the windows view, the scrollbar should move. */ +static void check_EM_SETSEL_multiline(HWND hwnd) +{ + int oldY; + int curY; + const char textwithlines[] = "This is a text\n" + "with lines\n" + "I expect this text\n" + "to be\nlarge\nenough\n"; + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)textwithlines); + oldY = get_scroll_pos_y(hwnd); + SendMessageA(hwnd, EM_SETSEL, 59, 59); + curY = get_scroll_pos_y(hwnd); + todo_wine + ok(oldY < curY, "oldY %d >= curY %d\n", oldY, curY); +} + static void test_EM_SETSEL(void) { char buffA[32] = {0}; @@ -5058,6 +5076,8 @@ static void test_EM_SETSEL(void) ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); } + check_EM_SETSEL_multiline(hwndRichEdit); + DestroyWindow(hwndRichEdit); }

1 0