October 2020 - Wine-Commits

Zebediah Figura : server: Return Win32 socket types from get_socket_info.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: b1f2b61be040cccaf6da6e6296bd38a24f05f55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f2b61be040cccaf6da6e62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:37:52 2020 -0500 server: Return Win32 socket types from get_socket_info. 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 +++--- server/sock.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a187d2de8e..bc61b56667 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2306,9 +2306,9 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i status = wine_server_call( req ); if (!status) { - address_family = convert_af_u2w(reply->family); - socket_type = convert_socktype_u2w(reply->type); - protocol = convert_proto_u2w(reply->protocol); + address_family = reply->family; + socket_type = reply->type; + protocol = reply->protocol; } } SERVER_END_REQ; diff --git a/server/sock.c b/server/sock.c index 52e85b1e51..4bafe35b89 100644 --- a/server/sock.c +++ b/server/sock.c @@ -456,7 +456,7 @@ static void sock_poll_event( struct fd *fd, int event ) else { /* normal data flow */ - if ( sock->type == SOCK_STREAM && ( event & POLLIN ) ) + if (sock->type == WS_SOCK_STREAM && (event & POLLIN)) { char dummy; int nr; @@ -546,8 +546,8 @@ static int sock_get_poll_events( struct fd *fd ) else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - else if ( sock->type == SOCK_STREAM && sock->state & FD_READ && mask & FD_CLOSE && - !(sock->hmask & FD_READ) ) + else if (sock->type == WS_SOCK_STREAM && (sock->state & FD_READ) && (mask & FD_CLOSE) && + !(sock->hmask & FD_READ)) ev |= POLLIN; if (async_queued( &sock->write_q )) @@ -813,9 +813,9 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; - sock->proto = unix_protocol; - sock->type = unix_type; - sock->family = unix_family; + sock->proto = protocol; + sock->type = type; + sock->family = family; if (sock->fd) { @@ -1540,7 +1540,7 @@ DECL_HANDLER(enable_socket_event) sock->hmask &= ~req->mask; sock->state |= req->sstate; sock->state &= ~req->cstate; - if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK; + if (sock->type != WS_SOCK_STREAM) sock->state &= ~STREAM_FLAG_MASK; sock_reselect( sock );

1 0

Nikolay Sivov : include: Add DWRITE_MAKE_FONT_AXIS_TAG macro.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 6db24a2349417bef87862f743cc3e85536492184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6db24a2349417bef87862f74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 08:45:13 2020 +0300 include: Add DWRITE_MAKE_FONT_AXIS_TAG macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index f5ee6157cd..1b10454ec6 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -80,6 +80,12 @@ typedef struct DWRITE_FONT_PROPERTY WCHAR const *localeName; } DWRITE_FONT_PROPERTY; +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define DWRITE_MAKE_FONT_AXIS_TAG(a,b,c,d) (static_cast<DWRITE_FONT_AXIS_TAG>(DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d)))") +cpp_quote("#else") +cpp_quote("#define DWRITE_MAKE_FONT_AXIS_TAG(a,b,c,d) (DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d))") +cpp_quote("#endif") + typedef enum DWRITE_FONT_AXIS_TAG { DWRITE_FONT_AXIS_TAG_WEIGHT = 0x74686777, /* 'wght' */

1 0

Michael Stefaniuc : d3dx11/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 052d9e6f3dcabde95a74981f925a0ca066a591ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=052d9e6f3dcabde95a74981f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:52 2020 +0200 d3dx11/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index db06c97144..06924877da 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -129,13 +129,12 @@ static void test_D3DX11CreateAsyncMemoryLoader(void) static void create_testfile(WCHAR *path, const void *data, int data_len) { - static const WCHAR test_filename[] = {'a','s','y','n','c','l','o','a','d','e','r','.','d','a','t','a',0}; DWORD written; HANDLE file; BOOL ret; GetTempPathW(MAX_PATH, path); - lstrcatW(path, test_filename); + lstrcatW(path, L"asyncloader.data"); file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %d.\n", @@ -240,7 +239,6 @@ static void test_D3DX11CreateAsyncFileLoader(void) static void test_D3DX11CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX11DataLoader *loader; HRESULT hr; @@ -259,7 +257,7 @@ static void test_D3DX11CreateAsyncResourceLoader(void) hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX11CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX11CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); }

1 0

Zebediah Figura : server: Remove redundant calls to sock_reselect().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: cb5edb4b12eb4846df85de71b889959a96586720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb5edb4b12eb4846df85de71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:37:53 2020 -0500 server: Remove redundant calls to sock_reselect(). These are already done in accept_socket() and accept_into_socket() respectively. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 4bafe35b89..f165e86b12 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1427,7 +1427,6 @@ DECL_HANDLER(accept_socket) { reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes ); sock->wparam = reply->handle; /* wparam for message is the socket handle */ - sock_reselect( sock ); release_object( &sock->obj ); } } @@ -1450,10 +1449,7 @@ DECL_HANDLER(accept_into_socket) } if (accept_into_socket( sock, acceptsock )) - { acceptsock->wparam = req->ahandle; /* wparam for message is the socket handle */ - sock_reselect( acceptsock ); - } release_object( acceptsock ); release_object( sock ); }

1 0

Zebediah Figura : ws2_32: Set default socket options in the server.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: ac36b8ff01be8e6e6c8f46096b434f7048097559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac36b8ff01be8e6e6c8f4609… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:37:51 2020 -0500 ws2_32: Set default socket options 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 | 39 ------------------------------- server/sock.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 39 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7802cc9cd..a187d2de8e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7519,7 +7519,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, HANDLE handle; SOCKET ret; DWORD err; - int unixaf, unixtype, ipxptype = -1; /* FIXME: The "advanced" parameters of WSASocketW (lpProtocolInfo, @@ -7590,18 +7589,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } - /* - Windows has an extension to the IPX protocol that allows one to create sockets - and set the IPX packet type at the same time, to do that a caller will use - a protocol like NSPROTO_IPX + <PACKET TYPE> - */ - if (IS_IPX_PROTO(protocol)) - ipxptype = protocol - WS_NSPROTO_IPX; - - /* convert the socket family, type and protocol */ - unixaf = convert_af_w2u(af); - unixtype = convert_socktype_w2u(type); - RtlInitUnicodeString(&string, afdW); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, @@ -7636,32 +7623,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, ret = HANDLE2SOCKET(handle); TRACE("\tcreated %04lx\n", ret ); - if (ipxptype > 0) - set_ipx_packettype(ret, ipxptype); - - if (unixaf == AF_INET || unixaf == AF_INET6) - { - /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ - if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); - else if (unixtype == SOCK_STREAM) - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); - } - -#ifdef IPV6_V6ONLY - if (unixaf == AF_INET6) - { - int fd = get_sock_fd(ret, 0, NULL); - if (fd != -1) - { - /* IPV6_V6ONLY is set by default on Windows */ - int enable = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable))) - WARN("\tsetting IPV6_V6ONLY failed - errno = %i\n", errno); - release_sock_fd(ret, fd); - } - } -#endif if (!socket_list_add(ret)) { CloseHandle(handle); diff --git a/server/sock.c b/server/sock.c index f0227c5906..52e85b1e51 100644 --- a/server/sock.c +++ b/server/sock.c @@ -712,6 +712,36 @@ static int get_unix_protocol( int protocol ) } } +static void set_dont_fragment( int fd, int level, int value ) +{ + int optname; + + if (level == IPPROTO_IP) + { +#ifdef IP_DONTFRAG + optname = IP_DONTFRAG; +#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) && defined(IP_PMTUDISC_DONT) + optname = IP_MTU_DISCOVER; + value = value ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; +#else + return; +#endif + } + else + { +#ifdef IPV6_DONTFRAG + optname = IPV6_DONTFRAG; +#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) && defined(IPV6_PMTUDISC_DONT) + optname = IPV6_MTU_DISCOVER; + value = value ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; +#else + return; +#endif + } + + setsockopt( fd, level, optname, &value, sizeof(value) ); +} + static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { unsigned int options = 0; @@ -746,6 +776,41 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u return -1; } fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ + + if (family == WS_AF_IPX && protocol >= WS_NSPROTO_IPX && protocol <= WS_NSPROTO_IPX + 255) + { +#ifdef HAS_IPX + int ipx_type = protocol - WS_NSPROTO_IPX; + +#ifdef SOL_IPX + setsockopt( sockfd, SOL_IPX, IPX_TYPE, &ipx_type, sizeof(ipx_type) ); +#else + struct ipx val; + /* Should we retrieve val using a getsockopt call and then + * set the modified one? */ + val.ipx_pt = ipx_type; + setsockopt( sockfd, 0, SO_DEFAULT_HEADERS, &val, sizeof(val) ); +#endif +#endif + } + + if (unix_family == AF_INET || unix_family == AF_INET6) + { + /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ + if (unix_type == SOCK_DGRAM || unix_type == SOCK_RAW) /* in Linux the global default can be enabled */ + set_dont_fragment( sockfd, unix_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE ); + else if (unix_type == SOCK_STREAM) + set_dont_fragment( sockfd, unix_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE ); + } + +#ifdef IPV6_V6ONLY + if (unix_family == AF_INET6) + { + static const int enable = 1; + setsockopt( sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable) ); + } +#endif + sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; sock->proto = unix_protocol;

1 0

Zebediah Figura : ws2_32: Pass Win32 socket types to the server.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: abcc75cbcf57513f07ab8c008f66a19f142c5a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=abcc75cbcf57513f07ab8c00… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:37:50 2020 -0500 ws2_32: Pass Win32 socket types to 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 | 39 +------------------ server/sock.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 102 insertions(+), 42 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 36215cc6ef..d7802cc9cd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7601,41 +7601,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, /* convert the socket family, type and protocol */ unixaf = convert_af_w2u(af); unixtype = convert_socktype_w2u(type); - protocol = convert_proto_w2u(protocol); - - /* filter invalid parameters */ - if (protocol < 0) - { - /* the type could not be converted */ - if (type && unixtype < 0) - { - err = WSAESOCKTNOSUPPORT; - goto done; - } - - err = WSAEPROTONOSUPPORT; - goto done; - } - if (unixaf < 0) - { - /* both family and protocol can't be invalid */ - if (protocol <= 0) - { - err = WSAEINVAL; - goto done; - } - - /* family could not be converted and neither socket type */ - if (unixtype < 0 && af >= 0) - { - - err = WSAESOCKTNOSUPPORT; - goto done; - } - - err = WSAEAFNOSUPPORT; - goto done; - } RtlInitUnicodeString(&string, afdW); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); @@ -7647,8 +7612,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return INVALID_SOCKET; } - create_params.family = unixaf; - create_params.type = unixtype; + create_params.family = af; + create_params.type = type; create_params.protocol = protocol; create_params.flags = flags & ~(WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, diff --git a/server/sock.c b/server/sock.c index 3bc4780f94..f0227c5906 100644 --- a/server/sock.c +++ b/server/sock.c @@ -30,6 +30,9 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif #ifdef HAVE_POLL_H # include <poll.h> #endif @@ -51,6 +54,29 @@ # include <linux/rtnetlink.h> #endif +#ifdef HAVE_NETIPX_IPX_H +# include <netipx/ipx.h> +#elif defined(HAVE_LINUX_IPX_H) +# ifdef HAVE_ASM_TYPES_H +# include <asm/types.h> +# endif +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# endif +# include <linux/ipx.h> +#endif +#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) +# define HAS_IPX +#endif + +#ifdef HAVE_LINUX_IRDA_H +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# endif +# include <linux/irda.h> +# define HAS_IRDA +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -58,6 +84,7 @@ #include "winerror.h" #define USE_WS_PREFIX #include "winsock2.h" +#include "wsipx.h" #include "wine/afd.h" #include "process.h" @@ -638,12 +665,80 @@ static struct sock *create_socket(void) return sock; } +static int get_unix_family( int family ) +{ + switch (family) + { + case WS_AF_INET: return AF_INET; + case WS_AF_INET6: return AF_INET6; +#ifdef HAS_IPX + case WS_AF_IPX: return AF_IPX; +#endif +#ifdef AF_IRDA + case WS_AF_IRDA: return AF_IRDA; +#endif + case WS_AF_UNSPEC: return AF_UNSPEC; + default: return -1; + } +} + +static int get_unix_type( int type ) +{ + switch (type) + { + case WS_SOCK_DGRAM: return SOCK_DGRAM; + case WS_SOCK_RAW: return SOCK_RAW; + case WS_SOCK_STREAM: return SOCK_STREAM; + default: return -1; + } +} + +static int get_unix_protocol( int protocol ) +{ + if (protocol >= WS_NSPROTO_IPX && protocol <= WS_NSPROTO_IPX + 255) + return protocol; + + switch (protocol) + { + case WS_IPPROTO_ICMP: return IPPROTO_ICMP; + case WS_IPPROTO_IGMP: return IPPROTO_IGMP; + case WS_IPPROTO_IP: return IPPROTO_IP; + case WS_IPPROTO_IPIP: return IPPROTO_IPIP; + case WS_IPPROTO_IPV6: return IPPROTO_IPV6; + case WS_IPPROTO_RAW: return IPPROTO_RAW; + case WS_IPPROTO_TCP: return IPPROTO_TCP; + case WS_IPPROTO_UDP: return IPPROTO_UDP; + default: return -1; + } +} + static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { unsigned int options = 0; - int sockfd; + int sockfd, unix_type, unix_family, unix_protocol; + + unix_family = get_unix_family( family ); + unix_type = get_unix_type( type ); + unix_protocol = get_unix_protocol( protocol ); + + if (unix_protocol < 0) + { + if (type && unix_type < 0) + set_win32_error( WSAESOCKTNOSUPPORT ); + else + set_win32_error( WSAEPROTONOSUPPORT ); + return -1; + } + if (unix_family < 0) + { + if (family >= 0 && unix_type < 0) + set_win32_error( WSAESOCKTNOSUPPORT ); + else + set_win32_error( WSAEAFNOSUPPORT ); + return -1; + } - sockfd = socket( family, type, protocol ); + sockfd = socket( unix_family, unix_type, unix_protocol ); if (sockfd == -1) { if (errno == EINVAL) set_win32_error( WSAESOCKTNOSUPPORT ); @@ -653,9 +748,9 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; - sock->proto = protocol; - sock->type = type; - sock->family = family; + sock->proto = unix_protocol; + sock->type = unix_type; + sock->family = unix_family; if (sock->fd) {

1 0

Michael Stefaniuc : dplayx: Use wide-char string literals.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 33f1de3ed7e4300a2b936beafad76c96d97352d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33f1de3ed7e4300a2b936bea… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:56 2020 +0200 dplayx: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 18 +++++------------- dlls/dplayx/tests/dplayx.c | 14 +++----------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e2464f8013..7a796735ce 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5770,14 +5770,6 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, LPVOID lpContext) { HKEY hkResult; - static const WCHAR searchSubKey[] = { - 'S', 'O', 'F', 'T', 'W', 'A', 'R', 'E', '\\', - 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', - 'D', 'i', 'r', 'e', 'c', 't', 'P', 'l', 'a', 'y', '\\', - 'S', 'e', 'r', 'v', 'i', 'c', 'e', ' ', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 's', 0 }; - static const WCHAR guidKey[] = { 'G', 'u', 'i', 'd', 0 }; - static const WCHAR descW[] = { 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', 'W', 0 }; - DWORD dwIndex; FILETIME filetime; @@ -5797,7 +5789,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, } /* Need to loop over the service providers in the registry */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, searchSubKey, + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\DirectPlay\\Service Providers", 0, KEY_READ, &hkResult) != ERROR_SUCCESS) { /* Hmmm. Does this mean that there are no service providers? */ @@ -5854,7 +5846,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, } /* Get the GUID from the registry */ - if (RegQueryValueExW(hkServiceProvider, guidKey, + if (RegQueryValueExW(hkServiceProvider, L"Guid", NULL, NULL, (LPBYTE) guidKeyContent, &sizeOfGuidKeyContent) != ERROR_SUCCESS) { ERR(": missing GUID registry data member for service provider %s.\n", debugstr_w(subKeyName)); @@ -5899,8 +5891,8 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, else { DWORD sizeOfDescription = 0; - - if (RegQueryValueExW(hkServiceProvider, descW, + + if (RegQueryValueExW(hkServiceProvider, L"DescriptionW", NULL, NULL, NULL, &sizeOfDescription) != ERROR_SUCCESS) { ERR(": missing 'DescriptionW' registry data member for service provider %s.\n", debugstr_w(subKeyName)); @@ -5912,7 +5904,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, max_sizeOfDescriptionW = sizeOfDescription; } descriptionW = HeapAlloc(GetProcessHeap(), 0, sizeOfDescription); - RegQueryValueExW(hkServiceProvider, descW, + RegQueryValueExW(hkServiceProvider, L"DescriptionW", NULL, NULL, (LPBYTE) descriptionW, &sizeOfDescription); if (!lpEnumCallbackW(&guid_cache[dwIndex], descriptionW, 6, 0, lpContext)) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index ea6525fa38..d71df8838f 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6764,13 +6764,6 @@ done: static HRESULT set_firewall( enum firewall_op op ) { - static const WCHAR dplaysvrW[] = - {'d','p','l','a','y','s','v','r','.','e','x','e',0}; - static const WCHAR separator[] = {'\\',0}; - static const WCHAR clientW[] = - {'d','p','l','a','y','_','c','l','i','e','n','t',0}; - static const WCHAR serverW[] = - {'d','p','l','a','y','_','s','e','r','v','e','r',0}; HRESULT hr, init; INetFwMgr *mgr = NULL; INetFwPolicy *policy = NULL; @@ -6791,8 +6784,7 @@ static HRESULT set_firewall( enum firewall_op op ) SysFreeString( image ); return E_FAIL; } - lstrcatW(path, separator); - lstrcatW(path, dplaysvrW); + lstrcatW( path, L"\\dplaysvr.exe" ); init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); @@ -6820,7 +6812,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; - name = SysAllocString( clientW ); + name = SysAllocString( L"dplay_client" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); ok( hr == S_OK, "got %08x\n", hr ); @@ -6845,7 +6837,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; - name = SysAllocString( serverW ); + name = SysAllocString( L"dplay_server" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Michael Stefaniuc : faultrep: Use wide-char string literals.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: d489c58e7ba77532a81357ad9d405099e8a2b4bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d489c58e7ba77532a81357ad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:55 2020 +0200 faultrep: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/faultrep.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index 3191659cd6..6d1aba9de8 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -29,13 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(faultrep); -static const WCHAR SZ_EXCLUSIONLIST_KEY[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'P','C','H','e','a','l','t','h','\\', - 'E','r','r','o','r','R','e','p','o','r','t','i','n','g','\\', - 'E','x','c','l','u','s','i','o','n','L','i','s','t', 0}; - /************************************************************************* * AddERExcludedApplicationW [FAULTREP.@] * @@ -70,7 +63,8 @@ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) return FALSE; } - res = RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey); + res = RegCreateKeyW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\PCHealth\\ErrorReporting\\ExclusionList", &hkey); if (!res) { RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value, sizeof(value));

1 0

Zebediah Figura : d3d11/tests: Add a test for rendering with deferred contexts.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 386e6799572296ac36d433b8fc37de5540a52f6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=386e6799572296ac36d433b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:25:00 2020 -0500 d3d11/tests: Add a test for rendering with deferred contexts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 82a165c62d..e1a6dd6159 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30237,6 +30237,108 @@ static void test_deferred_context_state(void) release_test_context(&test_context); } +static void test_deferred_context_rendering(void) +{ + ID3D11DeviceContext *immediate, *deferred; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11CommandList *list1, *list2; + ID3D11RenderTargetView *rtv; + ID3D11Texture2D *texture; + ID3D11Device *device; + DWORD color; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + immediate = test_context.immediate_context; + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (hr != S_OK) + { + release_test_context(&test_context); + return; + } + + ID3D11DeviceContext_ClearRenderTargetView(deferred, test_context.backbuffer_rtv, green); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list2); + + ID3D11DeviceContext_ExecuteCommandList(deferred, list1, TRUE); + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list2); + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, green); + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(deferred, (ID3D11Resource *)test_context.backbuffer, (ID3D11Resource *)texture); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, blue); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffff0000, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30401,6 +30503,7 @@ START_TEST(d3d11) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_deferred_context_state); + queue_test(test_deferred_context_rendering); run_queued_tests(); }

1 0

Zebediah Figura : msdmo: Also handle ERROR_SUCCESS with nonzero size from RegQueryValueExW().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 2d4e21d45e0bc17d40d2c91e649938ab4d69e786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d4e21d45e0bc17d40d2c91e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 16:31:18 2020 -0500 msdmo: Also handle ERROR_SUCCESS with nonzero size from RegQueryValueExW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49659 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 20 +++++++++++++++----- dlls/msdmo/tests/msdmo.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 8e0680931f..33caa6d0dc 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -526,11 +526,16 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pInTypes) { - DWORD size = types_size, i; + DWORD size, i; - while ((ret = RegQueryValueExW(hkey, L"InputTypes", NULL, NULL, - (BYTE *)types, &size)) == ERROR_MORE_DATA) + for (;;) { + size = types_size; + ret = RegQueryValueExW(hkey, L"InputTypes", NULL, NULL, (BYTE *)types, &size); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + break; + if (size <= types_size) + break; if (!array_reserve((void **)&types, &types_size, size, 1)) { RegCloseKey(hkey); @@ -559,9 +564,14 @@ static HRESULT WINAPI IEnumDMO_fnNext( { DWORD size = types_size, i; - while ((ret = RegQueryValueExW(hkey, L"OutputTypes", NULL, NULL, - (BYTE *)types, &size)) == ERROR_MORE_DATA) + for (;;) { + size = types_size; + ret = RegQueryValueExW(hkey, L"OutputTypes", NULL, NULL, (BYTE *)types, &size); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + break; + if (size <= types_size) + break; if (!array_reserve((void **)&types, &types_size, size, 1)) { RegCloseKey(hkey); diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index a1ab8ee00d..b1b2f544ce 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -88,6 +88,9 @@ static void test_DMOGetName(void) static void test_DMOEnum(void) { + static const DMO_PARTIAL_MEDIATYPE input_type = {{0x1111}, {0x2222}}; + static const DMO_PARTIAL_MEDIATYPE wrong_type = {{0x3333}, {0x4444}}; + IEnumDMO *enum_dmo; HRESULT hr; CLSID clsid; @@ -115,6 +118,47 @@ static void test_DMOEnum(void) ok(count == 0, "expected 0, got %d\n", count); IEnumDMO_Release(enum_dmo); + + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 1, &input_type, 0, NULL); + if (hr != S_OK) + return; + + hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); + ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOEnum(&GUID_unknowncategory, 0, 1, &input_type, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); + ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOEnum(&GUID_unknowncategory, 0, 1, &wrong_type, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); + ok(hr == S_OK, "Got hr %#x.\n", hr); } static void test_DMOGetTypes(void)

1 0