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

Giovanni Mascellani : mf/samplegrabber: Handle paused state.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 6ac1cd51bd8fe05e4a46f95bfaa6eddbfbb0eeff URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ac1cd51bd8fe05e4a46f95b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jun 3 15:43:14 2021 +0300 mf/samplegrabber: Handle paused state. The following behaviors from Windows are implemented: * Transitions from STOPPED to PAUSED are forbidden; * Sample requests are only emitted for transitions from STOPPED to RUNNING (i.e., not when transitioning from PAUSED); * Transition events are emitted again when transitioning from a state to the same state, except when such state is PAUSED. 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/samplegrabber.c | 64 +++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f60ce2a8433..4a0be291015 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); enum sink_state { SINK_STATE_STOPPED = 0, + SINK_STATE_PAUSED, SINK_STATE_RUNNING, }; @@ -1101,46 +1102,59 @@ static ULONG WINAPI sample_grabber_clock_sink_Release(IMFClockStateSink *iface) return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); } -static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_state state) +static HRESULT sample_grabber_set_state(struct sample_grabber *grabber, enum sink_state state, + MFTIME systime, LONGLONG offset) { static const DWORD events[] = { MEStreamSinkStopped, /* SINK_STATE_STOPPED */ + MEStreamSinkPaused, /* SINK_STATE_PAUSED */ MEStreamSinkStarted, /* SINK_STATE_RUNNING */ }; - BOOL set_state = FALSE; + BOOL do_callback = FALSE; + HRESULT hr = S_OK; unsigned int i; EnterCriticalSection(&grabber->cs); if (!grabber->is_shut_down) { - switch (grabber->state) - { - case SINK_STATE_STOPPED: - set_state = state == SINK_STATE_RUNNING; - break; - case SINK_STATE_RUNNING: - set_state = state == SINK_STATE_STOPPED; - break; - default: - ; - } - - if (set_state) + if (state == SINK_STATE_PAUSED && grabber->state == SINK_STATE_STOPPED) + hr = MF_E_INVALID_STATE_TRANSITION; + else { - grabber->state = state; - if (state == SINK_STATE_RUNNING) + if (state == SINK_STATE_RUNNING && grabber->state == SINK_STATE_STOPPED) { /* Every transition to running state sends a bunch requests to build up initial queue. */ for (i = 0; i < 4; ++i) sample_grabber_stream_request_sample(grabber); } - IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + do_callback = state != grabber->state || state != SINK_STATE_PAUSED; + if (do_callback) + IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + grabber->state = state; } } LeaveCriticalSection(&grabber->cs); + + if (do_callback) + { + switch (state) + { + case SINK_STATE_STOPPED: + hr = IMFSampleGrabberSinkCallback_OnClockStop(sample_grabber_get_callback(grabber), systime); + break; + case SINK_STATE_PAUSED: + hr = IMFSampleGrabberSinkCallback_OnClockPause(sample_grabber_get_callback(grabber), systime); + break; + case SINK_STATE_RUNNING: + hr = IMFSampleGrabberSinkCallback_OnClockStart(sample_grabber_get_callback(grabber), systime, offset); + break; + } + } + + return hr; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) @@ -1149,9 +1163,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink * TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); - sample_grabber_set_state(grabber, SINK_STATE_RUNNING); - - return IMFSampleGrabberSinkCallback_OnClockStart(sample_grabber_get_callback(grabber), systime, offset); + return sample_grabber_set_state(grabber, SINK_STATE_RUNNING, systime, offset); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) @@ -1160,9 +1172,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *i TRACE("%p, %s.\n", iface, debugstr_time(systime)); - sample_grabber_set_state(grabber, SINK_STATE_STOPPED); - - return IMFSampleGrabberSinkCallback_OnClockStop(sample_grabber_get_callback(grabber), systime); + return sample_grabber_set_state(grabber, SINK_STATE_STOPPED, systime, 0); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) @@ -1171,7 +1181,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink * TRACE("%p, %s.\n", iface, debugstr_time(systime)); - return IMFSampleGrabberSinkCallback_OnClockPause(sample_grabber_get_callback(grabber), systime); + return sample_grabber_set_state(grabber, SINK_STATE_PAUSED, systime, 0); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) @@ -1180,9 +1190,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink TRACE("%p, %s.\n", iface, debugstr_time(systime)); - sample_grabber_set_state(grabber, SINK_STATE_RUNNING); - - return IMFSampleGrabberSinkCallback_OnClockRestart(sample_grabber_get_callback(grabber), systime); + return sample_grabber_set_state(grabber, SINK_STATE_RUNNING, systime, PRESENTATION_CURRENT_POSITION); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate)

1 0

Zebediah Figura : ws2_32: Fail with WSAEINVAL if a requested extension function is not found.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: d1cd6f4a57f9d694fc9f77b7cb4ed1381d8d4f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1cd6f4a57f9d694fc9f77b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 17:03:58 2021 -0500 ws2_32: Fail with WSAEINVAL if a requested extension function is not found. Rather than WSAEOPNOTSUPP. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 79085cf0c2a..478ae960541 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3536,7 +3536,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); - SetLastError( WSAEOPNOTSUPP ); + SetLastError( WSAEINVAL ); return -1; } case WS_SIO_KEEPALIVE_VALS: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c0b1abcaaa5..ec138fcf29a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4258,7 +4258,7 @@ static void test_get_extension_func(void) ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &bogus_guid, sizeof(GUID), &func, sizeof(func), &size, &overlapped, NULL); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); ok(size == 0xdeadbeef, "got size %u\n", size); ok(overlapped.Internal == 0xdeadbeef, "got status %#x\n", (NTSTATUS)overlapped.Internal); ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh);

1 0

Zebediah Figura : ntdll: Introduce IOCTL_AFD_WINE_FIONREAD.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 5917d573b67c01ce56c00380a2f6dbd101946df2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5917d573b67c01ce56c00380… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 17:03:59 2021 -0500 ntdll: Introduce IOCTL_AFD_WINE_FIONREAD. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 1 + 2 files changed, 43 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index cfc5780b082..16df04b6cb1 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -25,6 +25,9 @@ #include "config.h" #include <errno.h> #include <unistd.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -1274,6 +1277,45 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc status = sock_poll( handle, event, apc, apc_user, io, in_buffer, in_size, out_buffer, out_size ); break; + case IOCTL_AFD_WINE_FIONREAD: + { + int value, ret; + + if (out_size < sizeof(int)) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + +#ifdef linux + { + socklen_t len = sizeof(value); + + /* FIONREAD on a listening socket always fails (see tcp(7)). */ + if (!getsockopt( fd, SOL_SOCKET, SO_ACCEPTCONN, &value, &len ) && value) + { + *(int *)out_buffer = 0; + status = STATUS_SUCCESS; + complete_async( handle, event, apc, apc_user, io, status, 0 ); + break; + } + } +#endif + + if ((ret = ioctl( fd, FIONREAD, &value )) < 0) + { + status = sock_errno_to_status( errno ); + break; + } + *(int *)out_buffer = value; + 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 77801b1fbe3..0c19c8e0f58 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -98,6 +98,7 @@ struct afd_poll_params #define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 208, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_FIONBIO CTL_CODE(FILE_DEVICE_NETWORK, 209, METHOD_BUFFERED, FILE_ANY_ACCESS) #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) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_FIONREAD.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 800a42b90b7f38b792d8dee3df857c9b71578c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=800a42b90b7f38b792d8dee3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 17:04:00 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_FIONREAD. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 27 ++++++--------------------- dlls/ws2_32/tests/sock.c | 21 +++++++++------------ 2 files changed, 15 insertions(+), 33 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 478ae960541..e9df9f579f2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3359,28 +3359,13 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_FIONREAD: { -#if defined(linux) - int listening = 0; - socklen_t len = sizeof(listening); -#endif - if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; + DWORD ret; -#if defined(linux) - /* On Linux, FIONREAD on listening socket always fails (see tcp(7)). - However, it succeeds on native. */ - if (!getsockopt( fd, SOL_SOCKET, SO_ACCEPTCONN, &listening, &len ) && listening) - (*(WS_u_long *) out_buff) = 0; - else -#endif - if (ioctl(fd, FIONREAD, out_buff ) == -1) - status = wsaErrno(); - release_sock_fd( s, fd ); - break; + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_FIONREAD, in_buff, in_size, + out_buff, out_size, ret_size, overlapped, completion ); + SetLastError( ret ); + if (!ret) *ret_size = sizeof(WS_u_long); + return ret ? -1 : 0; } case WS_SIOCATMARK: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ec138fcf29a..c251f31f382 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3667,7 +3667,7 @@ static void check_fionread_siocatmark_(int line, SOCKET s, unsigned int normal, WSASetLastError(0xdeadbeef); ret = WSAIoctl(s, FIONREAD, NULL, 0, &value, sizeof(value), &size, NULL, NULL); ok_(__FILE__, line)(!ret, "expected success\n"); - todo_wine ok_(__FILE__, line)(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok_(__FILE__, line)(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); todo_wine_if (todo_normal) ok_(__FILE__, line)(value == normal, "FIONBIO returned %u\n", value); value = 0xdeadbeef; @@ -3746,9 +3746,9 @@ static void test_fionread_siocatmark(void) overlapped.InternalHigh = 0xdeadbeef; ret = WSAIoctl(client, FIONREAD, NULL, 0, &value, sizeof(value), &size, &overlapped, NULL); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(!value, "got %u\n", value); - todo_wine ok(size == sizeof(value), "got size %u\n", size); + ok(size == sizeof(value), "got size %u\n", size); ok(!overlapped.Internal, "got status %#x\n", (NTSTATUS)overlapped.Internal); ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); @@ -3868,17 +3868,14 @@ static void test_fionread_siocatmark(void) size = 0xdeadbeef; ret = WSAIoctl(server, FIONREAD, NULL, 0, &value, sizeof(value), &size, &overlapped, socket_apc); ok(!ret, "expected success\n"); - todo_wine ok(size == sizeof(value), "got size %u\n", size); + ok(size == sizeof(value), "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); apc_count = 0; size = 0xdeadbeef;

1 0

Zebediah Figura : ntdll: Introduce IOCTL_AFD_WINE_SIOCATMARK.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 27609da35137ec403dafd93353c14565bf07eb81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27609da35137ec403dafd933… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 17:04:01 2021 -0500 ntdll: Introduce IOCTL_AFD_WINE_SIOCATMARK. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 1 + 2 files changed, 40 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 16df04b6cb1..c10a48b3008 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1316,6 +1316,45 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_WINE_SIOCATMARK: + { + int value, ret; + socklen_t len = sizeof(value); + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + if (out_size < sizeof(int)) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + if (getsockopt( fd, SOL_SOCKET, SO_OOBINLINE, &value, &len ) < 0) + { + status = sock_errno_to_status( errno ); + break; + } + + if (value) + { + *(int *)out_buffer = TRUE; + } + else + { + if ((ret = ioctl( fd, SIOCATMARK, &value )) < 0) + { + status = sock_errno_to_status( errno ); + break; + } + /* windows is reversed with respect to unix */ + *(int *)out_buffer = !value; + } + 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 0c19c8e0f58..2b4c39e7a86 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -99,6 +99,7 @@ struct afd_poll_params #define IOCTL_AFD_WINE_FIONBIO CTL_CODE(FILE_DEVICE_NETWORK, 209, METHOD_BUFFERED, FILE_ANY_ACCESS) #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) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_SIOCATMARK.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 1f44a257db1740e00c37d0a5d258fe6617b1b7c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f44a257db1740e00c37d0a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 17:04:02 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_SIOCATMARK. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 28 ++++++---------------------- dlls/ws2_32/tests/sock.c | 21 +++++++++------------ 2 files changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e9df9f579f2..bfe5ab186ee 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3370,29 +3370,13 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIOCATMARK: { - unsigned int oob = 0, atmark = 0; - socklen_t oobsize = sizeof(int); - if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; - /* SO_OOBINLINE sockets must always return TRUE to SIOCATMARK */ - if ((getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &oob, &oobsize ) == -1) - || (!oob && ioctl(fd, SIOCATMARK, &atmark ) == -1)) - status = wsaErrno(); - else - { - /* The SIOCATMARK value read from ioctl() is reversed - * because BSD returns TRUE if it's in the OOB mark - * while Windows returns TRUE if there are NO OOB bytes. - */ - (*(WS_u_long *) out_buff) = oob || !atmark; - } + DWORD ret; - release_sock_fd( s, fd ); - break; + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_SIOCATMARK, in_buff, in_size, + out_buff, out_size, ret_size, overlapped, completion ); + SetLastError( ret ); + if (!ret) *ret_size = sizeof(WS_u_long); + return ret ? -1 : 0; } case WS_FIOASYNC: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c251f31f382..f165742fe45 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3674,7 +3674,7 @@ static void check_fionread_siocatmark_(int line, SOCKET s, unsigned int normal, WSASetLastError(0xdeadbeef); ret = WSAIoctl(s, SIOCATMARK, NULL, 0, &value, sizeof(value), &size, NULL, NULL); ok_(__FILE__, line)(!ret, "expected success\n"); - todo_wine ok_(__FILE__, line)(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok_(__FILE__, line)(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); todo_wine_if (todo_oob) ok_(__FILE__, line)(value == oob, "SIOCATMARK returned %u\n", value); } @@ -3765,9 +3765,9 @@ static void test_fionread_siocatmark(void) overlapped.InternalHigh = 0xdeadbeef; ret = WSAIoctl(client, SIOCATMARK, NULL, 0, &value, sizeof(value), &size, &overlapped, NULL); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(value == TRUE, "got %u\n", value); - todo_wine ok(size == sizeof(value), "got size %u\n", size); + ok(size == sizeof(value), "got size %u\n", size); ok(!overlapped.Internal, "got status %#x\n", (NTSTATUS)overlapped.Internal); ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); @@ -3881,17 +3881,14 @@ static void test_fionread_siocatmark(void) size = 0xdeadbeef; ret = WSAIoctl(server, SIOCATMARK, NULL, 0, &value, sizeof(value), &size, &overlapped, socket_apc); ok(!ret, "expected success\n"); - todo_wine ok(size == sizeof(value), "got size %u\n", size); + ok(size == sizeof(value), "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(server); }

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: cdfe9ad67cde8ebbaecc689ea65886a27756c1b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfe9ad67cde8ebbaecc689e… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Thu Jun 3 11:52:34 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3e8e5967f38..b44e972d6af 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-05-29 15:57-0300\n" +"PO-Revision-Date: 2021-06-03 11:15-0300\n" "Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" @@ -3973,7 +3973,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "Não posso definir porpriedade '|': objeto não é extensível" +msgstr "Não posso definir propriedade '|': objeto não é extensível" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -9051,7 +9051,7 @@ msgstr "Configuração de rede" #: dlls/oledb32/version.rc:96 msgid "&Impersonation level:" -msgstr "N&ivel de representação:" +msgstr "N&ível de representação:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" @@ -14871,7 +14871,8 @@ msgstr "" " (Padrão).\n" "\n" " /t <tipo>\n" -" Tipo do dado para ser adicionao ao registro. Se [/t] for especificado,\n" +" Tipo do dado para ser adicionado ao registro. Se [/t] for " +"especificado,\n" " <tipo> deve ser uma das opções a seguir:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" @@ -14928,7 +14929,7 @@ msgstr "" "\n" " Copia o conteúdo de uma chave de registro especificada para outra " "localização.\n" -" Por padrão, esta operação copia apenas os valores do registrp. Use [/s] " +" Por padrão, esta operação copia apenas os valores do registro. Use [/s] " "para\n" " copiar de forma recursiva todas as subchaves e valores.\n" "\n" @@ -14953,8 +14954,8 @@ msgstr "" " Copia todas as subchaves e valores de <Chave1> para <Chave2>.\n" "\n" " /f\n" -" Sobreescreve todos os dados em <Chave2> sem pedir por confirmação.\n" -" Esta operação nao afeta subchaves e valores que existem somente em " +" Sobrescreve todos os dados em <Chave2> sem pedir por confirmação.\n" +" Esta operação não afeta subchaves e valores que existem somente em " "<Chave2>.\n" "\n" @@ -15247,7 +15248,7 @@ msgstr "reg: Parâmetros da linha de comandos inválidos\n" #: programs/reg/reg.rc:202 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: Chaves de origem e destino não podem ser as mesmas\n" #: programs/reg/reg.rc:131 msgid "Are you sure you want to delete the registry value '%1'?" @@ -15275,7 +15276,7 @@ msgstr "reg: Sequência de escape não reconhecida [\\%1!c!]\n" #: programs/reg/reg.rc:173 msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Não foi possível importar a chave de registro '%1'.\n" +msgstr "reg: Não foi possível importar a chave de registro '%1'\n" #: programs/reg/reg.rc:148 msgid "reg: The file '%1' was not found.\n" @@ -18586,7 +18587,7 @@ msgstr "" "[/A] Copiar apenas arquivos com atributo de arquivo.\n" "[/M] Copiar apenas arquivos com atributo de arquivo, removendo\n" "\to atributo de arquivo.\n" -"[/K] Copia os atributos do arquivo; sem isto, os atributos nao são " +"[/K] Copia os atributos do arquivo; sem isto, os atributos não são " "preservados.\n" "[/D | /D:m-d-y] Copiar novos arquivos ou os alterados após a data " "fornecida.\n"

1 0

Nikolay Sivov : mfplat: Remove remaining typedef for bytestream object structure.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 602e99426f35c1d28ab941f32e9dff2e04a4e381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602e99426f35c1d28ab941f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 3 18:09:50 2021 +0300 mfplat: Remove remaining typedef for bytestream object structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 83 +++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index b205dd2538e..5406ceb5063 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3458,7 +3458,7 @@ HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *dest, const UINT8 *buffer return hr; } -typedef struct bytestream +struct bytestream { struct attributes attributes; IMFByteStream IMFByteStream_iface; @@ -3471,11 +3471,11 @@ typedef struct bytestream DWORD capabilities; struct list pending; CRITICAL_SECTION cs; -} mfbytestream; +}; -static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +static inline struct bytestream *impl_from_IMFByteStream(IMFByteStream *iface) { - return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); + return CONTAINING_RECORD(iface, struct bytestream, IMFByteStream_iface); } static struct bytestream *impl_bytestream_from_IMFGetService(IMFGetService *iface) @@ -3773,11 +3773,9 @@ static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *ca return S_OK; } -static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +static HRESULT WINAPI bytestream_SetLength(IMFByteStream *iface, QWORD length) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + FIXME("%p, %s\n", iface, wine_dbgstr_longlong(length)); return E_NOTIMPL; } @@ -3880,11 +3878,9 @@ static HRESULT WINAPI bytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *r return bytestream_complete_io_request(stream, ASYNC_STREAM_OP_READ, result, byte_read); } -static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +static HRESULT WINAPI bytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, written); + FIXME("%p, %p, %u, %p\n", iface, data, count, written); return E_NOTIMPL; } @@ -3908,30 +3904,24 @@ static HRESULT WINAPI bytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult * return bytestream_complete_io_request(stream, ASYNC_STREAM_OP_WRITE, result, written); } -static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, +static HRESULT WINAPI bytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, DWORD flags, QWORD *current) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + FIXME("%p, %u, %s, 0x%08x, %p\n", iface, seek, wine_dbgstr_longlong(offset), flags, current); return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +static HRESULT WINAPI bytestream_Flush(IMFByteStream *iface) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); + FIXME("%p\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +static HRESULT WINAPI bytestream_Close(IMFByteStream *iface) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); + FIXME("%p\n", iface); return E_NOTIMPL; } @@ -3956,19 +3946,19 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_Release, bytestream_GetCapabilities, bytestream_file_GetLength, - mfbytestream_SetLength, + bytestream_SetLength, bytestream_file_GetCurrentPosition, bytestream_SetCurrentPosition, bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, bytestream_EndRead, - mfbytestream_Write, + bytestream_Write, bytestream_BeginWrite, bytestream_EndWrite, - mfbytestream_Seek, - mfbytestream_Flush, - mfbytestream_Close + bytestream_Seek, + bytestream_Flush, + bytestream_Close }; static HRESULT WINAPI bytestream_stream_GetLength(IMFByteStream *iface, QWORD *length) @@ -4146,35 +4136,34 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_stream_Close, }; -static inline mfbytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) +static inline struct bytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) { - return CONTAINING_RECORD(iface, mfbytestream, attributes.IMFAttributes_iface); + return CONTAINING_RECORD(iface, struct bytestream, attributes.IMFAttributes_iface); } -static HRESULT WINAPI mfbytestream_attributes_QueryInterface( - IMFAttributes *iface, REFIID riid, void **out) +static HRESULT WINAPI bytestream_attributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **out) { - mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); - return IMFByteStream_QueryInterface(&This->IMFByteStream_iface, riid, out); + struct bytestream *stream = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_QueryInterface(&stream->IMFByteStream_iface, riid, out); } -static ULONG WINAPI mfbytestream_attributes_AddRef(IMFAttributes *iface) +static ULONG WINAPI bytestream_attributes_AddRef(IMFAttributes *iface) { - mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); - return IMFByteStream_AddRef(&This->IMFByteStream_iface); + struct bytestream *stream = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_AddRef(&stream->IMFByteStream_iface); } -static ULONG WINAPI mfbytestream_attributes_Release(IMFAttributes *iface) +static ULONG WINAPI bytestream_attributes_Release(IMFAttributes *iface) { - mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); - return IMFByteStream_Release(&This->IMFByteStream_iface); + struct bytestream *stream = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_Release(&stream->IMFByteStream_iface); } -static const IMFAttributesVtbl mfbytestream_attributes_vtbl = +static const IMFAttributesVtbl bytestream_attributes_vtbl = { - mfbytestream_attributes_QueryInterface, - mfbytestream_attributes_AddRef, - mfbytestream_attributes_Release, + bytestream_attributes_QueryInterface, + bytestream_attributes_AddRef, + bytestream_attributes_Release, mfattributes_GetItem, mfattributes_GetItemType, mfattributes_CompareItem, @@ -4311,7 +4300,7 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt } object->IMFByteStream_iface.lpVtbl = &bytestream_stream_vtbl; - object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->attributes.IMFAttributes_iface.lpVtbl = &bytestream_attributes_vtbl; object->read_callback.lpVtbl = &bytestream_stream_read_callback_vtbl; object->write_callback.lpVtbl = &bytestream_stream_write_callback_vtbl; InitializeCriticalSection(&object->cs); @@ -4478,7 +4467,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open return hr; } object->IMFByteStream_iface.lpVtbl = &bytestream_file_vtbl; - object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->attributes.IMFAttributes_iface.lpVtbl = &bytestream_attributes_vtbl; object->IMFGetService_iface.lpVtbl = &bytestream_file_getservice_vtbl; object->read_callback.lpVtbl = &bytestream_file_read_callback_vtbl; object->write_callback.lpVtbl = &bytestream_file_write_callback_vtbl;

1 0

Zebediah Figura : winebuild: Fix a typo in a comment.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: bbe2eaecc96e2c04dc35233e156e33e9fabaa5a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbe2eaecc96e2c04dc35233e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 3 10:39:03 2021 -0500 winebuild: Fix a typo in a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 0544aa6cbe9..abe2bdae6ed 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -428,7 +428,7 @@ static void BuildCallTo16Core( int reg_func ) /* * Modify CONTEXT86 structure to contain new values * - * NOTE: We restore only EAX, EBX, EDX, EDX, EBP, and ESP. + * NOTE: We restore only EAX, EBX, ECX, EDX, EBP, and ESP. * The segment registers as well as ESI and EDI should * not be modified by a well-behaved 16-bit routine in * any case. [If necessary, we could restore them as well,

1 0

Francois Gouget : user32: Debugstr_format() should not modify the last error.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 031aef852e2e88c0a97c67d6da927831030bfc7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=031aef852e2e88c0a97c67d6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 3 18:44:48 2021 +0200 user32: Debugstr_format() should not modify the last error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 3d17b658e45..e8de7d9bdf6 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -81,8 +81,11 @@ struct metafile_pict static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; + DWORD le = GetLastError(); + BOOL r = GetClipboardFormatNameW( id, buffer, 256 ); + SetLastError(le); - if (GetClipboardFormatNameW( id, buffer, 256 )) + if (r) return wine_dbg_sprintf( "%04x %s", id, debugstr_w(buffer) ); switch (id)

1 0