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

Alistair Leslie-Hughes : msado15: Support VT_I4/I2 for Fields Item property.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: 38f01fe2cb8a36a7ff6f1f3a0395631fa3468699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38f01fe2cb8a36a7ff6f1f3a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 8 14:22:56 2021 +1000 msado15: Support VT_I4/I2 for Fields Item property. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 16 ++++++++++++++++ dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 8d7619d9161..7cd943f55d5 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -740,6 +740,22 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) { ULONG i; + if (V_VT( index ) == VT_I4 || V_VT( index ) == VT_I2) + { + if (V_VT( index ) == VT_I4) + i = V_I4 ( index ); + else + i = V_I2 ( index ); + + if (i < fields->count) + { + *ret = i; + return S_OK; + } + + return MAKE_ADO_HRESULT(adErrItemNotFound); + } + if (V_VT( index ) != VT_BSTR) { FIXME( "variant type %u not supported\n", V_VT( index ) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 97a578b0618..860144338c0 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -133,6 +133,23 @@ static void test_Recordset(void) hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); + V_VT( &index ) = VT_I4; + V_I4( &index ) = 1000; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + + V_VT( &index ) = VT_I4; + V_I4( &index ) = 0; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + + V_VT( &index ) = VT_I2; + V_I4( &index ) = 0; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; hr = Fields_get_Item( fields, index, &field );

1 0

Hugh McMaster : regedit: Allow deletion of selected values without focus.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: c1733540d67ebceef7bd98a03955c5f41a654200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1733540d67ebceef7bd98a0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 8 22:55:31 2021 +1000 regedit: Allow deletion of selected values without focus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 14f4d711ec1..bb843a89af4 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -178,7 +178,7 @@ static void UpdateMenuItems(HMENU hMenu) { selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); + MAKELPARAM(LVNI_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); update_modify_items(hMenu, index);

1 0

Nikolay Sivov : mfplat/buffer: Fix maximum length for YV12 format.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: dddd5a5f5e6aa1a2bdbccdbf80c58305383bee8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dddd5a5f5e6aa1a2bdbccdbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 8 17:41:24 2021 +0300 mfplat/buffer: Fix maximum length for YV12 format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 1 + dlls/mfplat/tests/mfplat.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index adb53c7dfe7..c1829043e1b 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1357,6 +1357,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','M','C','2'): case MAKEFOURCC('I','M','C','4'): max_length = pitch * height * 3 / 2; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 89f6a945c8a..ff24c2c0ec0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5450,14 +5450,16 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int contiguous_length; int pitch; unsigned int plane_multiplier; + unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64 }, - { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, - { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, - { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, + { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, + { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, @@ -5466,29 +5468,29 @@ static void test_MFCreate2DMediaBuffer(void) { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5681,6 +5683,12 @@ static void test_MFCreate2DMediaBuffer(void) hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (ptr->max_length) + ok(length == ptr->max_length, "%u: unexpected maximum length %u for %u x %u, format %s.\n", + i, length, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr);

1 0

Esme Povirk : sppc: Stub SLPersistApplicationPolicies.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: f888beb58e0fa40ba227f1f5d439fe76f9ca3477 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f888beb58e0fa40ba227f1f5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Jun 8 10:47:45 2021 -0500 sppc: Stub SLPersistApplicationPolicies. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sppc/sppc.c | 10 ++++++++++ dlls/sppc/sppc.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index cd78611558d..c05f15a28db 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -50,3 +50,13 @@ HRESULT WINAPI SLOpen(HSLC *handle) return S_OK; } + +HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) +{ + FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); + + if (!app) + return E_INVALIDARG; + + return S_OK; +} diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index af93e5619db..3ac40c23972 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -52,7 +52,7 @@ @ stub SLIsGenuineLocalEx @ stub SLLoadApplicationPolicies @ stdcall SLOpen(ptr) -@ stub SLPersistApplicationPolicies +@ stdcall SLPersistApplicationPolicies(ptr ptr long) @ stub SLPersistRTSPayloadOverride @ stub SLReArm @ stub SLRegisterEvent

1 0

Zebediah Figura : ws2_32/tests: Test passing an output buffer to FIONBIO.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: 66109294b8ad6b8568e362ef35c4297005de3694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66109294b8ad6b8568e362ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 7 19:53:07 2021 -0500 ws2_32/tests: Test passing an output buffer to FIONBIO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e99faa4096b..26ad716dbe3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3899,6 +3899,7 @@ static void test_fionbio(void) u_long one = 1, zero = 0; HANDLE port, event; ULONG_PTR key; + void *output; DWORD size; SOCKET s; int ret; @@ -3931,6 +3932,11 @@ static void test_fionbio(void) ret = WSAIoctl(s, FIONBIO, &one, sizeof(one) + 1, NULL, 0, &size, NULL, NULL); ok(!ret, "got error %u\n", WSAGetLastError()); + output = VirtualAlloc(NULL, 4, MEM_RESERVE | MEM_COMMIT, PAGE_NOACCESS); + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one) + 1, output, 4, &size, NULL, NULL); + todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + VirtualFree(output, 0, MEM_FREE); + overlapped.Internal = 0xdeadbeef; overlapped.InternalHigh = 0xdeadbeef; size = 0xdeadbeef;

1 0

Zebediah Figura : ws2_32: Explicitly ignore the output buffer in FIONBIO.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: de89b98b37b2e258fabcd5bc3cf4d8431e42dc91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de89b98b37b2e258fabcd5bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 7 19:53:08 2021 -0500 ws2_32: Explicitly ignore the output buffer in FIONBIO. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51231 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 +++- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a425905e5af..12698a37fd0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3368,8 +3368,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return -1; } + /* Explicitly ignore the output buffer; WeChat tries to pass an address + * without write access. */ ret = server_ioctl_sock( s, IOCTL_AFD_WINE_FIONBIO, in_buff, in_size, - out_buff, out_size, ret_size, overlapped, completion ); + NULL, 0, ret_size, overlapped, completion ); SetLastError( ret ); return ret ? -1 : 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 26ad716dbe3..ddcc4313c8f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3934,7 +3934,7 @@ static void test_fionbio(void) output = VirtualAlloc(NULL, 4, MEM_RESERVE | MEM_COMMIT, PAGE_NOACCESS); ret = WSAIoctl(s, FIONBIO, &one, sizeof(one) + 1, output, 4, &size, NULL, NULL); - todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!ret, "got error %u\n", WSAGetLastError()); VirtualFree(output, 0, MEM_FREE); overlapped.Internal = 0xdeadbeef;

1 0

Zebediah Figura : ntdll: Introduce IOCTL_AFD_WINE_GET_INTERFACE_LIST.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: 67959e966328fc7391b9329e69da9e63a05ed39b URL: https://source.winehq.org/git/wine.git/?a=commit;h=67959e966328fc7391b9329e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 7 19:53:09 2021 -0500 ntdll: Introduce 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/ntdll/unix/socket.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 1 + 2 files changed, 94 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e5f4862bf3c..bc77514669d 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -24,7 +24,14 @@ #include "config.h" #include <errno.h> +#include <sys/types.h> #include <unistd.h> +#ifdef HAVE_IFADDRS_H +# include <ifaddrs.h> +#endif +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif @@ -1355,6 +1362,92 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_WINE_GET_INTERFACE_LIST: + { +#ifdef HAVE_GETIFADDRS + INTERFACE_INFO *info = out_buffer; + struct ifaddrs *ifaddrs, *ifaddr; + unsigned int count = 0; + ULONG ret_size; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + if (getifaddrs( &ifaddrs ) < 0) + { + status = sock_errno_to_status( errno ); + break; + } + + for (ifaddr = ifaddrs; ifaddr != NULL; ifaddr = ifaddr->ifa_next) + { + if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET) ++count; + } + + ret_size = count * sizeof(*info); + if (out_size < ret_size) + { + status = STATUS_PENDING; + complete_async( handle, event, apc, apc_user, io, STATUS_BUFFER_TOO_SMALL, 0 ); + freeifaddrs( ifaddrs ); + break; + } + + memset( out_buffer, 0, ret_size ); + + count = 0; + for (ifaddr = ifaddrs; ifaddr != NULL; ifaddr = ifaddr->ifa_next) + { + in_addr_t addr, mask; + + if (!ifaddr->ifa_addr || ifaddr->ifa_addr->sa_family != AF_INET) + continue; + + addr = ((const struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr; + mask = ((const struct sockaddr_in *)ifaddr->ifa_netmask)->sin_addr.s_addr; + + info[count].iiFlags = 0; + if (ifaddr->ifa_flags & IFF_BROADCAST) + info[count].iiFlags |= WS_IFF_BROADCAST; + if (ifaddr->ifa_flags & IFF_LOOPBACK) + info[count].iiFlags |= WS_IFF_LOOPBACK; + if (ifaddr->ifa_flags & IFF_MULTICAST) + info[count].iiFlags |= WS_IFF_MULTICAST; +#ifdef IFF_POINTTOPOINT + if (ifaddr->ifa_flags & IFF_POINTTOPOINT) + info[count].iiFlags |= WS_IFF_POINTTOPOINT; +#endif + if (ifaddr->ifa_flags & IFF_UP) + info[count].iiFlags |= WS_IFF_UP; + + info[count].iiAddress.AddressIn.sin_family = WS_AF_INET; + info[count].iiAddress.AddressIn.sin_port = 0; + info[count].iiAddress.AddressIn.sin_addr.WS_s_addr = addr; + + info[count].iiNetmask.AddressIn.sin_family = WS_AF_INET; + info[count].iiNetmask.AddressIn.sin_port = 0; + info[count].iiNetmask.AddressIn.sin_addr.WS_s_addr = mask; + + if (ifaddr->ifa_flags & IFF_BROADCAST) + { + info[count].iiBroadcastAddress.AddressIn.sin_family = WS_AF_INET; + info[count].iiBroadcastAddress.AddressIn.sin_port = 0; + info[count].iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = addr | ~mask; + } + + ++count; + } + + freeifaddrs( ifaddrs ); + status = STATUS_PENDING; + complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, ret_size ); +#else + FIXME( "Interface list queries are currently not supported on this platform.\n" ); + status = STATUS_NOT_SUPPORTED; +#endif + break; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/include/wine/afd.h b/include/wine/afd.h index 2b4c39e7a86..cc328f9bcae 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -100,6 +100,7 @@ struct afd_poll_params #define IOCTL_AFD_WINE_COMPLETE_ASYNC CTL_CODE(FILE_DEVICE_NETWORK, 210, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_FIONREAD CTL_CODE(FILE_DEVICE_NETWORK, 211, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SIOCATMARK CTL_CODE(FILE_DEVICE_NETWORK, 212, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_INTERFACE_LIST CTL_CODE(FILE_DEVICE_NETWORK, 213, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Zebediah Figura : ntdll: Introduce IOCTL_WINE_AFD_KEEPALIVE_VALS.
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: a43c000aefb364e8a95e6aa54691dcc6ba054342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a43c000aefb364e8a95e6aa5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 7 19:53:11 2021 -0500 ntdll: Introduce IOCTL_WINE_AFD_KEEPALIVE_VALS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 1 + 2 files changed, 60 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index bc77514669d..c1cd319ccf9 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -41,6 +41,9 @@ #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#ifdef HAVE_NETINET_TCP_H +# include <netinet/tcp.h> +#endif #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> @@ -72,6 +75,7 @@ #define USE_WS_PREFIX #include "winsock2.h" #include "mswsock.h" +#include "mstcpip.h" #include "ws2tcpip.h" #include "wsipx.h" #include "af_irda.h" @@ -79,6 +83,11 @@ #include "unix_private.h" +#if !defined(TCP_KEEPIDLE) && defined(TCP_KEEPALIVE) +/* TCP_KEEPALIVE is the Mac OS name for TCP_KEEPIDLE */ +#define TCP_KEEPIDLE TCP_KEEPALIVE +#endif + WINE_DEFAULT_DEBUG_CHANNEL(winsock); #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) @@ -1448,6 +1457,56 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_WINE_KEEPALIVE_VALS: + { + struct tcp_keepalive *k = in_buffer; + int keepalive; + + if (!in_buffer || in_size < sizeof(struct tcp_keepalive)) + return STATUS_BUFFER_TOO_SMALL; + keepalive = !!k->onoff; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + if (setsockopt( fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof(int) ) < 0) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + if (keepalive) + { +#ifdef TCP_KEEPIDLE + int idle = max( 1, (k->keepalivetime + 500) / 1000 ); + + if (setsockopt( fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(int) ) < 0) + { + status = STATUS_INVALID_PARAMETER; + break; + } +#else + FIXME("ignoring keepalive timeout\n"); +#endif + } + + if (keepalive) + { +#ifdef TCP_KEEPINTVL + int interval = max( 1, (k->keepaliveinterval + 500) / 1000 ); + + if (setsockopt( fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(int) ) < 0) + status = STATUS_INVALID_PARAMETER; +#else + FIXME("ignoring keepalive interval\n"); +#endif + } + + status = STATUS_SUCCESS; + complete_async( handle, event, apc, apc_user, io, status, 0 ); + break; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/include/wine/afd.h b/include/wine/afd.h index cc328f9bcae..595fc572a1c 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -101,6 +101,7 @@ struct afd_poll_params #define IOCTL_AFD_WINE_FIONREAD CTL_CODE(FILE_DEVICE_NETWORK, 211, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SIOCATMARK CTL_CODE(FILE_DEVICE_NETWORK, 212, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INTERFACE_LIST CTL_CODE(FILE_DEVICE_NETWORK, 213, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_KEEPALIVE_VALS CTL_CODE(FILE_DEVICE_NETWORK, 214, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

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

June 8, 2021

Module: wine Branch: master Commit: 1c5b19e123dc41d7d2abd7bf3a1379304957804c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5b19e123dc41d7d2abd7bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 7 19:53:12 2021 -0500 ws2_32: Use IOCTL_WINE_AFD_KEEPALIVE_VALS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 56 +++++++----------------------------------------- dlls/ws2_32/tests/sock.c | 21 ++++++++---------- 2 files changed, 17 insertions(+), 60 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ee1984ca79a..1b3ad2fa6d0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -40,11 +40,6 @@ # define sipx_node sipx_addr.x_host.c_host #endif /* __FreeBSD__ */ -#if !defined(TCP_KEEPIDLE) && defined(TCP_KEEPALIVE) -/* TCP_KEEPALIVE is the Mac OS name for TCP_KEEPIDLE */ -#define TCP_KEEPIDLE TCP_KEEPALIVE -#endif - #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) WINE_DEFAULT_DEBUG_CHANNEL(winsock); @@ -3228,7 +3223,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID DWORD out_size, LPDWORD ret_size, LPWSAOVERLAPPED overlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE completion ) { - int fd; DWORD status = 0, total = 0; TRACE("%04lx, %s, %p, %d, %p, %d, %p, %p, %p\n", @@ -3422,52 +3416,18 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError( WSAEINVAL ); return -1; } + case WS_SIO_KEEPALIVE_VALS: { - struct tcp_keepalive *k; - int keepalive, keepidle, keepintvl; - - if (!in_buff || in_size < sizeof(struct tcp_keepalive)) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - k = in_buff; - keepalive = k->onoff ? 1 : 0; - keepidle = max( 1, (k->keepalivetime + 500) / 1000 ); - keepintvl = max( 1, (k->keepaliveinterval + 500) / 1000 ); + DWORD ret; - TRACE("onoff: %d, keepalivetime: %d, keepaliveinterval: %d\n", keepalive, keepidle, keepintvl); + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_KEEPALIVE_VALS, in_buff, in_size, + out_buff, out_size, ret_size, overlapped, completion ); + if (!overlapped || completion) *ret_size = 0; + SetLastError( ret ); + return ret ? -1 : 0; + } - fd = get_sock_fd(s, 0, NULL); - if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, sizeof(int)) == -1) - status = WSAEINVAL; -#if defined(TCP_KEEPIDLE) || defined(TCP_KEEPINTVL) - /* these values need to be set only if SO_KEEPALIVE is enabled */ - else if(keepalive) - { -#ifndef TCP_KEEPIDLE - FIXME("ignoring keepalive timeout\n"); -#else - if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) - status = WSAEINVAL; - else -#endif -#ifdef TCP_KEEPINTVL - if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) - status = WSAEINVAL; -#else - FIXME("ignoring keepalive interval\n"); -#endif - } -#else - else - FIXME("ignoring keepalive interval and timeout\n"); -#endif - release_sock_fd(s, fd); - break; - } case WS_SIO_ROUTING_INTERFACE_QUERY: { struct WS_sockaddr *daddr = (struct WS_sockaddr *)in_buff; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3dc11c9bf3d..3648fa2a329 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4012,21 +4012,21 @@ static void test_keepalive_vals(void) ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, 0, NULL, 0, &size, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - todo_wine ok(!size, "got size %u\n", size); + ok(!size, "got size %u\n", size); WSASetLastError(0xdeadbeef); size = 0xdeadbeef; ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(kalive), NULL, 0, &size, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - todo_wine ok(!size, "got size %u\n", size); + ok(!size, "got size %u\n", size); WSASetLastError(0xdeadbeef); size = 0xdeadbeef; make_keepalive(kalive, 0, 0, 0); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, &size, NULL, NULL); ok(ret == 0, "WSAIoctl failed unexpectedly\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(!size, "got size %u\n", size); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, NULL, NULL, NULL); @@ -4054,7 +4054,7 @@ static void test_keepalive_vals(void) overlapped.InternalHigh = 0xdeadbeef; ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, &size, &overlapped, NULL); ok(ret == 0, "WSAIoctl failed unexpectedly\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); todo_wine ok(size == 0xdeadbeef, "got size %u\n", size); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); @@ -4100,14 +4100,11 @@ static void test_keepalive_vals(void) ok(!size, "got size %u\n", size); ret = SleepEx(0, 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, "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, "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(sock); }

1 0

Francois Gouget : user32/tests: Use winetest contexts to simplify set_clipboard_data_process().
by Alexandre Julliard June 8, 2021

June 8, 2021

Module: wine Branch: master Commit: 222d2d94e0946cd6fa6b2c20b896fb6236cf41d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=222d2d94e0946cd6fa6b2c20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 8 12:28:53 2021 +0200 user32/tests: Use winetest contexts to simplify set_clipboard_data_process(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4b95675770b..5071008a0ab 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -151,24 +151,26 @@ static void set_clipboard_data_process( int arg ) { HANDLE ret; + winetest_push_context("process %u", arg); SetLastError( 0xdeadbeef ); if (arg) { - ok( IsClipboardFormatAvailable( CF_WAVE ), "process %u: CF_WAVE not available\n", arg ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); - ok( ret != 0, "process %u: SetClipboardData failed err %u\n", arg, GetLastError() ); + ok( ret != 0, "SetClipboardData failed err %u\n", GetLastError() ); } else { SetClipboardData( CF_WAVE, 0 ); - ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", - arg, GetLastError()); - ok( !IsClipboardFormatAvailable( CF_WAVE ), "process %u: SetClipboardData succeeded\n", arg ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", + GetLastError()); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); - ok( !ret, "process %u: SetClipboardData succeeded\n", arg ); - ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", - arg, GetLastError()); + ok( !ret, "SetClipboardData succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", + GetLastError()); } + winetest_pop_context(); } static void grab_clipboard_process( int arg )

1 0