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

Nikolay Sivov : mfplay: Enable source type enumeration.
by Alexandre Julliard May 28, 2021

May 28, 2021

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

Nikolay Sivov : mf/session: Do not drop pending commands when clearing current presentation.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: 20a1eb3b252b404bd2ed9a11dc03312ea11fff0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a1eb3b252b404bd2ed9a11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 28 15:49:02 2021 +0300 mf/session: Do not drop pending commands when clearing current presentation. Calling Start() short after SetTopology() has a good chance of getting lost, because clearing logic will drop all pending commands. This is easy to reproduce with IMFPMediaPlayer, which works reliably on Windows. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 925a8c93d20..41caf02d059 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -855,12 +855,22 @@ static void session_shutdown_current_topology(struct media_session *session) } } +static void session_clear_command_list(struct media_session *session) +{ + struct session_op *op, *op2; + + LIST_FOR_EACH_ENTRY_SAFE(op, op2, &session->commands, struct session_op, entry) + { + list_remove(&op->entry); + IUnknown_Release(&op->IUnknown_iface); + } +} + static void session_clear_presentation(struct media_session *session) { struct media_source *source, *source2; struct media_sink *sink, *sink2; struct topo_node *node, *node2; - struct session_op *op, *op2; session_shutdown_current_topology(session); @@ -895,12 +905,6 @@ static void session_clear_presentation(struct media_session *session) IMFMediaEventGenerator_Release(sink->event_generator); heap_free(sink); } - - LIST_FOR_EACH_ENTRY_SAFE(op, op2, &session->commands, struct session_op, entry) - { - list_remove(&op->entry); - IUnknown_Release(&op->IUnknown_iface); - } } static struct topo_node *session_get_node_by_id(const struct media_session *session, TOPOID id) @@ -1730,6 +1734,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) { session_clear_topologies(session); session_clear_presentation(session); + session_clear_command_list(session); if (session->presentation.current_topology) IMFTopology_Release(session->presentation.current_topology); if (session->event_queue) @@ -1847,7 +1852,6 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format hr = session_submit_command(session, op); IUnknown_Release(&op->IUnknown_iface); - return hr; } @@ -1896,6 +1900,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFPresentationClock_Release(session->clock); session->clock = NULL; session_clear_presentation(session); + session_clear_command_list(session); } LeaveCriticalSection(&session->cs);

1 0

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

May 28, 2021

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

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

May 28, 2021

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

Rémi Bernon : dinput: Introduce direct_input_device_alloc helper.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: 8d7914962b8a6b00363068e986ca05308fa62044 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d7914962b8a6b00363068e9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 11:41:27 2021 +0200 dinput: Introduce direct_input_device_alloc helper. To factor out device allocation and initialization. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 20 ++++++++++++++++++++ dlls/dinput/device_private.h | 4 ++++ dlls/dinput/joystick_linux.c | 15 +++------------ dlls/dinput/joystick_linuxinput.c | 15 ++++----------- dlls/dinput/joystick_osx.c | 15 +++------------ dlls/dinput/keyboard.c | 14 ++++---------- dlls/dinput/mouse.c | 15 ++++----------- 7 files changed, 42 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d7914962b8a6b003630…

1 0

Alexandre Julliard : winebuild: Add support for multiple syscall descriptor tables.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: e79fa1866c5d5d71111bf0074becca89d9604c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e79fa1866c5d5d71111bf007… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 11:13:41 2021 +0200 winebuild: Add support for multiple syscall descriptor tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 112 ++++++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e79fa1866c5d5d71111b…

1 0

Zebediah Figura : ws2_32/tests: Expand tests for SIO_KEEPALIVE_VALS.
by Alexandre Julliard May 28, 2021

May 28, 2021

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

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

May 28, 2021

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: Separate and expand tests for FIONREAD and SIOCATMARK.
by Alexandre Julliard May 28, 2021

May 28, 2021

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

Nikolay Sivov : evr/mixer: Test format only when setting output type.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: 626438a6be2df298c527870c8df9e6deb2f1c0fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=626438a6be2df298c527870c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 28 15:43:07 2021 +0300 evr/mixer: Test format only when setting output type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 10 ++++++++-- dlls/evr/tests/evr.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 554fb0725e8..c18bf0450bf 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -810,17 +810,23 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | - MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA; + const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = MF_E_INVALIDMEDIATYPE; unsigned int i, compare_flags; + BOOL is_compressed = TRUE; TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); if (id) return MF_E_INVALIDSTREAMNUMBER; + if (!type) + return E_INVALIDARG; + + if (FAILED(IMFMediaType_IsCompressedFormat(type, &is_compressed)) || is_compressed) + return MF_E_INVALIDMEDIATYPE; + EnterCriticalSection(&mixer->cs); for (i = 0; i < mixer->output.rt_formats_count; ++i) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index dd38a75ca2b..91fff21ebed 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -942,11 +942,11 @@ static void test_default_mixer_type_negotiation(void) IDirect3DDeviceManager9 *manager; DXVA2_VideoProcessorCaps caps; IMFVideoProcessor *processor; + GUID subtype, guid, *guids; IDirect3DDevice9 *device; IMFMediaType *video_type; IMFTransform *transform; DWORD index, count; - GUID guid, *guids; IUnknown *unk; HWND window; HRESULT hr; @@ -1070,6 +1070,46 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); + /* Minimal valid attribute set for output type. */ + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 1, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Candidate type have frame size set, mismatching size is accepted. */ + hr = IMFMediaType_SetUINT64(media_type2, &MF_MT_FRAME_SIZE, (UINT64)64 << 32 | 64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0