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

Nikolay Sivov : mfplay: Enable source type enumeration.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: abd3e8f3ec755eb3f09ab5333781b0daebe8f123 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abd3e8f3ec755eb3f09ab533… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 28 16:17:06 2021 +0300 mfplay: Enable source type enumeration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 540a182a5ba..f6cb81de436 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1137,6 +1137,8 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me IMFStreamDescriptor_Release(sd); } + IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE); + *out = topology; return S_OK;

1 0

Francois Gouget : ntdll/tests: Fix the XState AllFeatureSize check on old CPUs.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: dc94b03799363a94b6f93a8e46413803f4ec00dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc94b03799363a94b6f93a8e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 28 18:12:34 2021 +0200 ntdll/tests: Fix the XState AllFeatureSize check on old CPUs. On old CPUs lacking XSAVEC, Windows 8+ does not set AllFeatureSize and AllFeatures. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51188 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index e657a424fcd..5f155b1a147 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -952,12 +952,14 @@ static void test_user_shared_data(void) ok(xstate.OptimizedSave, "Got zero OptimizedSave with compaction enabled.\n"); ok(!xstate.AlignedFeatures, "Got unexpected AlignedFeatures %s.\n", wine_dbgstr_longlong(xstate.AlignedFeatures)); - ok(xstate.AllFeatureSize >= 512 + sizeof(XSTATE), "Got unexpected AllFeatureSize %u.\n", - xstate.AllFeatureSize); + ok(xstate.AllFeatureSize >= 512 + sizeof(XSTATE) + || !xstate.AllFeatureSize /* win8 on CPUs without XSAVEC */, + "Got unexpected AllFeatureSize %u.\n", xstate.AllFeatureSize); for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { - ok(xstate.AllFeatures[i] == feature_sizes[i] || !xstate.AllFeatures[i], + ok(xstate.AllFeatures[i] == feature_sizes[i] + || !xstate.AllFeatures[i] /* win8+ on CPUs without XSAVEC */, "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i,

1 0

Francois Gouget : user32/tests: Fix a typo in a comment.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: 764e7d0854c691a8e030a4c5e954664afcee614c URL: https://source.winehq.org/git/wine.git/?a=commit;h=764e7d0854c691a8e030a4c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 28 17:48:38 2021 +0200 user32/tests: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 8fab62c951e..89a524407bf 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1500,7 +1500,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ /* SPI_GETNONCLIENTMETRICS returns some "cooked" values. For instance if the caption font height is higher than the CaptionHeight field, the latter is adjusted accordingly. To be able to restore these setting - accurately be restore the raw values. */ + accurately we restore the raw values. */ Ncmorig.iCaptionWidth = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, real_dpi); Ncmorig.iCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iSmCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_SMCAPTIONHEIGHT_VALNAME, dpi);

1 0

Francois Gouget : user32/tests: Trace GetLastError() when OpenClipboard() fails in edit.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: 35180d368a94156cb77b09560b24d3af428b988b URL: https://source.winehq.org/git/wine.git/?a=commit;h=35180d368a94156cb77b0956… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 28 17:48:20 2021 +0200 user32/tests: Trace GetLastError() when OpenClipboard() fails in edit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 34bb1e5a76e..6edec12e03b 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2187,7 +2187,7 @@ static void test_espassword(void) ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); r = OpenClipboard(hwEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); r = CloseClipboard(); @@ -3190,7 +3190,7 @@ static void test_paste(void) GlobalUnlock(hmem); r = OpenClipboard(hEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); hmem_ret = SetClipboardData(CF_TEXT, hmem); @@ -3213,7 +3213,7 @@ static void test_paste(void) GlobalUnlock(hmem); r = OpenClipboard(hEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); hmem_ret = SetClipboardData(CF_TEXT, hmem);

1 0

Zebediah Figura : ntdll: Quiet some noisy ETW FIXMEs.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: d8968b955c9d9e78f4b9fb79e4f39403b785f837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8968b955c9d9e78f4b9fb79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 16:11:37 2021 -0500 ntdll: Quiet some noisy ETW FIXMEs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 9c7708a24a5..4b590b76ce5 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -330,7 +330,7 @@ ULONG WINAPI EtwEventActivityIdControl(ULONG code, GUID *guid) */ BOOLEAN WINAPI EtwEventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG keyword ) { - FIXME("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword)); + WARN("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword)); return FALSE; } @@ -340,7 +340,7 @@ BOOLEAN WINAPI EtwEventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) { - FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); + WARN("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); if (!handle) return ERROR_INVALID_PARAMETER; @@ -353,7 +353,7 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID */ ULONG WINAPI EtwEventUnregister( REGHANDLE handle ) { - FIXME("(%s) stub.\n", wine_dbgstr_longlong(handle)); + WARN("(%s) stub.\n", wine_dbgstr_longlong(handle)); return ERROR_SUCCESS; } @@ -413,7 +413,7 @@ ULONG WINAPI EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, TRACE_GUID_REGISTRATION *TraceGuidReg, const WCHAR *MofImagePath, const WCHAR *MofResourceName, TRACEHANDLE *RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + WARN("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); @@ -438,7 +438,7 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, TRACE_GUID_REGISTRATION *TraceGuidReg, const char *MofImagePath, const char *MofResourceName, TRACEHANDLE *RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + WARN("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), debugstr_a(MofResourceName), RegistrationHandle); return ERROR_SUCCESS; @@ -452,7 +452,7 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) if (!RegistrationHandle) return ERROR_INVALID_PARAMETER; - FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); + WARN("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); return ERROR_SUCCESS; } @@ -461,7 +461,7 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) */ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor ) { - FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); + WARN("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); return FALSE; }

1 0

Zebediah Figura : ntdll: Introduce IOCTL_AFD_WINE_TRANSMIT.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: 0a6892193623802894a2c5e6d10eccd9471f0b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a6892193623802894a2c5e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 18:57:29 2021 -0500 ntdll: Introduce IOCTL_AFD_WINE_TRANSMIT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 12 +++ 2 files changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a6892193623802894a2…

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_TRANSMIT.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: f2305aebd9c20fd1ccc9323b4c5b081a16681efd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2305aebd9c20fd1ccc9323b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 18:57:30 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_TRANSMIT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 551 +++------------------------------------------------ 1 file changed, 32 insertions(+), 519 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2305aebd9c20fd1ccc9…

1 0

Zebediah Figura : ws2_32/tests: Separate and expand tests for FIONREAD and SIOCATMARK.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: 2795fa9c00338bfff6304c1b756d1a58f9f6ca60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2795fa9c00338bfff6304c1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 18:57:31 2021 -0500 ws2_32/tests: Separate and expand tests for FIONREAD and SIOCATMARK. 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 | 379 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 260 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2795fa9c00338bfff630…

1 0

Zebediah Figura : ws2_32/tests: Add more tests for FIONBIO.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: c680f6a0210714e2091f18d4648886709d999df2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c680f6a0210714e2091f18d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 18:57:32 2021 -0500 ws2_32/tests: Add more tests for 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 | 140 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 104 insertions(+), 36 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b84ebe88c6a..d337205be21 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3876,7 +3876,104 @@ static void test_fionread_siocatmark(void) closesocket(server); } -static void test_ioctlsocket(void) +static void test_fionbio(void) +{ + OVERLAPPED overlapped = {0}, *overlapped_ptr; + u_long one = 1, zero = 0; + HANDLE port, event; + ULONG_PTR key; + DWORD size; + SOCKET s; + int ret; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + port = CreateIoCompletionPort((HANDLE)s, NULL, 123, 0); + + WSASetLastError(0xdeadbeef); + ret = ioctlsocket(s, FIONBIO, (u_long *)1); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one), NULL, 0, NULL, NULL, NULL); + todo_wine ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one) - 1, NULL, 0, &size, &overlapped, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + size = 0xdeadbeef; + WSASetLastError(0xdeadbeef); + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one), NULL, 0, &size, NULL, NULL); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!size, "got size %u\n", size); + + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one) + 1, NULL, 0, &size, NULL, NULL); + todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + size = 0xdeadbeef; + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one), NULL, 0, &size, &overlapped, NULL); + ok(!ret, "expected success\n"); + ok(!size, "got size %u\n", size); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); + ok(!overlapped.Internal, "got status %#x\n", (NTSTATUS)overlapped.Internal); + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one), NULL, 0, NULL, &overlapped, NULL); + todo_wine ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + ret = WSAEventSelect(s, event, FD_READ); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one), NULL, 0, &size, NULL, NULL); + ok(!ret, "got error %u\n", WSAGetLastError()); + + size = 0xdeadbeef; + ret = WSAIoctl(s, FIONBIO, &zero, sizeof(zero), NULL, 0, &size, NULL, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + todo_wine ok(!size, "got size %u\n", size); + + CloseHandle(port); + closesocket(s); + CloseHandle(event); + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one), NULL, 0, NULL, &overlapped, socket_apc); + todo_wine ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + apc_count = 0; + size = 0xdeadbeef; + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one), NULL, 0, &size, &overlapped, socket_apc); + ok(!ret, "expected success\n"); + 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); + } + + closesocket(s); +} + +static void test_keepalive_vals(void) { SOCKET sock; struct tcp_keepalive kalive; @@ -7592,35 +7689,6 @@ todo_wine closesocket(sock3); } -static void test_synchronous_WSAIoctl(void) -{ - HANDLE io_port; - WSAOVERLAPPED overlapped, *olp; - SOCKET socket; - ULONG on; - ULONG_PTR key; - DWORD num_bytes; - BOOL ret; - int res; - - socket = WSASocketW( AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED ); - ok( socket != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError() ); - - io_port = CreateIoCompletionPort( (HANDLE)socket, NULL, 0, 0 ); - ok( io_port != NULL, "failed to create completion port %u\n", GetLastError() ); - - on = 1; - memset( &overlapped, 0, sizeof(overlapped) ); - res = WSAIoctl( socket, FIONBIO, &on, sizeof(on), NULL, 0, &num_bytes, &overlapped, NULL ); - ok( !res, "WSAIoctl failed %d\n", WSAGetLastError() ); - - ret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 10000 ); - ok( ret, "failed to get completion status %u\n", GetLastError() ); - - CloseHandle( io_port ); - closesocket( socket ); -} - /* * Provide consistent initialization for the AcceptEx IOCP tests. */ @@ -10171,8 +10239,13 @@ START_TEST( sock ) test_accept(); test_getpeername(); test_getsockname(); + + test_address_list_query(); + test_fionbio(); test_fionread_siocatmark(); - test_ioctlsocket(); + test_keepalive_vals(); + test_sioRoutingInterfaceQuery(); + test_sioAddressListChange(); test_WSASendMsg(); test_WSASendTo(); @@ -10190,13 +10263,9 @@ START_TEST( sock ) test_shutdown(); test_DisconnectEx(); - test_sioRoutingInterfaceQuery(); - test_sioAddressListChange(); - test_completion_port(); test_connect_completion_port(); test_shutdown_completion_port(); - test_address_list_query(); test_bind(); test_connecting_socket(); test_WSAGetOverlappedResult(); @@ -10206,7 +10275,6 @@ START_TEST( sock ) /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); - test_synchronous_WSAIoctl(); test_wsaioctl(); Exit();

1 0

Zebediah Figura : ws2_32/tests: Expand tests for SIO_KEEPALIVE_VALS.
by Alexandre Julliard 28 May '21

28 May '21

Module: wine Branch: master Commit: 738dc41e08b7fcb7538f25522693042930d17436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=738dc41e08b7fcb7538f2552… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 18:57:33 2021 -0500 ws2_32/tests: Expand tests for SIO_KEEPALIVE_VALS. 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 | 100 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d337205be21..33ab1e1b576 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3975,52 +3975,120 @@ static void test_fionbio(void) static void test_keepalive_vals(void) { - SOCKET sock; + OVERLAPPED overlapped = {0}, *overlapped_ptr; struct tcp_keepalive kalive; + ULONG_PTR key; + HANDLE port; + SOCKET sock; + DWORD size; int ret; - u_long arg = 0; sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)sock, NULL, 123, 0); - /* broken apps like defcon pass the argp value directly instead of a pointer to it */ - ret = ioctlsocket(sock, FIONBIO, (u_long *)1); - ok(ret == SOCKET_ERROR, "ioctlsocket succeeded unexpectedly\n"); - ret = WSAGetLastError(); - ok(ret == WSAEFAULT, "expected WSAEFAULT, got %d instead\n", ret); - - ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL); + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + 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); - ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + 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); + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; make_keepalive(kalive, 0, 0, 0); - ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + 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(!size, "got size %u\n", size); + + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, NULL, NULL, NULL); + todo_wine ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, NULL, &overlapped, NULL); + todo_wine ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive) - 1, NULL, 0, &size, &overlapped, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + todo_wine ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + overlapped.Internal = 0xdeadbeef; + 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()); + todo_wine ok(size == 0xdeadbeef, "got size %u\n", size); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); + ok(!overlapped.Internal, "got status %#x\n", (NTSTATUS)overlapped.Internal); + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); make_keepalive(kalive, 1, 0, 0); - ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, &size, NULL, NULL); ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 1, 1000, 1000); - ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, &size, NULL, NULL); ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 1, 10000, 10000); - ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, &size, NULL, NULL); ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 1, 100, 100); - ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, &size, NULL, NULL); ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 0, 100, 100); - ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, &size, NULL, NULL); ok(ret == 0, "WSAIoctl failed unexpectedly\n"); + CloseHandle(port); + closesocket(sock); + + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, NULL, &overlapped, socket_apc); + todo_wine ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + apc_count = 0; + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(kalive), NULL, 0, &size, &overlapped, socket_apc); + ok(!ret, "expected success\n"); + 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); + } + closesocket(sock); }

1 0