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

Nikolay Sivov : mf/evr: Post sink marker events.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 4992fddc00e72d841cfcc609f5e0d336fd133be1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4992fddc00e72d841cfcc609… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 16:08:49 2021 +0300 mf/evr: Post sink marker events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 046f5cb3ca3..64489ac4c58 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -439,12 +439,12 @@ static void video_stream_end_of_stream(struct video_stream *stream) } static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type, - const PROPVARIANT *marker_value, const PROPVARIANT *context_value) + const PROPVARIANT *marker_value, const PROPVARIANT *context) { struct video_stream *stream = impl_from_IMFStreamSink(iface); HRESULT hr = S_OK; - TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value); + TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context); EnterCriticalSection(&stream->cs); if (!stream->parent) @@ -453,6 +453,7 @@ static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTRE { if (marker_type == MFSTREAMSINK_MARKER_ENDOFSEGMENT) video_stream_end_of_stream(stream); + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkMarker, &GUID_NULL, S_OK, context); } LeaveCriticalSection(&stream->cs);

1 0

Nikolay Sivov : evr/mixer: Use hex format for message type.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 8572de607b888a4a3a590426168276d71ecda82a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8572de607b888a4a3a590426… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 16:11:02 2021 +0300 evr/mixer: Use hex format for message type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 03e2d166155..0d4bf8bc500 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1029,7 +1029,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, HRESULT hr = S_OK; unsigned int i; - TRACE("%p, %u, %#lx.\n", iface, message, param); + TRACE("%p, %#x, %#lx.\n", iface, message, param); switch (message) {

1 0

Francois Gouget : mfplat: Fix the spelling of a comment.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: aec8bc3cba63727a970ef186bfe6ff891cede1c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec8bc3cba63727a970ef186… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 6 19:13:48 2021 +0200 mfplat: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f1d0aaad94d..c8d74b5d42c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -9034,7 +9034,7 @@ static void llmult128(ULARGE_INTEGER *c1, ULARGE_INTEGER *c0, LONGLONG val, LONG b0.QuadPart = (ULONGLONG)v.HighPart * n.LowPart; /* add the high word of a0 to the low words of a1 and b0 using c1 as - * scrach space to capture the carry. the low word of the result becomes + * scratch space to capture the carry. the low word of the result becomes * the final high word of c0 */ c1->QuadPart = (ULONGLONG)c0->HighPart + a1.LowPart + b0.LowPart; c0->HighPart = c1->LowPart;

1 0

Zebediah Figura : ws2_32: Map ENOTCONN to STATUS_INVALID_CONNECTION.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: cbd4f85ad389f4ee409109807f26304bae243ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd4f85ad389f4ee40910980… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:44 2021 -0500 ws2_32: Map ENOTCONN to STATUS_INVALID_CONNECTION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfc3bea8ea3..9eeb506f985 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -833,7 +833,7 @@ static NTSTATUS sock_get_ntstatus( int err ) case EADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case ENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case ENOTCONN: return STATUS_INVALID_CONNECTION; case ETIMEDOUT: return STATUS_IO_TIMEOUT; case ENETUNREACH: return STATUS_NETWORK_UNREACHABLE; case ENETDOWN: return STATUS_NETWORK_BUSY; @@ -960,7 +960,7 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case WSAEADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case WSAECONNREFUSED: return STATUS_CONNECTION_REFUSED; case WSAESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case WSAENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case WSAENOTCONN: return STATUS_INVALID_CONNECTION; case WSAETIMEDOUT: return STATUS_IO_TIMEOUT; case WSAENETUNREACH: return STATUS_NETWORK_UNREACHABLE; case WSAENETDOWN: return STATUS_NETWORK_BUSY; @@ -985,7 +985,7 @@ static DWORD NtStatusToWSAError( DWORD status ) case STATUS_NETWORK_BUSY: return WSAEALREADY; case STATUS_NETWORK_UNREACHABLE: return WSAENETUNREACH; case STATUS_CONNECTION_REFUSED: return WSAECONNREFUSED; - case STATUS_CONNECTION_DISCONNECTED: return WSAENOTCONN; + case STATUS_INVALID_CONNECTION: return WSAENOTCONN; case STATUS_CONNECTION_RESET: return WSAECONNRESET; case STATUS_CONNECTION_ABORTED: return WSAECONNABORTED; case STATUS_CANCELLED: return WSA_OPERATION_ABORTED;

1 0

Zebediah Figura : server: Map ENOTCONN to STATUS_INVALID_CONNECTION.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: d6d4fa4bd1e17aeb3d4a15f828e1a4dc9b606654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d4fa4bd1e17aeb3d4a15f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:45 2021 -0500 server: Map ENOTCONN to STATUS_INVALID_CONNECTION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- server/trace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 49a75c33d2a..cb2a1095496 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1307,7 +1307,7 @@ static int sock_get_ntstatus( int err ) case EADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case ENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case ENOTCONN: return STATUS_INVALID_CONNECTION; case ETIMEDOUT: return STATUS_IO_TIMEOUT; case ENETUNREACH: return STATUS_NETWORK_UNREACHABLE; case EHOSTUNREACH: return STATUS_HOST_UNREACHABLE; diff --git a/server/trace.c b/server/trace.c index 645c183a52f..cd41d63d8c9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5300,7 +5300,6 @@ static const struct { "CANT_OPEN_ANONYMOUS", STATUS_CANT_OPEN_ANONYMOUS }, { "CHILD_MUST_BE_VOLATILE", STATUS_CHILD_MUST_BE_VOLATILE }, { "CONNECTION_ABORTED", STATUS_CONNECTION_ABORTED }, - { "CONNECTION_DISCONNECTED", STATUS_CONNECTION_DISCONNECTED }, { "CONNECTION_REFUSED", STATUS_CONNECTION_REFUSED }, { "CONNECTION_RESET", STATUS_CONNECTION_RESET }, { "DEBUGGER_INACTIVE", STATUS_DEBUGGER_INACTIVE }, @@ -5335,6 +5334,7 @@ static const struct { "INSUFFICIENT_RESOURCES", STATUS_INSUFFICIENT_RESOURCES }, { "INVALID_ADDRESS", STATUS_INVALID_ADDRESS }, { "INVALID_CID", STATUS_INVALID_CID }, + { "INVALID_CONNECTION", STATUS_INVALID_CONNECTION }, { "INVALID_DEVICE_REQUEST", STATUS_INVALID_DEVICE_REQUEST }, { "INVALID_FILE_FOR_SECTION", STATUS_INVALID_FILE_FOR_SECTION }, { "INVALID_HANDLE", STATUS_INVALID_HANDLE },

1 0

Zebediah Figura : ws2_32: Map EFAULT to STATUS_ACCESS_VIOLATION.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 44c395d616d9bb668713ca8b9e4c168af945aadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c395d616d9bb668713ca8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:46 2021 -0500 ws2_32: Map EFAULT to STATUS_ACCESS_VIOLATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9eeb506f985..ff89ffb2d4b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -812,7 +812,7 @@ static NTSTATUS sock_get_ntstatus( int err ) case EBUSY: return STATUS_DEVICE_BUSY; case EPERM: case EACCES: return STATUS_ACCESS_DENIED; - case EFAULT: return STATUS_NO_MEMORY; + case EFAULT: return STATUS_ACCESS_VIOLATION; case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; @@ -940,7 +940,7 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case 0: return STATUS_SUCCESS; case WSAEBADF: return STATUS_INVALID_HANDLE; case WSAEACCES: return STATUS_ACCESS_DENIED; - case WSAEFAULT: return STATUS_NO_MEMORY; + case WSAEFAULT: return STATUS_ACCESS_VIOLATION; case WSAEINVAL: return STATUS_INVALID_PARAMETER; case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; case WSAEWOULDBLOCK: return STATUS_DEVICE_NOT_READY; @@ -992,7 +992,7 @@ static DWORD NtStatusToWSAError( DWORD status ) case STATUS_SHARING_VIOLATION: return WSAEADDRINUSE; case STATUS_IO_TIMEOUT: case STATUS_TIMEOUT: return WSAETIMEDOUT; - case STATUS_NO_MEMORY: return WSAEFAULT; + case STATUS_ACCESS_VIOLATION: return WSAEFAULT; case STATUS_ACCESS_DENIED: return WSAEACCES; case STATUS_TOO_MANY_OPENED_FILES: return WSAEMFILE; case STATUS_DEVICE_NOT_READY: return WSAEWOULDBLOCK;

1 0

Zebediah Figura : server: Map EFAULT to STATUS_ACCESS_VIOLATION.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 523032e6f1806ce5593103d37f467d28908797e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523032e6f1806ce5593103d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:47 2021 -0500 server: Map EFAULT to STATUS_ACCESS_VIOLATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index cb2a1095496..08399644a07 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1286,7 +1286,7 @@ static int sock_get_ntstatus( int err ) case EBUSY: return STATUS_DEVICE_BUSY; case EPERM: case EACCES: return STATUS_ACCESS_DENIED; - case EFAULT: return STATUS_NO_MEMORY; + case EFAULT: return STATUS_ACCESS_VIOLATION; case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES;

1 0

Zebediah Figura : ws2_32: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 0f9d9a032671f71970431864a6295d5722ffdaeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f9d9a032671f71970431864… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:48 2021 -0500 ws2_32: Map EINPROGRESS to STATUS_DEVICE_NOT_READY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ff89ffb2d4b..74e86e9d845 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -816,8 +816,8 @@ static NTSTATUS sock_get_ntstatus( int err ) case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case EINPROGRESS: case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; - case EINPROGRESS: return STATUS_PENDING; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; case EDESTADDRREQ: return STATUS_INVALID_PARAMETER; @@ -858,8 +858,8 @@ UINT sock_get_error( int err ) case EFAULT: return WSAEFAULT; case EINVAL: return WSAEINVAL; case EMFILE: return WSAEMFILE; + case EINPROGRESS: case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; case EBADF: case ENOTSOCK: return WSAENOTSOCK; @@ -943,8 +943,8 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case WSAEFAULT: return STATUS_ACCESS_VIOLATION; case WSAEINVAL: return STATUS_INVALID_PARAMETER; case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case WSAEINPROGRESS: case WSAEWOULDBLOCK: return STATUS_DEVICE_NOT_READY; - case WSAEINPROGRESS: return STATUS_PENDING; case WSAEALREADY: return STATUS_NETWORK_BUSY; case WSAENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; case WSAEDESTADDRREQ: return STATUS_INVALID_PARAMETER; @@ -2958,7 +2958,7 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (ret == 0) goto connect_success; - if (ret == WSAEINPROGRESS) + if (ret == WSAEWOULDBLOCK) { /* tell wineserver that a connection is in progress */ _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, @@ -3047,7 +3047,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n if (WSASend(s, &wsabuf, sendBuf ? 1 : 0, sent, 0, ov, NULL) != SOCKET_ERROR) goto connection_success; } - else if (ret == WSAEINPROGRESS) + else if (ret == WSAEWOULDBLOCK) { struct ws2_async *wsa; DWORD size;

1 0

Zebediah Figura : server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 15aceec06730ec0307ad63a233cd71cb2eb15232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15aceec06730ec0307ad63a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:49 2021 -0500 server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 4 ++-- server/trace.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 08399644a07..36fda31f9c1 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1221,8 +1221,8 @@ static unsigned int sock_get_error( int err ) case EFAULT: return WSAEFAULT; case EINVAL: return WSAEINVAL; case EMFILE: return WSAEMFILE; + case EINPROGRESS: case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; case ENOTSOCK: return WSAENOTSOCK; case EDESTADDRREQ: return WSAEDESTADDRREQ; @@ -1290,8 +1290,8 @@ static int sock_get_ntstatus( int err ) case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case EINPROGRESS: case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; - case EINPROGRESS: return STATUS_PENDING; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; case EDESTADDRREQ: return STATUS_INVALID_PARAMETER; diff --git a/server/trace.c b/server/trace.c index cd41d63d8c9..0fccf47d16a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5424,7 +5424,6 @@ static const struct { "WSAEFAULT", 0xc0010000 | WSAEFAULT }, { "WSAEHOSTDOWN", 0xc0010000 | WSAEHOSTDOWN }, { "WSAEHOSTUNREACH", 0xc0010000 | WSAEHOSTUNREACH }, - { "WSAEINPROGRESS", 0xc0010000 | WSAEINPROGRESS }, { "WSAEINTR", 0xc0010000 | WSAEINTR }, { "WSAEINVAL", 0xc0010000 | WSAEINVAL }, { "WSAEISCONN", 0xc0010000 | WSAEISCONN },

1 0

Zebediah Figura : msi/tests: Pass an empty string to check_reg_str() instead of special-casing NULL.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 2052d03fdf82ea9112c6ce3719936e245834eeb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2052d03fdf82ea9112c6ce37… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:43 2021 -0500 msi/tests: Pass an empty string to check_reg_str() instead of special-casing NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 265 ++++++++++++++++++++++++------------------------ 1 file changed, 130 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2052d03fdf82ea9112c6…

1 0