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

Alexandre Julliard : ntdll: Implement RtlWow64GetCurrentCpuArea().
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 17716bc7f325e5f7606c74c0af8d425b98e60054 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17716bc7f325e5f7606c74c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 11:16:01 2021 +0200 ntdll: Implement RtlWow64GetCurrentCpuArea(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 18 ++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 20 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0e1706f2dd2..42de54c895e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1075,6 +1075,7 @@ @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) @ stdcall -arch=win64 RtlWow64GetCpuAreaInfo(ptr long ptr) +@ stdcall -arch=win64 RtlWow64GetCurrentCpuArea(ptr ptr ptr) @ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) @ stdcall -arch=win64 RtlWow64GetThreadContext(long ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 3ed31e22100..e8b7785ce31 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -143,6 +143,24 @@ NTSTATUS WINAPI RtlWow64GetCpuAreaInfo( WOW64_CPURESERVED *cpu, ULONG reserved, } +/********************************************************************** + * RtlWow64GetCurrentCpuArea (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetCurrentCpuArea( USHORT *machine, void **context, void **context_ex ) +{ + WOW64_CPU_AREA_INFO info; + NTSTATUS status; + + if (!(status = RtlWow64GetCpuAreaInfo( NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED], 0, &info ))) + { + if (machine) *machine = info.Machine; + if (context) *context = info.Context; + if (context_ex) *context_ex = *(void **)info.ContextEx; + } + return status; +} + + /****************************************************************************** * RtlWow64GetThreadContext (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index 71be1f5816d..b07a5465d86 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4404,6 +4404,7 @@ NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); #ifdef _WIN64 NTSYSAPI NTSTATUS WINAPI RtlWow64GetCpuAreaInfo(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); +NTSYSAPI NTSTATUS WINAPI RtlWow64GetCurrentCpuArea(USHORT*,void**,void**); NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE,WOW64_CONTEXT*); NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE,const WOW64_CONTEXT*); #else

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_SO_SNDBUF.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 0072c72512cd92b4d9ee0980a54e340c1ace6ba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0072c72512cd92b4d9ee0980… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 23:25:40 2021 -0500 server: Introduce IOCTL_AFD_WINE_GET_SO_SNDBUF. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index ddf780500b7..f2a5abf726d 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -176,6 +176,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 235, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 236, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index bcbf3d245be..9a99e512c0d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -208,6 +208,7 @@ struct sock union win_sockaddr addr; /* socket name */ int addr_len; /* socket name length */ unsigned int rcvbuf; /* advisory recv buffer size */ + unsigned int sndbuf; /* advisory send buffer size */ unsigned int rcvtimeo; /* receive timeout in ms */ unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ @@ -1389,6 +1390,7 @@ static struct sock *create_socket(void) sock->nonblocking = 0; sock->bound = 0; sock->rcvbuf = 0; + sock->sndbuf = 0; sock->rcvtimeo = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); @@ -1552,6 +1554,10 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u if (!getsockopt( sockfd, SOL_SOCKET, SO_RCVBUF, &value, &len )) sock->rcvbuf = value; + len = sizeof(value); + if (!getsockopt( sockfd, SOL_SOCKET, SO_SNDBUF, &value, &len )) + sock->sndbuf = value; + sock->state = (type == WS_SOCK_STREAM ? SOCK_UNCONNECTED : SOCK_CONNECTIONLESS); sock->flags = flags; sock->proto = protocol; @@ -2650,6 +2656,20 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_SNDBUF: + { + int sndbuf = sock->sndbuf; + + if (get_reply_max_size() < sizeof(sndbuf)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &sndbuf, sizeof(sndbuf) ); + return 1; + } + case IOCTL_AFD_WINE_SET_SO_SNDBUF: { DWORD sndbuf; @@ -2665,11 +2685,14 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!sndbuf) { /* setsockopt fails if a zero value is passed */ + sock->sndbuf = sndbuf; return 0; } #endif - if (setsockopt( unix_fd, SOL_SOCKET, SO_SNDBUF, (char *)&sndbuf, sizeof(sndbuf) ) < 0) + if (!setsockopt( unix_fd, SOL_SOCKET, SO_SNDBUF, (char *)&sndbuf, sizeof(sndbuf) )) + sock->sndbuf = sndbuf; + else set_error( sock_get_ntstatus( errno ) ); return 0; }

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_SET_SO_SNDBUF.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 252d564c7b604c49397d92755bcc174b34afc295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=252d564c7b604c49397d9275… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 23:25:41 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_SET_SO_SNDBUF. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 89fb7d3462b..3f15bb4e39b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3575,21 +3575,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_REUSEADDR: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_REUSEADDR, optval, optlen ); - /* Some options need some conversion before they can be sent to - * setsockopt. The conversions are done here, then they will fall through - * to the general case. Special options that are not passed to - * setsockopt follow below that.*/ - case WS_SO_SNDBUF: - if (!*(const int *)optval) - { - FIXME("SO_SNDBUF ignoring request to disable send buffering\n"); -#ifdef __APPLE__ - return 0; -#endif - } - convert_sockopt(&level, &optname); - break; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_SNDBUF, optval, optlen ); /* SO_DEBUG is a privileged operation, ignore it. */ case WS_SO_DEBUG:

1 0

Zebediah Figura : ws2_32: Handle SO_RCVTIMEO in the server.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: f4df896e0664ecbdc8630fad5010ce01dceedcc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4df896e0664ecbdc8630fad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 11:43:20 2021 -0500 ws2_32: Handle SO_RCVTIMEO in the server. 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 +++++----- dlls/ws2_32/tests/sock.c | 8 ++++---- include/wine/afd.h | 2 ++ server/sock.c | 40 +++++++++++++++++++++++++++++++++------- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7ed48124a5a..15c9d0cc940 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2289,6 +2289,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVBUF, optval, optlen ); case WS_SO_RCVTIMEO: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVTIMEO, optval, optlen ); + case WS_SO_SNDTIMEO: { INT64 timeout; @@ -3565,6 +3567,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_RCVBUF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVBUF, optval, optlen ); + case WS_SO_RCVTIMEO: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVTIMEO, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3631,13 +3636,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, TRACE("setting global SO_OPENTYPE = 0x%x\n", *((const int*)optval) ); return 0; -#ifdef SO_RCVTIMEO - case WS_SO_RCVTIMEO: -#endif #ifdef SO_SNDTIMEO case WS_SO_SNDTIMEO: -#endif -#if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO) if (optval && optlen == sizeof(UINT32)) { /* WinSock passes milliseconds instead of struct timeval */ tval.tv_usec = (*(const UINT32*)optval % 1000) * 1000; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ccaa04e4ef5..a3f7e002ce7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10919,7 +10919,7 @@ static void test_timeout(void) WSASetLastError(0xdeadbeef); ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(len == sizeof(timeout), "got size %u\n", len); ok(!timeout, "got timeout %u\n", timeout); @@ -10927,15 +10927,15 @@ static void test_timeout(void) WSASetLastError(0xdeadbeef); ret = setsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); timeout = 0xdeadbeef; len = sizeof(timeout); WSASetLastError(0xdeadbeef); ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); - todo_wine ok(timeout == 100, "got timeout %u\n", timeout); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(timeout == 100, "got timeout %u\n", timeout); WSASetLastError(0xdeadbeef); ret = recv(client, &buffer, 1, 0); diff --git a/include/wine/afd.h b/include/wine/afd.h index 0692394459e..c4f7c7a6413 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -171,6 +171,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 8bad31efdd1..94dbafe44ee 100644 --- a/server/sock.c +++ b/server/sock.c @@ -208,6 +208,7 @@ struct sock union win_sockaddr addr; /* socket name */ int addr_len; /* socket name length */ unsigned int rcvbuf; /* advisory recv buffer size */ + unsigned int rcvtimeo; /* receive timeout in ms */ unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ @@ -1388,6 +1389,7 @@ static struct sock *create_socket(void) sock->nonblocking = 0; sock->bound = 0; sock->rcvbuf = 0; + sock->rcvtimeo = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -2619,6 +2621,35 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_RCVTIMEO: + { + DWORD rcvtimeo = sock->rcvtimeo; + + if (get_reply_max_size() < sizeof(rcvtimeo)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &rcvtimeo, sizeof(rcvtimeo) ); + return 1; + } + + case IOCTL_AFD_WINE_SET_SO_RCVTIMEO: + { + DWORD rcvtimeo; + + if (get_req_data_size() < sizeof(rcvtimeo)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + rcvtimeo = *(DWORD *)get_req_data(); + + sock->rcvtimeo = rcvtimeo; + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -3029,19 +3060,14 @@ DECL_HANDLER(recv_socket) /* recv() returned EWOULDBLOCK, i.e. no data available yet */ if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) { -#ifdef SO_RCVTIMEO - struct timeval tv; - socklen_t len = sizeof(tv); - /* Set a timeout on the async if necessary. * * We want to do this *only* if the client gave us STATUS_DEVICE_NOT_READY. * If the client gave us STATUS_PENDING, it expects the async to always * block (it was triggered by WSARecv*() with a valid OVERLAPPED * structure) and for the timeout not to be respected. */ - if (is_fd_overlapped( fd ) && !getsockopt( get_unix_fd( fd ), SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, &len )) - timeout = tv.tv_sec * -10000000 + tv.tv_usec * -10; -#endif + if (is_fd_overlapped( fd )) + timeout = (timeout_t)sock->rcvtimeo * -10000; status = STATUS_PENDING; }

1 0

Zebediah Figura : ws2_32: Move the setsockopt(SO_REUSEADDR) implementation to ntdll.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 9eea22f724465d3cc9be1746a7602161e9e522aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eea22f724465d3cc9be1746… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 11:43:22 2021 -0500 ws2_32: Move the setsockopt(SO_REUSEADDR) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 20 ++++++++++++++++++++ dlls/ws2_32/socket.c | 13 +++---------- include/wine/afd.h | 1 + 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 549981388c7..38cb80997ff 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1655,6 +1655,26 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_SO_REUSEADDR: return do_getsockopt( handle, io, SOL_SOCKET, SO_REUSEADDR, out_buffer, out_size ); + /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics; + * however, using it the BSD way fixes bug 8513 and seems to be what + * most programmers assume, anyway */ + case IOCTL_AFD_WINE_SET_SO_REUSEADDR: + { + int fd, needs_close = FALSE; + NTSTATUS status; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, in_buffer, in_size ); +#ifdef __APPLE__ + if (!ret) ret = setsockopt( fd, SOL_SOCKET, SO_REUSEPORT, in_buffer, in_size ); +#endif + if (needs_close) close( fd ); + return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 11e6719fcb0..89fb7d3462b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3572,6 +3572,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_RCVTIMEO: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVTIMEO, optval, optlen ); + case WS_SO_REUSEADDR: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_REUSEADDR, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3588,16 +3591,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; - /* The options listed here don't need any special handling. Thanks to - * the conversion happening above, options from there will fall through - * to this, too.*/ - /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics. - * however, using it the BSD way fixes bug 8513 and seems to be what - * most programmers assume, anyway */ - case WS_SO_REUSEADDR: - convert_sockopt(&level, &optname); - break; - /* SO_DEBUG is a privileged operation, ignore it. */ case WS_SO_DEBUG: TRACE("Ignoring SO_DEBUG\n"); diff --git a/include/wine/afd.h b/include/wine/afd.h index f337ec361b2..d522b8a289f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -174,6 +174,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Zebediah Figura : winegstreamer: Change the formatting of error and warning messages a bit.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 5b156eecba68756a18337b60e4148d4acaa3c7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b156eecba68756a18337b60… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 14:59:56 2021 -0500 winegstreamer: Change the formatting of error and warning messages a bit. The TestBot treats anything containing the string ": error: " as a compiler error. It may be possible for the TestBot to be smarter, but it seems easier just to tweak winegstreamer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0d59297a026..4689c83413b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1389,8 +1389,8 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use { case GST_MESSAGE_ERROR: gst_message_parse_error(msg, &err, &dbg_info); - fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); + fprintf(stderr, "winegstreamer error: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + fprintf(stderr, "winegstreamer error: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); pthread_mutex_lock(&parser->mutex); @@ -1401,8 +1401,8 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use case GST_MESSAGE_WARNING: gst_message_parse_warning(msg, &err, &dbg_info); - fprintf(stderr, "winegstreamer: warning: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - fprintf(stderr, "winegstreamer: warning: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); + fprintf(stderr, "winegstreamer warning: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + fprintf(stderr, "winegstreamer warning: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); break;

1 0

Huw Davies : nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ENUMERATE_ALL.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: a907a141a938fc5afb546787c5482e681b7c3e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a907a141a938fc5afb546787… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 29 08:04:21 2021 +0100 nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ENUMERATE_ALL. This differs from native, which passes struct nsi_enumerate_all_ex directly and relies on the kernel being able to access the user-space addresses. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/device.c | 54 ++++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 38 +++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 21 ++++++++++++++ include/wine/nsi.h | 20 +++++++++++++ 5 files changed, 135 insertions(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index d1913671f49..f382689d463 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -3,4 +3,5 @@ IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ - device.c + device.c \ + nsi.c diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index ecd584bd1cb..4ce5ddd6d83 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -28,10 +28,60 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" #include "wine/debug.h" +#include "nsiproxy_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static void nsiproxy_enumerate_all( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_enumerate_all *in = (struct nsiproxy_enumerate_all *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + void *out = irp->AssociatedIrp.SystemBuffer; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + struct nsi_enumerate_all_ex enum_all; + + if (in_len != sizeof(*in)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + if (out_len < sizeof(DWORD) + (in->key_size + in->rw_size + in->dynamic_size + in->static_size) * in->count) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + enum_all.unknown[0] = 0; + enum_all.unknown[1] = 0; + enum_all.first_arg = in->first_arg; + enum_all.second_arg = in->second_arg; + enum_all.module = &in->module; + enum_all.table = in->table; + enum_all.key_data = (BYTE *)out + sizeof(DWORD); + enum_all.key_size = in->key_size; + enum_all.rw_data = (BYTE *)enum_all.key_data + in->key_size * in->count; + enum_all.rw_size = in->rw_size; + enum_all.dynamic_data = (BYTE *)enum_all.rw_data + in->rw_size * in->count; + enum_all.dynamic_size = in->dynamic_size; + enum_all.static_data = (BYTE *)enum_all.dynamic_data + in->dynamic_size * in->count; + enum_all.static_size = in->static_size; + enum_all.count = in->count; + + irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); + if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_MORE_ENTRIES) + { + irp->IoStatus.Information = out_len; + *(DWORD *)out = enum_all.count; + } + else irp->IoStatus.Information = 0; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -43,6 +93,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_NSIPROXY_WINE_ENUMERATE_ALL: + nsiproxy_enumerate_all( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c new file mode 100644 index 00000000000..7ff36c093ba --- /dev/null +++ b/dlls/nsiproxy.sys/nsi.c @@ -0,0 +1,38 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "nsiproxy_private.h" + +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) +{ + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h new file mode 100644 index 00000000000..19b520d17cc --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -0,0 +1,21 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 31ece41d22f..799485fc284 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,8 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +#include "winioctl.h" + /* Undocumented NSI NDIS tables */ #define NSI_NDIS_IFINFO_TABLE 0 #define NSI_NDIS_INDEX_LUID_TABLE 2 @@ -92,6 +94,24 @@ struct nsi_ndis_ifinfo_static DWORD phys_medium_type; }; +/* Wine specific ioctl interface */ + +#define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) + +/* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ +struct nsiproxy_enumerate_all +{ + NPI_MODULEID module; + DWORD first_arg; + DWORD second_arg; + DWORD table; + DWORD key_size; + DWORD rw_size; + DWORD dynamic_size; + DWORD static_size; + DWORD count; +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0

1 0

Huw Davies : nsi: Implement NsiEnumerateObjectsAllParameterEx().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: bc4db065c06764e0488e965134283131200bc33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4db065c06764e0488e9651… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 29 08:04:22 2021 +0100 nsi: Implement NsiEnumerateObjectsAllParameterEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d3292af9ee3..981fcdba954 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -25,10 +25,16 @@ #include "iptypes.h" #include "netiodef.h" #include "wine/nsi.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static inline HANDLE get_nsi_device( void ) +{ + return CreateFileW( L"\\\\.\\Nsi", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); +} + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) @@ -46,7 +52,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ struct nsi_enumerate_all_ex params; DWORD err; - FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + TRACE( "%d %d %p %d %p %d %p %d %p %d %p %d %p\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); params.unknown[0] = 0; @@ -72,7 +78,52 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD out_size, received, err = ERROR_SUCCESS; + HANDLE device = get_nsi_device(); + struct nsiproxy_enumerate_all in; + BYTE *out, *ptr; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + out_size = sizeof(DWORD) + + (params->key_size + params->rw_size + params->dynamic_size + params->static_size) * params->count; + + out = heap_alloc( out_size ); + if (!out) + { + CloseHandle( device ); + return ERROR_OUTOFMEMORY; + } + + in.module = *params->module; + in.first_arg = params->first_arg; + in.second_arg = params->second_arg; + in.table = params->table; + in.key_size = params->key_size; + in.rw_size = params->rw_size; + in.dynamic_size = params->dynamic_size; + in.static_size = params->static_size; + in.count = params->count; + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_ENUMERATE_ALL, &in, sizeof(in), out, out_size, &received, NULL )) + err = GetLastError(); + if (err == ERROR_SUCCESS || err == ERROR_MORE_DATA) + { + params->count = *(DWORD *)out; + ptr = out + sizeof(DWORD); + if (params->key_size) memcpy( params->key_data, ptr, params->key_size * params->count ); + ptr += params->key_size * in.count; + if (params->rw_size) memcpy( params->rw_data, ptr, params->rw_size * params->count ); + ptr += params->rw_size * in.count; + if (params->dynamic_size) memcpy( params->dynamic_data, ptr, params->dynamic_size * params->count ); + ptr += params->dynamic_size * in.count; + if (params->static_size) memcpy( params->static_data, ptr, params->static_size * params->count ); + } + + heap_free( out ); + CloseHandle( device ); + + return err; } void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data )

1 0

Jacek Caban : gdi32: Remove no longer used disk-based metafile special-cases.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 80aed7cae6fe88c10af73c5550f0157093ff8bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80aed7cae6fe88c10af73c55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:58 2021 +0200 gdi32: Remove no longer used disk-based metafile special-cases. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/metafile.c | 79 ++---------------------------------------------- dlls/gdi32/mfdrv/init.c | 10 ++---- 3 files changed, 5 insertions(+), 85 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 71493c185b6..62fd9045b98 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -464,7 +464,6 @@ extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; -extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; /* Format of comment record added by GetWinMetaFileBits */ #include <pshpack2.h> diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 1c831ef83ef..12fd10c98c9 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -60,15 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); -#include "pshpack1.h" -typedef struct -{ - DWORD dw1, dw2, dw3; - WORD w4; - CHAR filename[0x100]; -} METAHEADERDISK; -#include "poppack.h" - /****************************************************************** * MF_AddHandle @@ -231,56 +222,6 @@ HMETAFILE WINAPI GetMetaFileW( LPCWSTR lpFilename ) } -/****************************************************************** - * MF_LoadDiskBasedMetaFile - * - * Creates a new memory-based metafile from a disk-based one. - */ -static METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh) -{ - METAHEADERDISK *mhd; - HANDLE hfile; - METAHEADER *mh2; - - if(mh->mtType != METAFILE_DISK) { - ERR("Not a disk based metafile\n"); - return NULL; - } - mhd = (METAHEADERDISK *)((char *)mh + sizeof(METAHEADER)); - - if((hfile = CreateFileA(mhd->filename, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) { - WARN("Can't open file of disk based metafile\n"); - return NULL; - } - mh2 = MF_ReadMetaFile(hfile); - CloseHandle(hfile); - return mh2; -} - -/****************************************************************** - * MF_CreateMetaHeaderDisk - * - * Take a memory based METAHEADER and change it to a disk based METAHEADER - * associated with filename. Note: Trashes contents of old one. - */ -METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mh, LPCVOID filename, BOOL uni ) -{ - METAHEADERDISK *mhd; - - mh = HeapReAlloc( GetProcessHeap(), 0, mh, - sizeof(METAHEADER) + sizeof(METAHEADERDISK)); - mh->mtType = METAFILE_DISK; - mhd = (METAHEADERDISK *)((char *)mh + sizeof(METAHEADER)); - - if( uni ) - WideCharToMultiByte(CP_ACP, 0, filename, -1, - mhd->filename, sizeof mhd->filename, NULL, NULL); - else - lstrcpynA( mhd->filename, filename, sizeof mhd->filename ); - return mh; -} - /* return a copy of the metafile bits, to be freed with HeapFree */ static METAHEADER *get_metafile_bits( HMETAFILE hmf ) { @@ -288,13 +229,8 @@ static METAHEADER *get_metafile_bits( HMETAFILE hmf ) if (!mh) return NULL; - if (mh->mtType != METAFILE_DISK) - { - ret = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); - if (ret) memcpy( ret, mh, mh->mtSize * 2 ); - } - else ret = MF_LoadDiskBasedMetaFile( mh ); - + ret = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); + if (ret) memcpy( ret, mh, mh->mtSize * 2 ); GDI_ReleaseObj( hmf ); return ret; } @@ -1092,16 +1028,7 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) TRACE("(%p,%d,%p)\n", hmf, nSize, buf); if (!mh) return 0; /* FIXME: error code */ - if(mh->mtType == METAFILE_DISK) - { - mh = MF_LoadDiskBasedMetaFile( mh ); - if (!mh) - { - GDI_ReleaseObj( hmf ); - return 0; - } - mf_copy = TRUE; - } + mfSize = mh->mtSize * 2; if (buf) { diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index d64e754da84..b093e1abd63 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -330,22 +330,17 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) if (!(dc = MFDRV_AllocMetaFile())) return 0; physDev = (METAFILEDRV_PDEVICE *)dc->physDev; + physDev->mh->mtType = METAFILE_MEMORY; if (filename) /* disk based metafile */ { - physDev->mh->mtType = METAFILE_DISK; if ((hFile = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { free_dc_ptr( dc ); return 0; } physDev->hFile = hFile; - - /* Grow METAHEADER to include filename */ - physDev->mh = MF_CreateMetaHeaderDisk(physDev->mh, filename, TRUE); } - else /* memory based metafile */ - physDev->mh->mtType = METAFILE_MEMORY; TRACE("returning %p\n", physDev->dev.hdc); ret = physDev->dev.hdc; @@ -413,9 +408,8 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) return 0; } - if (physDev->mh->mtType == METAFILE_DISK) /* disk based metafile */ + if (physDev->hFile) /* disk based metafile */ { - physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ if (!WriteFile(physDev->hFile, physDev->mh, physDev->mh->mtSize * 2, &bytes_written, NULL)) { free_dc_ptr( dc );

1 0

Zebediah Figura : quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a filter has been run asynchronously.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 7f1623bc626d3ca2411c1a3088512d8ef461252b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1623bc626d3ca2411c1a30… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 15:00:15 2021 -0500 quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a filter has been run asynchronously. This is a valid case in which the filter state may or may not match the graph state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4861d6cf1b0..a1f3757a202 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5106,7 +5106,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F { struct filter_graph *graph = impl_from_IMediaFilter(iface); DWORD end = GetTickCount() + timeout; - FILTER_STATE expect_state; HRESULT hr; TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state); @@ -5122,7 +5121,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F EnterCriticalSection(&graph->cs); *state = graph->state; - expect_state = graph->needs_async_run ? State_Paused : graph->state; for (;;) { @@ -5154,9 +5152,18 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F else if (filter_state != graph->state && filter_state != State_Paused) hr = E_FAIL; - if (filter_state != expect_state) - ERR("Filter %p reported incorrect state %u (expected %u).\n", - filter->filter, filter_state, expect_state); + if (graph->needs_async_run) + { + if (filter_state != State_Paused && filter_state != State_Running) + ERR("Filter %p reported incorrect state %u (expected %u or %u).\n", + filter->filter, filter_state, State_Paused, State_Running); + } + else + { + if (filter_state != graph->state) + ERR("Filter %p reported incorrect state %u (expected %u).\n", + filter->filter, filter_state, graph->state); + } } LeaveCriticalSection(&graph->cs);

1 0