September 2021 - Wine-commits

Rémi Bernon : dinput: Set HID joystick objects wCollectionNumber field.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: aa60766259e60dd54443f8c74220273902ec91ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa60766259e60dd54443f8c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 10:51:36 2021 +0200 dinput: Set HID joystick objects wCollectionNumber field. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++++ dlls/dinput8/tests/hid.c | 13 +++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index f7107733d26..acd21001bdf 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -248,6 +248,7 @@ static BOOL enum_value_objects( struct hid_joystick *impl, const DIPROPHEADER *f instance.wUsage = caps.value->NotRange.Usage; instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps.value->ReportID; + instance.wCollectionNumber = caps.value->LinkCollection; switch (instance.wUsage) { @@ -348,6 +349,7 @@ static BOOL enum_button_objects( struct hid_joystick *impl, const DIPROPHEADER * instance.wUsage = j; instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps.button->ReportID; + instance.wCollectionNumber = caps.button->LinkCollection; ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } @@ -363,6 +365,7 @@ static BOOL enum_button_objects( struct hid_joystick *impl, const DIPROPHEADER * instance.wUsage = caps.button->NotRange.Usage; instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps.button->ReportID; + instance.wCollectionNumber = caps.button->LinkCollection; ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } @@ -396,6 +399,7 @@ static BOOL enum_collections_objects( struct hid_joystick *impl, const DIPROPHEA instance.wUsage = caps.node->LinkUsage; instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = 0; + instance.wCollectionNumber = caps.node->Parent; ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index c0f1b78160c..23dc3f6d5f8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3567,11 +3567,11 @@ static void test_simple_joystick(void) }; const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = { - {.ofs = TRUE, .type = TRUE, .collection_number = TRUE}, - {.ofs = TRUE, .type = TRUE, .collection_number = TRUE}, - {.ofs = TRUE, .collection_number = TRUE}, - {.ofs = TRUE, .collection_number = TRUE}, - {.ofs = TRUE, .collection_number = TRUE}, + {.ofs = TRUE, .type = TRUE}, + {.ofs = TRUE, .type = TRUE}, + {.ofs = TRUE}, + {.ofs = TRUE}, + {.ofs = TRUE}, {}, {.type = TRUE}, }; @@ -3968,7 +3968,6 @@ static void test_simple_joystick(void) if (!localized) todo_wine check_member_wstr( objinst, expect_objects[1], tszName ); check_member( objinst, expect_objects[1], "%u", dwFFMaxForce ); check_member( objinst, expect_objects[1], "%u", dwFFForceResolution ); - todo_wine check_member( objinst, expect_objects[1], "%u", wCollectionNumber ); check_member( objinst, expect_objects[1], "%u", wDesignatorIndex ); check_member( objinst, expect_objects[1], "%#04x", wUsagePage ); @@ -4000,7 +3999,6 @@ static void test_simple_joystick(void) if (!localized) todo_wine check_member_wstr( objinst, expect_objects[4], tszName ); check_member( objinst, expect_objects[4], "%u", dwFFMaxForce ); check_member( objinst, expect_objects[4], "%u", dwFFForceResolution ); - todo_wine check_member( objinst, expect_objects[4], "%u", wCollectionNumber ); check_member( objinst, expect_objects[4], "%u", wDesignatorIndex ); check_member( objinst, expect_objects[4], "%#04x", wUsagePage ); @@ -4035,7 +4033,6 @@ static void test_simple_joystick(void) if (!localized) todo_wine check_member_wstr( objinst, expect_objects[0], tszName ); check_member( objinst, expect_objects[0], "%u", dwFFMaxForce ); check_member( objinst, expect_objects[0], "%u", dwFFForceResolution ); - todo_wine check_member( objinst, expect_objects[0], "%u", wCollectionNumber ); check_member( objinst, expect_objects[0], "%u", wDesignatorIndex ); check_member( objinst, expect_objects[0], "%#04x", wUsagePage );

1 0

Rémi Bernon : dinput: Add an instance number to HID joystick collection objects.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: eab7819d7adde5c3c2611bd33bd88f664c2a7beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eab7819d7adde5c3c2611bd3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 10:51:37 2021 +0200 dinput: Add an instance number to HID joystick collection objects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- dlls/dinput8/tests/hid.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index acd21001bdf..4d7bbe82a23 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -379,8 +379,8 @@ static BOOL enum_collections_objects( struct hid_joystick *impl, const DIPROPHEA { DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_caps caps = {.type = LINK_COLLECTION_NODE}; + DWORD collection = 0, i; BOOL ret; - DWORD i; for (i = 0; i < impl->caps.NumberLinkCollectionNodes; ++i) { @@ -393,7 +393,7 @@ static BOOL enum_collections_objects( struct hid_joystick *impl, const DIPROPHEA else { instance.dwOfs = 0; - instance.dwType = DIDFT_COLLECTION | DIDFT_NODATA; + instance.dwType = DIDFT_COLLECTION | DIDFT_MAKEINSTANCE( collection++ ) | DIDFT_NODATA; instance.dwFlags = 0; instance.wUsagePage = caps.node->LinkUsagePage; instance.wUsage = caps.node->LinkUsage; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 23dc3f6d5f8..54d85cae14b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3572,8 +3572,6 @@ static void test_simple_joystick(void) {.ofs = TRUE}, {.ofs = TRUE}, {.ofs = TRUE}, - {}, - {.type = TRUE}, }; struct check_objects_params check_objects_params =

1 0

Gerald Pfeifer : ntdll: Fix init_builtin_dll for FreeBSD again.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: cac8c971a7a989afb4a5a6f8f95a4f3b78e78593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cac8c971a7a989afb4a5a6f8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Sep 22 18:58:33 2021 +0200 ntdll: Fix init_builtin_dll for FreeBSD again. Commit e9cfc97d46aaf39bc9c2a41b319d3b3b358c0f04 Revert "ntdll: Add a Wine-specific class in NtQueryVirtualMemory to retrieve the init functions of a module." This reverts commits e5339ecbc66f20193a0a6b1dfdce98d42d2ad926 and 18408b18f3ebd9630a02f0bd16864f5e5118b71a. broke the build on FreeBSD. Adjust the return value for FreeBSD as well. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6fbd112be01..5e39209eddc 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2001,7 +2001,7 @@ static void CDECL init_builtin_dll( void *module ) /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */ if (offsetof(struct link_map, l_addr) == 0) if (!get_relocbase(map->l_addr, &relocbase)) - return STATUS_NOT_SUPPORTED; + return; #endif switch (dyn->d_tag) {

1 0

Zebediah Figura : ndis.sys/tests: Test passing a bogus OID to IOCTL_NDIS_QUERY_GLOBAL_STATS.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: ef18fb9a3b4dcb4017a623e02ad6317fbffd030b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef18fb9a3b4dcb4017a623e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 22 23:00:37 2021 -0500 ndis.sys/tests: Test passing a bogus OID to IOCTL_NDIS_QUERY_GLOBAL_STATS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/tests/ndis.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index d6a2db0fd9d..caece671476 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -58,6 +58,15 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) return; } + oid = 0xdeadbeef; + iosb.Status = 0xdeadbeef; + iosb.Information = 0xdeadbeef; + status = NtDeviceIoControlFile( netdev, NULL, NULL, NULL, &iosb, + IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid), &medium, sizeof(medium) ); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); + ok(iosb.Status == 0xdeadbeef, "got %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got size %#Ix\n", iosb.Information); + oid = OID_GEN_MEDIA_SUPPORTED; ret = DeviceIoControl( netdev, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid), &medium, sizeof(medium), &size, NULL );

1 0

Zebediah Figura : ndis.sys: Return the IOSB status from ndis_ioctl().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: ff664bf817e5ad98551d3945dcc97fb05fa3a23d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff664bf817e5ad98551d3945… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 22 23:00:38 2021 -0500 ndis.sys: Return the IOSB status from ndis_ioctl(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51757 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 94c19ffca53..e1517f77700 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -98,6 +98,7 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); MIB_IF_ROW2 *netdev = device->DeviceExtension; + NTSTATUS status; TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -115,8 +116,9 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) break; } + status = irp->IoStatus.u.Status; IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_SUCCESS; + return status; } static void add_key(const WCHAR *guidstrW, const MIB_IF_ROW2 *netdev)

1 0

Zebediah Figura : ndis.sys: Return STATUS_INVALID_PARAMETER for unknown OIDs.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 2bec828af49059196e24c10fb1a5a547e3a6528b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bec828af49059196e24c10f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 22 23:00:39 2021 -0500 ndis.sys: Return STATUS_INVALID_PARAMETER for unknown OIDs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 2 +- dlls/ndis.sys/tests/ndis.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index e1517f77700..a0d2581aaa9 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -89,7 +89,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) } default: FIXME( "Unsupported OID %x\n", oid ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; break; } } diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index caece671476..3349f1dae97 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -63,7 +63,7 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) iosb.Information = 0xdeadbeef; status = NtDeviceIoControlFile( netdev, NULL, NULL, NULL, &iosb, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid), &medium, sizeof(medium) ); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); ok(iosb.Status == 0xdeadbeef, "got %#x\n", iosb.Status); ok(iosb.Information == 0xdeadbeef, "got size %#Ix\n", iosb.Information);

1 0

Zebediah Figura : ntdll: Return STATUS_PENDING when restarting asyncs.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 455b707ea2fbbfdc84a4bb6e140d694dc30981cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=455b707ea2fbbfdc84a4bb6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 00:47:59 2021 -0500 ntdll: Return STATUS_PENDING when restarting asyncs. Fixes: 1eb56b20baefcdccaafbb622cadc71670c149e18 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 050824a1440..53d34e1858a 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -390,6 +390,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO /* the server will pass us NULL if a call failed synchronously */ set_async_iosb( call->async_io.sb, result->async_io.status, info ); } + else result->async_io.status = STATUS_PENDING; /* restart it */ break; } case APC_VIRTUAL_ALLOC:

1 0

Zebediah Figura : ntdll: Return STATUS_DEVICE_NOT_READY instead of STATUS_PENDING from try_transmit().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 4f4fee53a61c231d21a9ba0669f200b9f60a5de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4fee53a61c231d21a9ba06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 00:48:00 2021 -0500 ntdll: Return STATUS_DEVICE_NOT_READY instead of STATUS_PENDING from try_transmit(). async_transmit_proc() expects the former. Fixes: 1eb56b20baefcdccaafbb622cadc71670c149e18 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 73d61c0d4e6..ec6aa02d14a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1017,7 +1017,7 @@ static NTSTATUS try_transmit( int sock_fd, int file_fd, struct async_transmit_io if (ret < read_size || (async->file_len && async->file_cursor == async->file_len)) async->file = NULL; - return STATUS_PENDING; /* still more data to send */ + return STATUS_DEVICE_NOT_READY; /* still more data to send */ } while (async->tail_cursor < async->buffers.TailLength)

1 0

Guillaume Charifi : ws2_32: Add tests for IOCTL_AFD_POLL exclusive flag.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: a215324c6b47f4cc9a7904d541be72c973534e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a215324c6b47f4cc9a7904d5… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Sep 23 00:48:01 2021 -0500 ws2_32: Add tests for IOCTL_AFD_POLL exclusive flag. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 6 +- dlls/ws2_32/tests/afd.c | 349 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 2 +- 3 files changed, 353 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a215324c6b47f4cc9a79…

1 0

Zebediah Figura : server: Factor out a complete_async_poll() helper.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: c3b32dbccf412c7f351876e4ff4cc307f12f334e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3b32dbccf412c7f351876e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 00:48:02 2021 -0500 server: Factor out a complete_async_poll() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/server/sock.c b/server/sock.c index fc234e89865..e426019d558 100644 --- a/server/sock.c +++ b/server/sock.c @@ -832,6 +832,12 @@ static int get_poll_flags( struct sock *sock, int event ) return flags; } +static void complete_async_poll( struct poll_req *req, unsigned int status ) +{ + /* pass 0 as result; client will set actual result size */ + async_request_complete( req->async, status, 0, req->count * sizeof(*req->output), req->output ); +} + static void complete_async_polls( struct sock *sock, int event, int error ) { int flags = get_poll_flags( sock, event ); @@ -855,8 +861,7 @@ static void complete_async_polls( struct sock *sock, int event, int error ) req->output[i].flags = req->sockets[i].flags & flags; req->output[i].status = sock_get_ntstatus( error ); - async_request_complete( req->async, STATUS_SUCCESS, 0, - req->count * sizeof(*req->output), req->output ); + complete_async_poll( req, STATUS_SUCCESS ); break; } } @@ -870,7 +875,7 @@ static void async_poll_timeout( void *private ) if (req->iosb->status != STATUS_PENDING) return; - async_request_complete( req->async, STATUS_TIMEOUT, 0, req->count * sizeof(*req->output), req->output ); + complete_async_poll( req, STATUS_TIMEOUT ); } static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) @@ -1320,12 +1325,7 @@ static int sock_close_handle( struct object *obj, struct process *process, obj_h } } - if (signaled) - { - /* pass 0 as result; client will set actual result size */ - async_request_complete( poll_req->async, STATUS_SUCCESS, 0, - poll_req->count * sizeof(*poll_req->output), poll_req->output ); - } + if (signaled) complete_async_poll( poll_req, STATUS_SUCCESS ); } } @@ -2913,7 +2913,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t } if (!timeout || signaled) - async_request_complete( req->async, STATUS_SUCCESS, 0, count * sizeof(*output), output ); + complete_async_poll( req, STATUS_SUCCESS ); for (i = 0; i < req->count; ++i) sock_reselect( req->sockets[i].sock );

1 0