May 2022 - Wine-commits - list.winehq.org

Rémi Bernon : mountmgr.sys: Avoid passing a stack pointer to the run_loop thread.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 808d4a77f7d719b2985e1df9c996a427606cb079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808d4a77f7d719b2985e1df9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 14:20:01 2022 +0200 mountmgr.sys: Avoid passing a stack pointer to the run_loop thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1f9bd56a384..66034621b44 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -609,7 +609,8 @@ static DWORD WINAPI device_op_thread( void *arg ) static DWORD WINAPI run_loop_thread( void *arg ) { - return MOUNTMGR_CALL( run_loop, arg ); + struct run_loop_params params = {.op_thread = arg, .op_apc = device_op}; + return MOUNTMGR_CALL( run_loop, &params ); } @@ -624,7 +625,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DEVICE_OBJECT *device; HKEY devicemap_key; NTSTATUS status; - struct run_loop_params params; + HANDLE thread; TRACE( "%s\n", debugstr_w(path->Buffer) ); @@ -655,9 +656,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RtlInitUnicodeString( &nameW, L"\\Driver\\Harddisk" ); status = IoCreateDriver( &nameW, harddisk_driver_entry ); - params.op_thread = CreateThread( NULL, 0, device_op_thread, NULL, 0, NULL ); - params.op_apc = device_op; - CloseHandle( CreateThread( NULL, 0, run_loop_thread, &params, 0, NULL )); + thread = CreateThread( NULL, 0, device_op_thread, NULL, 0, NULL ); + CloseHandle( CreateThread( NULL, 0, run_loop_thread, thread, 0, NULL )); #ifdef _WIN64 /* create a symlink so that the Wine port overrides key can be edited with 32-bit reg or regedit */

1 0

Zebediah Figura : server: Do not signal read/write bits if there are read/write asyncs waiting.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: cafd260014932bf6a7319dae768a1f43e65176cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cafd260014932bf6a7319dae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:25 2022 -0500 server: Do not signal read/write bits if there are read/write asyncs waiting. This is validated by tests introduced in 59beffb46c813a3de2eae6f28e3f7f321f666e89 etc. This commit alone doesn't fix said tests, because: * on this poll, we will alert the waiting async; * when reselecting, we will still request POLLIN, because the AFD_POLL_READ request is still active, * when POLLIN is subsequently signaled, we do not remove it in sock_dispatch_asyncs(), because we check async_waiting(), not async_queued(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 29dd1ca7fa8..db0df5ecf79 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1179,10 +1179,9 @@ static void sock_poll_event( struct fd *fd, int event ) break; } - complete_async_polls( sock, event, error ); - event = sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); + complete_async_polls( sock, event, error ); sock_reselect( sock ); }

1 0

Zebediah Figura : server: Don't poll for POLLIN or POLLPRI if there are alerted read asyncs.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 04b33ef098f453d7c46c6b45990d4ceb36716620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b33ef098f453d7c46c6b45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:26 2022 -0500 server: Don't poll for POLLIN or POLLPRI if there are alerted read asyncs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- server/sock.c | 34 +++++++++++++++++++++------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index cf27b4003c5..2ace83f5e21 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -382,7 +382,7 @@ static void test_poll(void) ok(size == 1, "got size %lu\n", size); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); ret = send(client, "a", 1, 0); ok(ret == 1, "got %d\n", ret); diff --git a/server/sock.c b/server/sock.c index db0df5ecf79..cf25994c383 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1229,6 +1229,18 @@ static int sock_get_poll_events( struct fd *fd ) if (!sock->type) /* not initialized yet */ return -1; + LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) + { + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + if (req->sockets[i].sock != sock) continue; + + ev |= poll_flags_from_afd( sock, req->sockets[i].mask ); + } + } + switch (sock->state) { case SOCK_UNCONNECTED: @@ -1271,7 +1283,15 @@ static int sock_get_poll_events( struct fd *fd ) } else if (async_queued( &sock->read_q )) { - if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI; + /* Clear POLLIN and POLLPRI if we have an alerted async, even if + * we're polling this socket for READ or OOB. We can't signal the + * poll if the pending async will read all of the data [cf. the + * matching logic in sock_dispatch_asyncs()], but we also don't + * want to spin polling for POLLIN if we're not going to use it. */ + if (async_waiting( &sock->read_q )) + ev |= POLLIN | POLLPRI; + else + ev &= ~(POLLIN | POLLPRI); } else { @@ -1302,18 +1322,6 @@ static int sock_get_poll_events( struct fd *fd ) break; } - LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) - { - unsigned int i; - - for (i = 0; i < req->count; ++i) - { - if (req->sockets[i].sock != sock) continue; - - ev |= poll_flags_from_afd( sock, req->sockets[i].mask ); - } - } - return ev; }

1 0

Zebediah Figura : server: Do not signal read bits if there are read asyncs alerted.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 30a56639fde4daf5e1eb3c3d37541b1bc9f75a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=30a56639fde4daf5e1eb3c3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:27 2022 -0500 server: Do not signal read bits if there are read asyncs alerted. Asyncs which are alerted but not "waiting" may still consume all data, and we shouldn't signal AFD_POLL_READ or AFD_POLL_OOB in that case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index cf25994c383..2bb2963a840 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1001,10 +1001,13 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) if ((event & POLLOUT) && sock->connect_req && sock->connect_req->iosb->status == STATUS_PENDING) complete_async_connect( sock ); - if (event & (POLLIN | POLLPRI) && async_waiting( &sock->read_q )) + if ((event & (POLLIN | POLLPRI)) && async_queued( &sock->read_q )) { - if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); - async_wake_up( &sock->read_q, STATUS_ALERTED ); + if (async_waiting( &sock->read_q )) + { + if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); + async_wake_up( &sock->read_q, STATUS_ALERTED ); + } event &= ~(POLLIN | POLLPRI); }

1 0

Zebediah Figura : server: Don't poll for POLLOUT if there are alerted write asyncs.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: c5541f8a0814279e477b4c6199981bbe2d8575a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5541f8a0814279e477b4c61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:28 2022 -0500 server: Don't poll for POLLOUT if there are alerted write asyncs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 2bb2963a840..cb76765e495 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1315,7 +1315,12 @@ static int sock_get_poll_events( struct fd *fd ) if (async_queued( &sock->write_q )) { - if (async_waiting( &sock->write_q )) ev |= POLLOUT; + /* As with read asyncs above, clear POLLOUT if we have an alerted + * async. */ + if (async_waiting( &sock->write_q )) + ev |= POLLOUT; + else + ev &= ~POLLOUT; } else if (!sock->wr_shutdown && (mask & AFD_POLL_WRITE)) {

1 0

Zebediah Figura : server: Do not signal write bits if there are write asyncs alerted.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: bff228c198597f4a1c43432988a2d61f93df5bc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff228c198597f4a1c434329… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:29 2022 -0500 server: Do not signal write bits if there are write asyncs alerted. Asyncs which are alerted but not "waiting" may still fill the pipe, and we shouldn't signal AFD_POLL_WRITE in that case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index cb76765e495..aa62a03d699 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1011,10 +1011,13 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) event &= ~(POLLIN | POLLPRI); } - if (event & POLLOUT && async_waiting( &sock->write_q )) + if ((event & POLLOUT) && async_queued( &sock->write_q )) { - if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); - async_wake_up( &sock->write_q, STATUS_ALERTED ); + if (async_waiting( &sock->write_q )) + { + if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); + async_wake_up( &sock->write_q, STATUS_ALERTED ); + } event &= ~POLLOUT; }

1 0

Zebediah Figura : server: Do not signal accept bits if there are accept asyncs queued.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 753fbb28d5c57ef73392dddd6b9e0c57c0dd675b URL: https://source.winehq.org/git/wine.git/?a=commit;h=753fbb28d5c57ef73392dddd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:30 2022 -0500 server: Do not signal accept bits if there are accept asyncs queued. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++-- server/sock.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 2ace83f5e21..5b64ccd7715 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -722,7 +722,7 @@ static void test_poll(void) ok(!size, "got size %lu\n", size); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); closesocket(server); closesocket(client); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 17719bfaacd..f17ffba7a85 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5578,7 +5578,7 @@ static void test_accept_events(struct event_test_ctx *ctx) ok(ret, "got error %lu\n", GetLastError()); ok(!size, "got size %lu\n", size); - check_events_todo(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); closesocket(server); closesocket(client); @@ -5587,7 +5587,7 @@ static void test_accept_events(struct event_test_ctx *ctx) ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); ok(!ret, "got error %u\n", WSAGetLastError()); - check_events_todo(ctx, FD_ACCEPT, 0, 200); + check_events(ctx, FD_ACCEPT, 0, 200); check_events(ctx, 0, 0, 0); server = accept(listener, NULL, NULL); diff --git a/server/sock.c b/server/sock.c index aa62a03d699..e46be9349e2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -990,6 +990,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) if (req->iosb->status == STATUS_PENDING && !req->accepted) { complete_async_accept( sock, req ); + event &= ~POLLIN; break; } }

1 0

Angelo Haller : comctl32/tests: Add hold_key and release_key functions.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 2d78448464f8e3d4f4e7419c42559de515acfcd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d78448464f8e3d4f4e7419c… 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> --- 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 ca263cd644a..160925a073a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -462,6 +462,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; @@ -2356,7 +2380,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; @@ -2423,10 +2446,7 @@ static void test_multiselect(void) selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); ok(selected_count == 1, "expected 1, got %ld\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); @@ -2441,10 +2461,7 @@ static void test_multiselect(void) "Failed multiple selection %s. There should be %ld selected items (is %ld)\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 multi select tests for ownerdata listviews.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: ca9e3586de3957716391f76abdb9a16cb6093c32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9e3586de3957716391f76a… 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> --- 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 160925a073a..124f463908e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3530,6 +3530,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"; @@ -6878,6 +6928,7 @@ START_TEST(listview) test_subitem_rect(); test_sorting(); test_ownerdata(); + test_ownerdata_multiselect(); test_norecompute(); test_nosortheader(); test_setredraw(); @@ -6937,6 +6988,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 change sequence for ownerdata listviews.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 1132f5f74be000a8cda980030f8405fa41df8b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1132f5f74be000a8cda98003… 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> --- 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 124f463908e..6ac7f53137d 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, @@ -254,6 +255,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 }, @@ -523,6 +532,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) @@ -3556,8 +3569,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); @@ -3566,8 +3586,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