June 2021 - Wine-Commits - list.winehq.org

Giovanni Mascellani : mf/session: Fix computing fastest and slowest presentation rates.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: bcd2b99d959f4a630cac9d3167a6785f2e039cc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcd2b99d959f4a630cac9d31… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 8 13:30:53 2021 +0300 mf/session: Fix computing fastest and slowest presentation rates. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 41caf02d059..9f233295773 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <math.h> +#include <float.h> #define COBJMACROS @@ -3536,8 +3537,9 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA struct media_source *source; struct media_sink *sink; HRESULT hr = E_POINTER; + float rate; - *result = 0.0f; + rate = fastest ? FLT_MAX : 0.0f; EnterCriticalSection(&session->cs); @@ -3545,7 +3547,7 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, result))) + if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, &rate))) break; } @@ -3553,7 +3555,7 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { - if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, result))) + if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, &rate))) break; } } @@ -3561,6 +3563,9 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA LeaveCriticalSection(&session->cs); + if (SUCCEEDED(hr)) + *result = direction == MFRATE_FORWARD ? rate : -rate; + return hr; }

1 0

Hans Leidekker : winhttp: Remove redundant parentheses.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: ed9c1fb1b9d2fb2007af0d3f2df96298850ebf34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9c1fb1b9d2fb2007af0d3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 8 16:27:43 2021 +0200 winhttp: Remove redundant parentheses. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 1bdf39bca20..005c35dea4c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1787,7 +1787,7 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) if (!(req = WinHttpOpenRequest( con, NULL, uc.lpszUrlPath, NULL, NULL, acceptW, flags ))) goto done; if (!WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 )) goto done; - if (!(WinHttpReceiveResponse( req, 0 ))) goto done; + if (!WinHttpReceiveResponse( req, 0 )) goto done; if (!WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ) || status != HTTP_STATUS_OK) goto done;

1 0

Rémi Bernon : hidclass.sys: Fix incorrect feature report debug print.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: dc501024ca416f3295ff002bc66ad83570e060c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc501024ca416f3295ff002b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 8 09:26:35 2021 +0200 hidclass.sys: Fix incorrect feature report debug print. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 9364400275a..1c988d89719 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -248,7 +248,7 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) debug_print_report("OUTPUT", data, &data->reports[i]); } end += data->reportCount[HidP_Feature]; - for (i = 0; i < end; i++) + for (; i < end; i++) { debug_print_report("FEATURE", data, &data->reports[i]); }

1 0

Rémi Bernon : hidclass.sys: Dump HID descriptor with 16 byte columns.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: 9f2518b47c5248804d43db63c64a4ec72dce59f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2518b47c5248804d43db63… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 8 09:26:36 2021 +0200 hidclass.sys: Dump HID descriptor with 16 byte columns. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 1c988d89719..65c2f9aadae 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -789,6 +789,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) WINE_HIDP_PREPARSED_DATA *data = NULL; struct collection *base; HIDP_VALUE_CAPS caps; + int i; struct list caps_stack; @@ -797,14 +798,13 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) if (TRACE_ON(hid)) { - TRACE("Descriptor[%i]: ", length); - for (cidx = 0; cidx < length; cidx++) + TRACE("descriptor %p, length %u:\n", descriptor, length); + for (i = 0; i < length;) { - TRACE("%x ",descriptor[cidx]); - if ((cidx+1) % 80 == 0) - TRACE("\n"); + TRACE("%08x ", i); + do { TRACE(" %02x", descriptor[i]); } while (++i % 16 && i < length); + TRACE("\n"); } - TRACE("\n"); } list_init(&caps_stack);

1 0

Rémi Bernon : hidclass.sys: Use realloc instead of HeapReAlloc.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: 06fb03378dcde6e3208c89570a6241f7cf14a1d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fb03378dcde6e3208c8957… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 8 18:12:34 2021 +0200 hidclass.sys: Use realloc instead of HeapReAlloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51223 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index a45833ae383..720ca4eeb20 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -199,7 +199,7 @@ UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) { int count = idx = ring->pointer_alloc; ring->pointer_alloc *= 2; - ring->pointers = HeapReAlloc(GetProcessHeap(), 0, ring->pointers, sizeof(UINT) * ring->pointer_alloc); + ring->pointers = realloc(ring->pointers, sizeof(UINT) * ring->pointer_alloc); for( ;count < ring->pointer_alloc; count++) ring->pointers[count] = POINTER_UNUSED; }

1 0

Hans Leidekker : winhttp: Fix a buffer size check.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: d66e834bfd9feee4aa44843e466b1ff1bc044385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d66e834bfd9feee4aa44843e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 8 16:27:42 2021 +0200 winhttp: Fix a buffer size check. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f052c3c569c..1bdf39bca20 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -992,7 +992,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b CertFreeCertificateContext( request->client_cert ); request->client_cert = NULL; } - else if (buflen >= sizeof(cert)) + else if (buflen >= sizeof(*cert)) { if (!(cert = CertDuplicateCertificateContext( buffer ))) return FALSE; CertFreeCertificateContext( request->client_cert );

1 0

Hans Leidekker : winhttp: Use CRT memory allocators.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: 4f961d9e7a3be045c1cca00cc5478bb8f17b77d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f961d9e7a3be045c1cca00c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 8 16:27:44 2021 +0200 winhttp: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 50 +++---- dlls/winhttp/handle.c | 7 +- dlls/winhttp/net.c | 34 ++--- dlls/winhttp/request.c | 316 +++++++++++++++++++++-------------------- dlls/winhttp/session.c | 144 +++++++++---------- dlls/winhttp/url.c | 8 +- dlls/winhttp/winhttp_private.h | 18 +-- 7 files changed, 286 insertions(+), 291 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f961d9e7a3be045c1cc…

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_INTERFACE_LIST.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: 2afb4356fef43549eb9044d812479aa59a4f3283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2afb4356fef43549eb9044d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 7 19:53:10 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_INTERFACE_LIST. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 131 ++++------------------------------------------- dlls/ws2_32/tests/sock.c | 33 ++++++------ 2 files changed, 24 insertions(+), 140 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 12698a37fd0..ee1984ca79a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3219,122 +3219,6 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s return NtStatusToWSAError( status ); } -static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD *ret_size, DWORD *total_bytes) -{ - DWORD size, interface_count = 0, ret; - INTERFACE_INFO *info = out_buff; - PMIB_IPADDRTABLE table = NULL; - struct if_nameindex *if_ni; - DWORD status = 0; - int fd; - - if (!out_buff) - return WSAEFAULT; - - if ((fd = get_sock_fd(s, 0, NULL)) == -1) - return SOCKET_ERROR; - - if ((ret = GetIpAddrTable(NULL, &size, TRUE)) != ERROR_INSUFFICIENT_BUFFER) - { - if (ret != ERROR_NO_DATA) - { - ERR("Unable to get ip address table.\n"); - status = WSAEINVAL; - } - goto done; - } - if (!(table = heap_alloc(size))) - { - ERR("No memory.\n"); - status = WSAEINVAL; - goto done; - } - if (GetIpAddrTable(table, &size, TRUE) != NO_ERROR) - { - ERR("Unable to get interface table.\n"); - status = WSAEINVAL; - goto done; - } - if (table->dwNumEntries * sizeof(INTERFACE_INFO) > out_size) - { - WARN("Buffer too small, dwNumEntries %u, out_size = %u.\n", table->dwNumEntries, out_size); - *ret_size = 0; - status = WSAEFAULT; - goto done; - } - - if (!(if_ni = if_nameindex())) - { - ERR("Unable to get interface name index.\n"); - status = WSAEINVAL; - goto done; - } - - for (; interface_count < table->dwNumEntries; ++interface_count, ++info) - { - unsigned int addr, mask; - struct ifreq if_info; - unsigned int i; - - memset(info, 0, sizeof(*info)); - - for (i = 0; if_ni[i].if_index || if_ni[i].if_name; ++i) - if (if_ni[i].if_index == table->table[interface_count].dwIndex) - break; - - if (!if_ni[i].if_name) - { - ERR("Error obtaining interface name for ifindex %u.\n", table->table[interface_count].dwIndex); - status = WSAEINVAL; - break; - } - - lstrcpynA(if_info.ifr_name, if_ni[i].if_name, IFNAMSIZ); - if (ioctl(fd, SIOCGIFFLAGS, &if_info) < 0) - { - ERR("Error obtaining status flags for socket.\n"); - status = WSAEINVAL; - break; - } - - if (if_info.ifr_flags & IFF_BROADCAST) - info->iiFlags |= WS_IFF_BROADCAST; -#ifdef IFF_POINTOPOINT - if (if_info.ifr_flags & IFF_POINTOPOINT) - info->iiFlags |= WS_IFF_POINTTOPOINT; -#endif - if (if_info.ifr_flags & IFF_LOOPBACK) - info->iiFlags |= WS_IFF_LOOPBACK; - if (if_info.ifr_flags & IFF_UP) - info->iiFlags |= WS_IFF_UP; - if (if_info.ifr_flags & IFF_MULTICAST) - info->iiFlags |= WS_IFF_MULTICAST; - - addr = table->table[interface_count].dwAddr; - mask = table->table[interface_count].dwMask; - - info->iiAddress.AddressIn.sin_family = WS_AF_INET; - info->iiAddress.AddressIn.sin_port = 0; - info->iiAddress.AddressIn.sin_addr.WS_s_addr = addr; - - info->iiNetmask.AddressIn.sin_family = WS_AF_INET; - info->iiNetmask.AddressIn.sin_port = 0; - info->iiNetmask.AddressIn.sin_addr.WS_s_addr = mask; - - if (if_info.ifr_flags & IFF_BROADCAST) - { - info->iiBroadcastAddress.AddressIn.sin_family = WS_AF_INET; - info->iiBroadcastAddress.AddressIn.sin_port = 0; - info->iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = addr | ~mask; - } - } - if_freenameindex(if_ni); -done: - heap_free(table); - *total_bytes = sizeof(INTERFACE_INFO) * interface_count; - release_sock_fd(s, fd); - return status; -} /********************************************************************** * WSAIoctl (WS2_32.50) @@ -3403,13 +3287,16 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError(WSAEINVAL); return SOCKET_ERROR; - case WS_SIO_GET_INTERFACE_LIST: - { - TRACE("-> SIO_GET_INTERFACE_LIST request\n"); + case WS_SIO_GET_INTERFACE_LIST: + { + DWORD ret; - status = get_interface_list(s, out_buff, out_size, ret_size, &total); - break; - } + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_GET_INTERFACE_LIST, in_buff, in_size, + out_buff, out_size, ret_size, overlapped, completion ); + SetLastError( ret ); + if (ret && ret != ERROR_IO_PENDING) *ret_size = 0; + return ret ? -1 : 0; + } case WS_SIO_ADDRESS_LIST_QUERY: { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ddcc4313c8f..3dc11c9bf3d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10076,7 +10076,7 @@ static void test_get_interface_list(void) WSASetLastError(0xdeadbeef); ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(buffer), &size, NULL, NULL); ok(!ret, "Got unexpected ret %d.\n", ret); - todo_wine ok(!WSAGetLastError(), "Got error %u.\n", WSAGetLastError()); + ok(!WSAGetLastError(), "Got error %u.\n", WSAGetLastError()); ok(size && size != 0xdeadbeef && !(size % sizeof(INTERFACE_INFO)), "Got unexpected size %u.\n", size); expect_size = size; @@ -10084,9 +10084,9 @@ static void test_get_interface_list(void) overlapped.Internal = 0xdeadbeef; overlapped.InternalHigh = 0xdeadbeef; ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(buffer), &size, &overlapped, NULL); - todo_wine ok(ret == -1, "Got unexpected ret %d.\n", ret); - todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "Got error %u.\n", WSAGetLastError()); - todo_wine ok(size == 0xdeadbeef, "Got size %u.\n", size); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "Got error %u.\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "Got size %u.\n", size); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 100); ok(ret, "Got error %u.\n", GetLastError()); @@ -10131,16 +10131,16 @@ static void test_get_interface_list(void) overlapped.InternalHigh = 0xdeadbeef; ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO) - 1, &size, &overlapped, NULL); ok(ret == -1, "Got unexpected ret %d.\n", ret); - todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "Got error %u.\n", WSAGetLastError()); - todo_wine ok(size == 0xdeadbeef, "Got size %u.\n", size); + ok(WSAGetLastError() == ERROR_IO_PENDING, "Got error %u.\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "Got size %u.\n", size); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 100); ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got error %u.\n", GetLastError()); ok(!size, "Got size %u.\n", size); ok(key == 123, "Got key %Iu.\n", key); ok(overlapped_ptr == &overlapped, "Got overlapped %p.\n", overlapped_ptr); - todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_BUFFER_TOO_SMALL, "Got status %#x.\n", (NTSTATUS)overlapped.Internal); + ok((NTSTATUS)overlapped.Internal == STATUS_BUFFER_TOO_SMALL, "Got status %#x.\n", (NTSTATUS)overlapped.Internal); ok(!overlapped.InternalHigh, "Got size %Iu.\n", overlapped.InternalHigh); ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(buffer), NULL, NULL, NULL); @@ -10160,18 +10160,15 @@ static void test_get_interface_list(void) ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO) - 1, &size, &overlapped, socket_apc); ok(ret == -1, "Got unexpected ret %d.\n", ret); - todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "Got error %u.\n", WSAGetLastError()); - todo_wine ok(size == 0xdeadbeef, "Got size %u.\n", size); + ok(WSAGetLastError() == ERROR_IO_PENDING, "Got error %u.\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "Got size %u.\n", size); ret = SleepEx(100, TRUE); - todo_wine ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); - if (ret == WAIT_IO_COMPLETION) - { - ok(apc_count == 1, "APC was called %u times\n", apc_count); - ok(apc_error == WSAEFAULT, "got APC error %u\n", apc_error); - ok(!apc_size, "got APC size %u\n", apc_size); - ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); - } + ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); + ok(apc_count == 1, "APC was called %u times\n", apc_count); + ok(apc_error == WSAEFAULT, "got APC error %u\n", apc_error); + ok(!apc_size, "got APC size %u\n", apc_size); + ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); closesocket(s); }

1 0

Zebediah Figura : ws2_32: Wait for synchronous ioctl completion in server_ioctl_sock().
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: aadcff491fc9d823a90cee567c8e1d55cd9a589b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aadcff491fc9d823a90cee56… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:24:19 2021 -0500 ws2_32: Wait for synchronous ioctl completion in server_ioctl_sock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3c7bfdf6edb..a425905e5af 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3188,6 +3188,10 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s if (!((ULONG_PTR)overlapped->hEvent & 1)) cvalue = overlapped; event = overlapped->hEvent; } + else + { + if (!(event = get_sync_event())) return GetLastError(); + } if (completion) { @@ -3198,6 +3202,12 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s status = NtDeviceIoControlFile( handle, event, apc, cvalue, piosb, code, in_buff, in_size, out_buff, out_size ); + if (status == STATUS_PENDING && !overlapped) + { + if (WaitForSingleObject( event, INFINITE ) == WAIT_FAILED) + return -1; + status = piosb->u.Status; + } if (status == STATUS_NOT_SUPPORTED) { FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n",

1 0

Zebediah Figura : server: Don't rely on async_is_blocking() to determine whether IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE should block.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 8c26fca5c2c83ebba668578a814040de5c96bde2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c26fca5c2c83ebba668578a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:24:18 2021 -0500 server: Don't rely on async_is_blocking() to determine whether IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE should block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 ++- server/async.c | 5 ----- server/file.h | 1 - server/sock.c | 13 ++++++++++++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ab736947807..3c7bfdf6edb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3639,9 +3639,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_ADDRESS_LIST_CHANGE: { + int force_async = !!overlapped; DWORD ret; - ret = server_ioctl_sock( s, IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE, in_buff, in_size, + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE, &force_async, sizeof(force_async), out_buff, out_size, ret_size, overlapped, completion ); SetLastError( ret ); return ret ? -1 : 0; diff --git a/server/async.c b/server/async.c index d6d3a8ad86a..4dedb27f3d8 100644 --- a/server/async.c +++ b/server/async.c @@ -557,11 +557,6 @@ struct thread *async_get_thread( struct async *async ) return async->thread; } -int async_is_blocking( struct async *async ) -{ - return !async->event && !async->data.apc && !async->data.apc_context; -} - /* find the first pending async in queue */ struct async *find_pending_async( struct async_queue *queue ) { diff --git a/server/file.h b/server/file.h index ba97a833c71..b8bc7645b19 100644 --- a/server/file.h +++ b/server/file.h @@ -232,7 +232,6 @@ extern void fd_copy_completion( struct fd *src, struct fd *dst ); extern struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ); extern struct iosb *async_get_iosb( struct async *async ); extern struct thread *async_get_thread( struct async *async ); -extern int async_is_blocking( struct async *async ); extern struct async *find_pending_async( struct async_queue *queue ); extern void cancel_process_asyncs( struct process *process ); diff --git a/server/sock.c b/server/sock.c index 700d4c0761a..f2450fcc541 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1882,7 +1882,17 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } case IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE: - if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) + { + int force_async; + + if (get_req_data_size() < sizeof(int)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + force_async = *(int *)get_req_data(); + + if ((sock->state & FD_WINE_NONBLOCKING) && !force_async) { set_error( STATUS_DEVICE_NOT_READY ); return 0; @@ -1891,6 +1901,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) queue_async( &sock->ifchange_q, async ); set_error( STATUS_PENDING ); return 1; + } case IOCTL_AFD_WINE_FIONBIO: if (get_req_data_size() < sizeof(int))

1 0