February 2023 - Wine-gitlab

Re: [PATCH v5 0/3] MR2130: Fix missing *out=NULL in (WMReader|unknown_inner)_QueryInterface - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2130

1 0

Re: [PATCH v2 0/1] MR2134: httpapi: Avoid calling RtlInitUnicodeString on a static constant. - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2134

1 0

Re: [PATCH v6 0/1] MR2132: vbscript: Fix memory leak in interp_redim_preserve - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2132

1 0

Re: [PATCH v5 0/1] MR2131: vbscript: Fix memory leak in Split(). - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2131

1 0

Re: [PATCH v2 0/1] MR2135: ole32: Avoid calling RtlInitUnicodeString on a static constant. - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2135

1 0

Re: [PATCH v9 0/2] MR2100: ntdll: Do not send data to port 0.
by Zebediah Figura (＠zfigura) 08 Feb '23

08 Feb '23

Sorry, accidentally hit send before I was done writing. Continuing: > + DWORD bytesSent = 0; Not to bikeshed style, but being consistent within the same code would at least be appreciated. (And in new code we tend to avoid camel case.) > + s = socket(AF_INET, SOCK_DGRAM, 0); Let's explicitly use IPPROTO_UDP here, please. It's also possible to create raw or ICMP DGRAM sockets, for which sending to port zero actually does something. > + todo_wine ok(bytesSent == sizeof(buf), "Failed to send full data(%lu) only sent(%lu)\n", (unsigned long) sizeof(buf), (unsigned long) bytesSent); No need to cast; you can use %Iu for expressions of type size_t, and %lu for DWORD. >From patch 2/2: > +static int is_port0( const union unix_sockaddr *uaddr) This returns BOOL. > +{ > + switch (uaddr->addr.sa_family) > + { > + case AF_INET: > + { > + return uaddr->in.sin_port == 0; > + } > + > + case AF_INET6: > + { > + return uaddr->in6.sin6_port == 0; > + } > + No need for these braces. > + #ifdef HAS_IPX > + case AF_IPX: > + { > + return uaddr->ipx.sipx_port == 0; > + } > + #endif Is this right? Unless we can confirm it's correct I'd leave this out. > + > + #ifdef HAS_IRDA > + case AF_IRDA: > + { > + return FALSE; > + } > + #endif > + > + case AF_UNSPEC: > + return FALSE; There's no need for these; the default case already covers this. > + > + default: > + return FALSE; > + } > +} > @@ -1018,6 +1053,7 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async ) > hdr.msg_iov = async->iov + async->iov_cursor; > hdr.msg_iovlen = async->count - async->iov_cursor; > > + > while ((ret = sendmsg( fd, &hdr, async->unix_flags )) == -1) > { > if (errno == EISCONN) Spurious whitespace change here. > @@ -1028,7 +1064,24 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async ) > else if (errno != EINTR) > { > if (errno != EWOULDBLOCK) WARN( "sendmsg: %s\n", strerror( errno ) ); > - return sock_errno_to_status( errno ); > + > + if(errno == EINVAL && is_port0(&unix_addr)){ > + > + /* > + * Some Windows applications(Spellforce 3 is known to) send to port 0. > + * This causes 'sendmsg' to throw a EINVAL error on Windows this does nothing but consume the data. > + * This workaround says we successfully sent data even though we didnt send anything. > + * Matching the Windows behaviour, making the program work(in theory). > + */ Comment spacing is mangled here. > + ret = 0; > + for(ssize_t i = 0; i < hdr.msg_iovlen; i++){ > + ret += hdr.msg_iov[i].iov_len; > + } > + WARN("Attempting to send to port 0, skipping over %zd bytes\n", ret); > + break; > + }else{ > + return sock_errno_to_status( errno ); > + } > } This works, but I'm not sure it's the place we want to handle this. For one thing, I'm not sure all platforms are going to return EINVAL here. Probably better is to either handle it in try_send() before sending, or handle it in sock_send() in about the same place. (I think it'd need to be after the server call, though I haven't properly checked whether the server needs to do anything important here.) Note that you'll also explicitly want to check the protocol here in that case, so we only catch UDP sockets with this logic. Also, please try to match the surrounding code style wrt things like brace placement and spacing. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2100#note_23505

1 0

Re: [PATCH v2 0/1] MR1974: rpcrt4/tests: Remove a failing test. - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1974

1 0

Re: [PATCH v2 0/1] MR2129: loader: In macOS preloader, fix an environment variable sometimes being lost. - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2129

1 0

Re: [PATCH v2 0/1] MR2128: ntdll/tests: Remove some Vista broken broken(<constant>) calls. - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2128

1 0

Re: [PATCH v3 0/1] MR1800: oleaut32: Manually construct a stub buffer for dispinterfaces. - approved
by Alexandre Julliard (＠julliard) 08 Feb '23

08 Feb '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1800

1 0